diff options
| author | Brenton Leanhardt <bleanhar@redhat.com> | 2016-04-20 10:07:27 -0400 |
|---|---|---|
| committer | Brenton Leanhardt <bleanhar@redhat.com> | 2016-04-20 10:07:27 -0400 |
| commit | 3fccdb3e55a89597270e4ee2d9cdaf9dd66cb341 (patch) | |
| tree | 36eaafd964e7a96f7f0d4272d3cc77d29272a52c /roles/flannel_register | |
| parent | 1f490c2374038669df3d2bfcb01af54361f8907e (diff) | |
| parent | bc11db0c73554be36b4196993d39a35cecbbd25b (diff) | |
| download | openshift-3fccdb3e55a89597270e4ee2d9cdaf9dd66cb341.tar.gz openshift-3fccdb3e55a89597270e4ee2d9cdaf9dd66cb341.tar.bz2 openshift-3fccdb3e55a89597270e4ee2d9cdaf9dd66cb341.tar.xz openshift-3fccdb3e55a89597270e4ee2d9cdaf9dd66cb341.zip | |
Merge pull request #1588 from sdodson/cluster-dns
Cluster dns provided by dnsmasq
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 |