summaryrefslogtreecommitdiffstats
path: root/roles/openshift_common
diff options
context:
space:
mode:
authorBrenton Leanhardt <bleanhar@redhat.com>2016-04-20 10:07:27 -0400
committerBrenton Leanhardt <bleanhar@redhat.com>2016-04-20 10:07:27 -0400
commit3fccdb3e55a89597270e4ee2d9cdaf9dd66cb341 (patch)
tree36eaafd964e7a96f7f0d4272d3cc77d29272a52c /roles/openshift_common
parent1f490c2374038669df3d2bfcb01af54361f8907e (diff)
parentbc11db0c73554be36b4196993d39a35cecbbd25b (diff)
downloadopenshift-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/openshift_common')
-rw-r--r--roles/openshift_common/README.md1
-rw-r--r--roles/openshift_common/tasks/main.yml2
2 files changed, 3 insertions, 0 deletions
diff --git a/roles/openshift_common/README.md b/roles/openshift_common/README.md
index 87306d4a6..2a271854b 100644
--- a/roles/openshift_common/README.md
+++ b/roles/openshift_common/README.md
@@ -20,6 +20,7 @@ Role Variables
| openshift_ip | UNDEF | Internal IP address to use for this host |
| openshift_public_hostname | UNDEF | Public hostname to use for this host |
| openshift_public_ip | UNDEF | Public IP address to use for this host |
+| openshift_portal_net | UNDEF | Service IP CIDR |
Dependencies
------------
diff --git a/roles/openshift_common/tasks/main.yml b/roles/openshift_common/tasks/main.yml
index eda43b9f8..d5166b52e 100644
--- a/roles/openshift_common/tasks/main.yml
+++ b/roles/openshift_common/tasks/main.yml
@@ -27,6 +27,8 @@
use_nuage: "{{ openshift_use_nuage | default(None) }}"
use_manageiq: "{{ openshift_use_manageiq | default(None) }}"
data_dir: "{{ openshift_data_dir | default(None) }}"
+ portal_net: "{{ openshift_portal_net | default(openshift_master_portal_net) | default(None) }}"
+ use_dnsmasq: "{{ openshift_use_dnsmasq | default(None) }}"
# Using oo_image_tag_to_rpm_version here is a workaround for how
# openshift_version is set. That value is computed based on either RPM