2 files changed, 1 insertions, 56 deletions
diff --git a/playbooks/common/openshift-cluster/enable_dnsmasq.yml b/playbooks/common/openshift-cluster/enable_dnsmasq.yml
deleted file mode 100644
index f91361b67..000000000
--- a/playbooks/common/openshift-cluster/enable_dnsmasq.yml
+++ /dev/null
@@ -1,55 +0,0 @@
----
-- name: Load openshift_facts
-  hosts: oo_masters_to_config:oo_nodes_to_config
-  roles:
-  - openshift_facts
-
-- name: Reconfigure masters to listen on our new dns_port
-  hosts: oo_masters_to_config
-  handlers:
-  - include: ../../../roles/openshift_master/handlers/main.yml
-    static: yes
-  vars:
-    os_firewall_allow:
-    - service: skydns tcp
-      port: "{{ openshift.master.dns_port }}/tcp"
-    - service: skydns udp
-      port: "{{ openshift.master.dns_port }}/udp"
-  roles:
-  - os_firewall
-  tasks:
-  - openshift_facts:
-      role: "{{ item.role }}"
-      local_facts: "{{ item.local_facts }}"
-    with_items:
-    - role: master
-      local_facts:
-        dns_port: '8053'
-  - modify_yaml:
-      dest: "{{ openshift.common.config_base }}/master/master-config.yaml"
-      yaml_key: dnsConfig.bindAddress
-      yaml_value: "{{ openshift.master.bind_addr }}:{{ openshift.master.dns_port }}"
-    notify: restart master api
-  - meta: flush_handlers
-
-- name: Configure nodes for dnsmasq
-  hosts: oo_nodes_to_config
-  handlers:
-  - include: ../../../roles/openshift_node/handlers/main.yml
-    static: yes
-  pre_tasks:
-  - openshift_facts:
-      role: "{{ item.role }}"
-      local_facts: "{{ item.local_facts }}"
-    with_items:
-    - role: node
-      local_facts:
-        dns_ip: "{{ hostvars[inventory_hostname]['ansible_default_ipv4']['address'] }}"
-  roles:
-  - openshift_node_dnsmasq
-  post_tasks:
-  - modify_yaml:
-      dest: "{{ openshift.common.config_base }}/node/node-config.yaml"
-      yaml_key: dnsIP
-      yaml_value: "{{ openshift.node.dns_ip }}"
-    notify: restart node
diff --git a/playbooks/common/openshift-cluster/upgrades/pre/verify_upgrade_targets.yml b/playbooks/common/openshift-cluster/upgrades/pre/verify_upgrade_targets.yml
index 13fa37b09..446f315d6 100644
--- a/playbooks/common/openshift-cluster/upgrades/pre/verify_upgrade_targets.yml
+++ b/playbooks/common/openshift-cluster/upgrades/pre/verify_upgrade_targets.yml
@@ -12,7 +12,7 @@
 
 - name: Verify containers are available for upgrade
   command: >
-    docker pull {{ openshift.common.cli_image }}:{{ openshift_image_tag }}
+    docker pull {{ openshift_cli_image }}:{{ openshift_image_tag }}
   register: pull_result
   changed_when: "'Downloaded newer image' in pull_result.stdout"
   when: openshift.common.is_containerized | bool