summaryrefslogtreecommitdiffstats
path: root/inventory/byo
diff options
context:
space:
mode:
authorMichael Gugino <mgugino@redhat.com>2017-08-25 00:10:54 -0400
committerMichael Gugino <mgugino@redhat.com>2017-09-06 13:59:38 -0400
commit8bf97723ceaca02fe12b86466f8383aa211ead5e (patch)
treee73adc1d43d5a07b0e6c941d8e555919e3266fed /inventory/byo
parentb5cf769b97691d75e07d1e0e3b29ecbc31ba32ea (diff)
downloadopenshift-8bf97723ceaca02fe12b86466f8383aa211ead5e.tar.gz
openshift-8bf97723ceaca02fe12b86466f8383aa211ead5e.tar.bz2
openshift-8bf97723ceaca02fe12b86466f8383aa211ead5e.tar.xz
openshift-8bf97723ceaca02fe12b86466f8383aa211ead5e.zip
Remove openshift-common
Most of this role's purpose was to set facts. The vast majority of these facts were simply redefining user-supplied variables. This commit also removes various artifacts leftover from previous versions, as well as variables that seem to be entirely unused.
Diffstat (limited to 'inventory/byo')
-rw-r--r--inventory/byo/hosts.origin.example7
-rw-r--r--inventory/byo/hosts.ose.example6
2 files changed, 5 insertions, 8 deletions
diff --git a/inventory/byo/hosts.origin.example b/inventory/byo/hosts.origin.example
index ad69bd587..df0491d71 100644
--- a/inventory/byo/hosts.origin.example
+++ b/inventory/byo/hosts.origin.example
@@ -719,11 +719,10 @@ openshift_master_identity_providers=[{'name': 'htpasswd_auth', 'login': 'true',
# Setting this variable to true will override that check.
#openshift_override_hostname_check=true
-# Configure dnsmasq for cluster dns, switch the host's local resolver to use dnsmasq
-# 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_use_dnsmasq is deprecated. This must be true, or installs will fail
+# in versions >= 3.6
#openshift_use_dnsmasq=False
+
# Define an additional dnsmasq.conf file to deploy to /etc/dnsmasq.d/openshift-ansible.conf
# This is useful for POC environments where DNS may not actually be available yet or to set
# options like 'strict-order' to alter dnsmasq configuration.
diff --git a/inventory/byo/hosts.ose.example b/inventory/byo/hosts.ose.example
index b52806bc7..79eb59ab9 100644
--- a/inventory/byo/hosts.ose.example
+++ b/inventory/byo/hosts.ose.example
@@ -727,10 +727,8 @@ openshift_master_identity_providers=[{'name': 'htpasswd_auth', 'login': 'true',
# Setting this variable to true will override that check.
#openshift_override_hostname_check=true
-# Configure dnsmasq for cluster dns, switch the host's local resolver to use dnsmasq
-# 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_use_dnsmasq is deprecated. This must be true, or installs will fail
+# in versions >= 3.6
#openshift_use_dnsmasq=False
# Define an additional dnsmasq.conf file to deploy to /etc/dnsmasq.d/openshift-ansible.conf
# This is useful for POC environments where DNS may not actually be available yet or to set