diff options
| author | OpenShift Bot <eparis+openshiftbot@redhat.com> | 2017-09-07 10:57:28 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-07 10:57:28 -0400 |
| commit | 6da235f41a31776b1bc253a34dc14a30307e331e (patch) | |
| tree | bda2cc62691a59fb6ac6ed4978fa7f15ec046121 /inventory | |
| parent | aad4ccce7ce6641d3c720507568f6da779a66995 (diff) | |
| parent | 8bf97723ceaca02fe12b86466f8383aa211ead5e (diff) | |
| download | openshift-6da235f41a31776b1bc253a34dc14a30307e331e.tar.gz openshift-6da235f41a31776b1bc253a34dc14a30307e331e.tar.bz2 openshift-6da235f41a31776b1bc253a34dc14a30307e331e.tar.xz openshift-6da235f41a31776b1bc253a34dc14a30307e331e.zip | |
Merge pull request #5208 from mgugino-upstream-stage/remove-openshift_common
Merged by openshift-bot
Diffstat (limited to 'inventory')
| -rw-r--r-- | inventory/byo/hosts.origin.example | 7 | ||||
| -rw-r--r-- | inventory/byo/hosts.ose.example | 6 |
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 |