diff options
| author | Scott Dodson <sdodson@redhat.com> | 2016-02-05 15:04:26 -0500 |
|---|---|---|
| committer | Scott Dodson <sdodson@redhat.com> | 2016-04-19 16:43:48 -0400 |
| commit | 7c11c212a270ea4da9094ed3156db91090b8c851 (patch) | |
| tree | b2f2132c4dbf5e61577af2e75144390c7e5351ea /roles/flannel_register | |
| parent | 1f490c2374038669df3d2bfcb01af54361f8907e (diff) | |
| download | openshift-7c11c212a270ea4da9094ed3156db91090b8c851.tar.gz openshift-7c11c212a270ea4da9094ed3156db91090b8c851.tar.bz2 openshift-7c11c212a270ea4da9094ed3156db91090b8c851.tar.xz openshift-7c11c212a270ea4da9094ed3156db91090b8c851.zip | |
Promote portal_net to openshift.common, add kube_svc_ip
Conflicts:
roles/openshift_facts/library/openshift_facts.py
Diffstat (limited to 'roles/flannel_register')
| -rw-r--r-- | roles/flannel_register/README.md | 2 | ||||
| -rw-r--r-- | roles/flannel_register/defaults/main.yaml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/roles/flannel_register/README.md b/roles/flannel_register/README.md index ba7541ab1..623c4c7cf 100644 --- a/roles/flannel_register/README.md +++ b/roles/flannel_register/README.md @@ -14,7 +14,7 @@ Role Variables | Name | Default value | Description | |---------------------|----------------------------------------------------|-------------------------------------------------| -| flannel_network | {{ openshift.master.portal_net }} or 172.16.1.1/16 | interface to use for inter-host communication | +| flannel_network | {{ openshift.common.portal_net }} or 172.16.1.1/16 | interface to use for inter-host communication | | flannel_min_network | {{ min_network }} or 172.16.5.0 | beginning of IP range for the subnet allocation | | flannel_subnet_len | /openshift.com/network | size of the subnet allocated to each host | | flannel_etcd_key | /openshift.com/network | etcd prefix | 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 |