diff options
| author | Brenton Leanhardt <bleanhar@redhat.com> | 2016-04-20 10:07:27 -0400 |
|---|---|---|
| committer | Brenton Leanhardt <bleanhar@redhat.com> | 2016-04-20 10:07:27 -0400 |
| commit | 3fccdb3e55a89597270e4ee2d9cdaf9dd66cb341 (patch) | |
| tree | 36eaafd964e7a96f7f0d4272d3cc77d29272a52c /playbooks | |
| parent | 1f490c2374038669df3d2bfcb01af54361f8907e (diff) | |
| parent | bc11db0c73554be36b4196993d39a35cecbbd25b (diff) | |
| download | openshift-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 'playbooks')
| -rw-r--r-- | playbooks/adhoc/uninstall.yml | 5 | ||||
| -rw-r--r-- | playbooks/common/openshift-master/config.yml | 1 |
2 files changed, 5 insertions, 1 deletions
diff --git a/playbooks/adhoc/uninstall.yml b/playbooks/adhoc/uninstall.yml index 8fb515982..b9c2a2714 100644 --- a/playbooks/adhoc/uninstall.yml +++ b/playbooks/adhoc/uninstall.yml @@ -232,6 +232,9 @@ - /usr/local/bin/oadm - /usr/local/bin/oc - /usr/local/bin/kubectl + - /etc/NetworkManager/dispatcher.d/99-origin-dns.sh + - /etc/dnsmasq.d/origin-dns.conf + - /etc/dnsmasq.d/origin-upstream-dns.conf # Since we are potentially removing the systemd unit files for separated # master-api and master-controllers services, so we need to reload the @@ -244,3 +247,5 @@ tasks: - name: restart docker service: name=docker state=restarted + - name: restart NetworkManager + service: name=NetworkManager state=restarted diff --git a/playbooks/common/openshift-master/config.yml b/playbooks/common/openshift-master/config.yml index f1eaf8e16..620c4ea7c 100644 --- a/playbooks/common/openshift-master/config.yml +++ b/playbooks/common/openshift-master/config.yml @@ -53,7 +53,6 @@ console_url: "{{ openshift_master_console_url | default(None) }}" console_use_ssl: "{{ openshift_master_console_use_ssl | default(None) }}" public_console_url: "{{ openshift_master_public_console_url | default(None) }}" - portal_net: "{{ openshift_master_portal_net | default(None) }}" ha: "{{ openshift_master_ha | default(groups.oo_masters | length > 1) }}" master_count: "{{ openshift_master_count | default(groups.oo_masters | length) }}" - openshift_facts: |