diff options
| author | Jason DeTiberus <detiber@gmail.com> | 2016-04-25 11:41:48 -0400 |
|---|---|---|
| committer | Jason DeTiberus <detiber@gmail.com> | 2016-04-25 11:41:48 -0400 |
| commit | 7d36acbb53ab74d43539baca9a2e2b924778e960 (patch) | |
| tree | b5f4ce38e57f9f994fc5a21cefa2a97a0a6053ad | |
| parent | 70162f1ddcc23376fa8fd9ed79fda9632655a526 (diff) | |
| parent | d1fc1486e35b91293d69fe6d5da274ef7f5f67ea (diff) | |
| download | openshift-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
| -rw-r--r-- | inventory/byo/hosts.aep.example | 2 | ||||
| -rw-r--r-- | inventory/byo/hosts.origin.example | 2 | ||||
| -rw-r--r-- | inventory/byo/hosts.ose.example | 2 | ||||
| -rw-r--r-- | openshift-ansible.spec | 2 |
4 files changed, 4 insertions, 4 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] diff --git a/openshift-ansible.spec b/openshift-ansible.spec index 5674a22c5..aa29e9958 100644 --- a/openshift-ansible.spec +++ b/openshift-ansible.spec @@ -214,7 +214,7 @@ Atomic OpenShift Utilities includes - Fix router selector fact migration and match multiple selectors when counting nodes. (abutcher@redhat.com) - Fixing the spec for PR 1734 (bleanhar@redhat.com) -- Add openshift_node_dnsmasq (sdodson@redhat.com) +- Add openshift_use_dnsmasq (sdodson@redhat.com) - Promote portal_net to openshift.common, add kube_svc_ip (sdodson@redhat.com) - Add example inventories to docs, install docs by default (sdodson@redhat.com) - Fix use of JSON inventory vars with raw booleans. (dgoodwin@redhat.com) |