diff options
author | Michael Gugino <mgugino@redhat.com> | 2017-08-29 18:34:21 -0400 |
---|---|---|
committer | Michael Gugino <mgugino@redhat.com> | 2017-08-31 10:01:26 -0400 |
commit | 0ae8e9804070a829b719b8141210f44d8d79f92c (patch) | |
tree | 74a5cb5dfeb0aa01e5d2a11780859ec97b4f59bd /roles/dns/templates | |
parent | 7faa0c4111252a2710166cdbd027575e1cf1cb8a (diff) | |
download | openshift-0ae8e9804070a829b719b8141210f44d8d79f92c.tar.gz openshift-0ae8e9804070a829b719b8141210f44d8d79f92c.tar.bz2 openshift-0ae8e9804070a829b719b8141210f44d8d79f92c.tar.xz openshift-0ae8e9804070a829b719b8141210f44d8d79f92c.zip |
Removed dns role
This commit removes now-unused dns role.
Diffstat (limited to 'roles/dns/templates')
-rw-r--r-- | roles/dns/templates/Dockerfile | 11 | ||||
-rw-r--r-- | roles/dns/templates/named.conf | 23 | ||||
-rw-r--r-- | roles/dns/templates/named.service.j2 | 15 | ||||
-rw-r--r-- | roles/dns/templates/openshift-cluster.zone | 14 |
4 files changed, 0 insertions, 63 deletions
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 %} |