Merge pull request redhat-openstack#376 from markllama/remove_etc_app…

…endix remove unused code from pre-DNS
ioggstream · Jul 24, 2017 · c98db0f · c98db0f
2 parents 1898b76 + e35a6fb
commit c98db0f
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 25 deletions.
diff --git a/infra.yaml b/infra.yaml
@@ -448,7 +448,6 @@ resources:
     properties:
       group: script
       inputs:
-      - name: node_etc_host
       - name: node_hostname
       - name: node_type
       outputs:
@@ -472,13 +471,6 @@ resources:
             params:
               HOST: {get_param: hostname}
               DOMAIN: {get_param: domain_name}
-        node_etc_host:
-          str_replace:
-              template: "IP HOST.DOMAIN HOST #openshift"
-              params:
-                IP: {get_attr: [port, fixed_ips, 0, ip_address]}
-                HOST: {get_param: hostname}
-                DOMAIN: {get_param: domain_name}
 
   node_cleanup:
     type: OS::Heat::SoftwareConfig

diff --git a/master.yaml b/master.yaml
@@ -440,7 +440,6 @@ resources:
     properties:
       group: script
       inputs:
-      - name: node_etc_host
       - name: node_hostname
       - name: node_type
       outputs:
@@ -464,13 +463,6 @@ resources:
             params:
               HOST: {get_param: hostname}
               DOMAIN: {get_param: domain_name}
-        node_etc_host:
-          str_replace:
-              template: "IP HOST.DOMAIN HOST #openshift"
-              params:
-                IP: {get_attr: [port, fixed_ips, 0, ip_address]}
-                HOST: {get_param: hostname}
-                DOMAIN: {get_param: domain_name}
 
   node_cleanup:
     type: OS::Heat::SoftwareConfig

diff --git a/node.yaml b/node.yaml
@@ -622,7 +622,6 @@ resources:
     properties:
       group: script
       inputs:
-      - name: node_etc_host
       - name: node_hostname
       - name: node_type
       outputs:
@@ -647,14 +646,6 @@ resources:
               HOST: {get_param: hostname}
               SUFFIX: {get_attr: [random_hostname_suffix, value]}
               DOMAIN: {get_param: domain_name}
-        node_etc_host:
-          str_replace:
-              template: "IP HOST-SUFFIX.DOMAIN HOST-SUFFIX #openshift"
-              params:
-                IP: {get_attr: [port, fixed_ips, 0, ip_address]}
-                HOST: {get_param: hostname}
-                SUFFIX: {get_attr: [random_hostname_suffix, value]}
-                DOMAIN: {get_param: domain_name}
 
   # Execute the ansible playbook(s) on the bastion server to configure the
   # openshift hosts and services