From 7c11c212a270ea4da9094ed3156db91090b8c851 Mon Sep 17 00:00:00 2001 From: Scott Dodson Date: Fri, 5 Feb 2016 15:04:26 -0500 Subject: Promote portal_net to openshift.common, add kube_svc_ip Conflicts: roles/openshift_facts/library/openshift_facts.py --- roles/flannel_register/defaults/main.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'roles/flannel_register/defaults') diff --git a/roles/flannel_register/defaults/main.yaml b/roles/flannel_register/defaults/main.yaml index 269d1a17c..b1279aa88 100644 --- a/roles/flannel_register/defaults/main.yaml +++ b/roles/flannel_register/defaults/main.yaml @@ -1,5 +1,5 @@ --- -flannel_network: "{{ openshift.master.portal_net | default('172.30.0.0/16', true) }}" +flannel_network: "{{ openshift.common.portal_net | default('172.30.0.0/16', true) }}" flannel_min_network: 172.30.5.0 flannel_subnet_len: 24 flannel_etcd_key: /openshift.com/network -- cgit v1.2.1