summaryrefslogtreecommitdiffstats
path: root/inventory
diff options
context:
space:
mode:
authorJason DeTiberus <detiber@gmail.com>2016-04-25 11:41:48 -0400
committerJason DeTiberus <detiber@gmail.com>2016-04-25 11:41:48 -0400
commit7d36acbb53ab74d43539baca9a2e2b924778e960 (patch)
treeb5f4ce38e57f9f994fc5a21cefa2a97a0a6053ad /inventory
parent70162f1ddcc23376fa8fd9ed79fda9632655a526 (diff)
parentd1fc1486e35b91293d69fe6d5da274ef7f5f67ea (diff)
downloadopenshift-7d36acbb53ab74d43539baca9a2e2b924778e960.tar.gz
openshift-7d36acbb53ab74d43539baca9a2e2b924778e960.tar.bz2
openshift-7d36acbb53ab74d43539baca9a2e2b924778e960.tar.xz
openshift-7d36acbb53ab74d43539baca9a2e2b924778e960.zip
Merge pull request #1796 from donovanmuller/master
Rename openshift_node_dnsmasq to openshift_use_dnsmasq where applicable
Diffstat (limited to 'inventory')
-rw-r--r--inventory/byo/hosts.aep.example2
-rw-r--r--inventory/byo/hosts.origin.example2
-rw-r--r--inventory/byo/hosts.ose.example2
3 files changed, 3 insertions, 3 deletions
diff --git a/inventory/byo/hosts.aep.example b/inventory/byo/hosts.aep.example
index 7c98ddcd6..30d31bc12 100644
--- a/inventory/byo/hosts.aep.example
+++ b/inventory/byo/hosts.aep.example
@@ -340,7 +340,7 @@ openshift_master_identity_providers=[{'name': 'htpasswd_auth', 'login': 'true',
# and configure node's dnsIP to point at the node's local dnsmasq instance. Defaults
# to True for Origin 1.2 and OSE 3.2. False for 1.1 / 3.1 installs, this cannot
# be used with 1.0 and 3.0.
-# openshift_node_dnsmasq=False
+# openshift_use_dnsmasq=False
# host group for masters
[masters]
diff --git a/inventory/byo/hosts.origin.example b/inventory/byo/hosts.origin.example
index ad5c77ac6..1dc5abfcf 100644
--- a/inventory/byo/hosts.origin.example
+++ b/inventory/byo/hosts.origin.example
@@ -345,7 +345,7 @@ openshift_master_identity_providers=[{'name': 'htpasswd_auth', 'login': 'true',
# and configure node's dnsIP to point at the node's local dnsmasq instance. Defaults
# to True for Origin 1.2 and OSE 3.2. False for 1.1 / 3.1 installs, this cannot
# be used with 1.0 and 3.0.
-# openshift_node_dnsmasq=False
+# openshift_use_dnsmasq=False
# host group for masters
[masters]
diff --git a/inventory/byo/hosts.ose.example b/inventory/byo/hosts.ose.example
index 7c0c71484..f3ce95f0c 100644
--- a/inventory/byo/hosts.ose.example
+++ b/inventory/byo/hosts.ose.example
@@ -341,7 +341,7 @@ openshift_master_identity_providers=[{'name': 'htpasswd_auth', 'login': 'true',
# and configure node's dnsIP to point at the node's local dnsmasq instance. Defaults
# to True for Origin 1.2 and OSE 3.2. False for 1.1 / 3.1 installs, this cannot
# be used with 1.0 and 3.0.
-# openshift_node_dnsmasq=False
+# openshift_use_dnsmasq=False
# host group for masters
[masters]