From 73bf3e7137d80ba5b225108f39240c43d385a1ea Mon Sep 17 00:00:00 2001
From: Michael Gugino <mgugino@redhat.com>
Date: Mon, 27 Nov 2017 12:22:02 -0500
Subject: Combine openshift_node and openshift_node_dnsmasq

This commit combines these two roles.  This will
prevent openshift_node_facts from running twice.
---
 playbooks/byo/openshift-cluster/enable_dnsmasq.yml |  4 --
 .../common/openshift-cluster/enable_dnsmasq.yml    | 55 ----------------------
 2 files changed, 59 deletions(-)
 delete mode 100644 playbooks/byo/openshift-cluster/enable_dnsmasq.yml
 delete mode 100644 playbooks/common/openshift-cluster/enable_dnsmasq.yml

(limited to 'playbooks')

diff --git a/playbooks/byo/openshift-cluster/enable_dnsmasq.yml b/playbooks/byo/openshift-cluster/enable_dnsmasq.yml
deleted file mode 100644
index b429e84e5..000000000
--- a/playbooks/byo/openshift-cluster/enable_dnsmasq.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-- include: ../../init/evaluate_groups.yml
-
-- include: ../../common/openshift-cluster/enable_dnsmasq.yml
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
-- 
cgit v1.2.1