Merge pull request #5261 from mgugino-upstream-stage/remove-dns-openshift-facts

Merged by openshift-bot

9 files changed, 0 insertions, 170 deletions

diff --git a/roles/dns/README.md b/roles/dns/README.md
deleted file mode 100644
index 9a88ce97c..000000000
--- a/roles/dns/README.md
+++ /dev/null
@@ -1,45 +0,0 @@
-dns
-===
-
-Configure a DNS server serving IPs of all the nodes of the cluster
-
-Requirements
-------------
-
-Ansible 2.2
-
-Role Variables
---------------
-
-| Name | Mandatory / Optional | Description |
-|------|----------------------|-------------|
-| `dns_zones` | Mandatory | DNS zones in which we must find the hosts |
-| `dns_forwarders` | If not set, the DNS will be a recursive non-forwarding DNS server | DNS forwarders to delegate the requests for hosts outside of `dns_zones` |
-| `dns_all_hosts` | Mandatory | Exhaustive list of hosts |
-| `base_docker_image` | Optional | Base docker image to build Bind image from, used only in containerized deployments |
-
-Dependencies
-------------
-
-None
-
-Example Playbook
-----------------
-
-    - hosts: dns_hosts
-      roles:
-      - role: dns
-        dns_forwarders: [ '8.8.8.8', '8.8.4.4' ]
-        dns_zones: [ novalocal, openstacklocal ]
-        dns_all_hosts: "{{ g_all_hosts }}"
-        base_docker_image: 'centos:centos7'
-
-License
--------
-
-ASL 2.0
-
-Author Information
-------------------
-
-OpenShift operations, Red Hat, Inc
diff --git a/roles/dns/defaults/main.yml b/roles/dns/defaults/main.yml
deleted file mode 100644
index 82055c8cd..000000000
--- a/roles/dns/defaults/main.yml
+++ /dev/null
@@ -1,2 +0,0 @@
----
-base_docker_image: "{{ 'centos:centos7' if openshift.common.deployment_type == 'origin' else 'rhel7' }}"
diff --git a/roles/dns/handlers/main.yml b/roles/dns/handlers/main.yml
deleted file mode 100644
index 61fd7a10e..000000000
--- a/roles/dns/handlers/main.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-- name: restart bind
-  systemd:
-    name: named
-    state: restarted
diff --git a/roles/dns/meta/main.yml b/roles/dns/meta/main.yml
deleted file mode 100644
index 64d56114e..000000000
--- a/roles/dns/meta/main.yml
+++ /dev/null
@@ -1,9 +0,0 @@
----
-galaxy_info:
-  author: Lénaïc Huard
-  description: Deploy and configure a DNS server
-  company: Amadeus SAS
-  license: ASL 2.0
-  min_ansible_version: 2.2
-dependencies:
-- { role: openshift_facts }
diff --git a/roles/dns/tasks/main.yml b/roles/dns/tasks/main.yml
deleted file mode 100644
index c5ab53b4d..000000000
--- a/roles/dns/tasks/main.yml
+++ /dev/null
@@ -1,46 +0,0 @@
----
-- name: Install Bind
-  package: name=bind state=present
-  when: not openshift.common.is_containerized | bool
-
-- name: Create docker build dir
-  file: path=/tmp/dockerbuild state=directory
-  when: openshift.common.is_containerized | bool
-
-- name: Install dockerfile
-  template:
-    dest: "/tmp/dockerbuild/Dockerfile"
-    src: Dockerfile
-  when: openshift.common.is_containerized | bool
-
-- name: Build Bind image
-  docker_image: path="/tmp/dockerbuild" name="bind" state=present
-  when: openshift.common.is_containerized | bool
-
-- name: Install bind service file
-  template:
-    dest: "/etc/systemd/system/named.service"
-    src: named.service.j2
-  when: openshift.common.is_containerized | bool
-
-- name: Create bind zone dir
-  file: path=/var/named state=directory
-  when: openshift.common.is_containerized | bool
-
-- name: Configure Bind
-  template:
-    src: "{{ item.src }}"
-    dest: "{{ item.dest }}"
-  with_items:
-    - src: openshift-cluster.zone
-      dest: /var/named/openshift-cluster.zone
-    - src: named.conf
-      dest: /etc/named.conf
-  notify: restart bind
-
-- name: Enable Bind
-  systemd:
-    name: named
-    state: started
-    enabled: yes
-    daemon_reload: yes
diff --git a/roles/dns/templates/Dockerfile b/roles/dns/templates/Dockerfile
deleted file mode 100644
index cdff0a228..000000000
--- a/roles/dns/templates/Dockerfile
+++ /dev/null
@@ -1,11 +0,0 @@
-FROM {{ base_docker_image }}
-MAINTAINER Jan Provaznik <jprovazn@redhat.com>
-
-# install main packages:
-RUN yum -y update; yum clean all;
-RUN yum -y install bind-utils bind
-
-EXPOSE 53
-
-# start services:
-CMD ["/usr/sbin/named", "-f"]
diff --git a/roles/dns/templates/named.conf b/roles/dns/templates/named.conf
deleted file mode 100644
index 22c1ff935..000000000
--- a/roles/dns/templates/named.conf
+++ /dev/null
@@ -1,23 +0,0 @@
-options
-{
-    directory "/var/named";
-
-    allow-query { {{ ansible_default_ipv4.network }}/24; };
-
-    recursion yes;
-
-{% if dns_forwarders is defined %}
-    forwarders {
-        {% for dns in dns_forwarders %}
-        {{ dns }};
-        {% endfor %}
-    };
-{% endif %}
-};
-{% for zone in dns_zones %}
-
-zone "{{ zone }}" IN {
-    type master;
-    file "openshift-cluster.zone";
-};
-{% endfor %}
diff --git a/roles/dns/templates/named.service.j2 b/roles/dns/templates/named.service.j2
deleted file mode 100644
index 6e0a7a640..000000000
--- a/roles/dns/templates/named.service.j2
+++ /dev/null
@@ -1,15 +0,0 @@
-[Unit]
-Requires={{ openshift.docker.service_name }}.service
-After={{ openshift.docker.service_name }}.service
-PartOf={{ openshift.docker.service_name }}.service
-
-[Service]
-Type=simple
-TimeoutStartSec=5m
-ExecStartPre=/usr/bin/docker run --rm -v /etc/named.conf:/etc/named.conf -v /var/named:/var/named:z bind named-checkconf -z /etc/named.conf
-ExecStartPre=-/usr/bin/docker rm -f bind
-ExecStart=/usr/bin/docker run --name bind -p 53:53/udp -v /var/log:/var/log -v /etc/named.conf:/etc/named.conf -v /var/named:/var/named:z bind
-ExecStop=/usr/bin/docker stop bind
-
-[Install]
-WantedBy={{ openshift.docker.service_name }}.service
diff --git a/roles/dns/templates/openshift-cluster.zone b/roles/dns/templates/openshift-cluster.zone
deleted file mode 100644
index 03f5dc089..000000000
--- a/roles/dns/templates/openshift-cluster.zone
+++ /dev/null
@@ -1,14 +0,0 @@
-$TTL 1d
-@               IN      SOA     {{ ansible_hostname }} openshift (
-                                {{ ansible_date_time.epoch }}      ; Serial (To be fixed before 2039)
-                                12h     ; Refresh
-                                3m      ; Retry
-                                4w      ; Expire
-                                3h      ; TTL for negative replies
-                        )
-
-    IN NS {{ ansible_hostname }}
-{{ ansible_hostname }}  IN A  {{ ansible_default_ipv4.address }}
-{% for host in dns_all_hosts %}
-{{ hostvars[host].ansible_hostname }}  IN A  {{ hostvars[host]['ansible_default_ipv4'].address }}
-{% endfor %}