From f8106699eb9157797f27157b62aef83cacb02791 Mon Sep 17 00:00:00 2001
From: Bogdan Dobrelya <bdobreli@redhat.com>
Date: Mon, 4 Dec 2017 10:38:44 +0100
Subject: Fix and cleanup not required dns bits

* Do not manage hostnames for openstack cloud provider,
  let cloud-init to do its job.
* Make python-dns / dnspython dependency check conditional.
* Drop not used dns node flavor and image.
* Do not manage dns nodes and sec groups in heat stacks.
* Keep supporting dynamic updates for private DNS records, yet only
  limited to an external DNS managed elsewhere (not deployed by
  the openshift_openstack provider). So users may still benefit from
  this feature, sending nsupdates to private and public servers as
  they want it.
* Fix openstack default for external nsupdate keys. It should be
  undefined by default as the dns-populate logic is based on that.
* Fix dns records generation for openstack provider's populate-dns
* Update docs
---
 .../templates/heat_stack.yaml.j2                   | 105 ---------------------
 1 file changed, 105 deletions(-)

(limited to 'roles/openshift_openstack/templates')

diff --git a/roles/openshift_openstack/templates/heat_stack.yaml.j2 b/roles/openshift_openstack/templates/heat_stack.yaml.j2
index ec488941e..8d13eb81e 100644
--- a/roles/openshift_openstack/templates/heat_stack.yaml.j2
+++ b/roles/openshift_openstack/templates/heat_stack.yaml.j2
@@ -54,23 +54,6 @@ outputs:
     description: Floating IPs of the nodes
     value: { get_attr: [ infra_nodes, floating_ip ] }
 
-{% if openshift_openstack_num_dns|int > 0 %}
-  dns_name:
-    description: Name of the DNS
-    value:
-      get_attr:
-        - dns
-        - name
-
-  dns_floating_ips:
-    description: Floating IPs of the DNS
-    value: { get_attr: [ dns, floating_ip ] }
-
-  dns_private_ips:
-    description: Private IPs of the DNS
-    value: { get_attr: [ dns, private_ip ] }
-{% endif %}
-
 conditions:
   no_floating: {% if openshift_openstack_provider_network_name %}true{% else %}false{% endif %}
 
@@ -436,43 +419,6 @@ resources:
           port_range_min: 443
           port_range_max: 443
 
-{% if openshift_openstack_num_dns|int > 0 %}
-  dns-secgrp:
-    type: OS::Neutron::SecurityGroup
-    properties:
-      name:
-        str_replace:
-          template: openshift-ansible-cluster_id-dns-secgrp
-          params:
-            cluster_id: {{ openshift_openstack_stack_name }}
-      description:
-        str_replace:
-          template: Security group for cluster_id cluster DNS
-          params:
-            cluster_id: {{ openshift_openstack_stack_name }}
-      rules:
-        - direction: ingress
-          protocol: udp
-          port_range_min: 53
-          port_range_max: 53
-          remote_ip_prefix: {{ openshift_openstack_node_ingress_cidr }}
-        - direction: ingress
-          protocol: udp
-          port_range_min: 53
-          port_range_max: 53
-          remote_ip_prefix: "{{ openshift_openstack_subnet_prefix }}.0/24"
-        - direction: ingress
-          protocol: tcp
-          port_range_min: 53
-          port_range_max: 53
-          remote_ip_prefix: {{ openshift_openstack_node_ingress_cidr }}
-        - direction: ingress
-          protocol: tcp
-          port_range_min: 53
-          port_range_max: 53
-          remote_ip_prefix: "{{ openshift_openstack_subnet_prefix }}.0/24"
-{% endif %}
-
 {% if openshift_openstack_num_masters|int > 1 %}
   lb-secgrp:
     type: OS::Neutron::SecurityGroup
@@ -818,54 +764,3 @@ resources:
     depends_on:
       - interface
 {% endif %}
-
-{% if openshift_openstack_num_dns|int > 0 %}
-  dns:
-    type: OS::Heat::ResourceGroup
-    properties:
-      count: {{ openshift_openstack_num_dns }}
-      resource_def:
-        type: server.yaml
-        properties:
-          name:
-            str_replace:
-              template: k8s_type-%index%.cluster_id
-              params:
-                cluster_id: {{ openshift_openstack_stack_name }}
-                k8s_type: {{ openshift_openstack_dns_hostname }}
-          cluster_env: {{ openshift_openstack_public_dns_domain }}
-          cluster_id:  {{ openshift_openstack_stack_name }}
-          group:
-            str_replace:
-              template: k8s_type.cluster_id
-              params:
-                k8s_type: dns
-                cluster_id: {{ openshift_openstack_stack_name }}
-          type:        dns
-          image:       {{ openshift_openstack_dns_image }}
-          flavor:      {{ openshift_openstack_dns_flavor }}
-          key_name:    {{ openshift_openstack_keypair_name }}
-{% if openshift_openstack_provider_network_name %}
-          net:         {{ openshift_openstack_provider_network_name }}
-          net_name:         {{ openshift_openstack_provider_network_name }}
-{% else %}
-          net:         { get_resource: net }
-          subnet:      { get_resource: subnet }
-          net_name:
-            str_replace:
-              template: openshift-ansible-cluster_id-net
-              params:
-                cluster_id: {{ openshift_openstack_stack_name }}
-{% endif %}
-          secgrp:
-            - { get_resource: dns-secgrp }
-            - { get_resource: common-secgrp }
-{% if not openshift_openstack_provider_network_name %}
-          floating_network: {{ openshift_openstack_external_network_name }}
-{% endif %}
-          volume_size: {{ openshift_openstack_dns_volume_size }}
-{% if not openshift_openstack_provider_network_name %}
-    depends_on:
-      - interface
-{% endif %}
-{% endif %}
-- 
cgit v1.2.3