From e35a6fb62a5bf60b7193caf2b3a46217275246bc Mon Sep 17 00:00:00 2001 From: Mark Lamourine Date: Thu, 20 Jul 2017 23:43:40 +0000 Subject: [PATCH] remove unused code from pre-DNS --- infra.yaml | 8 -------- master.yaml | 8 -------- node.yaml | 9 --------- 3 files changed, 25 deletions(-) diff --git a/infra.yaml b/infra.yaml index 4daddb4..616dd1c 100644 --- 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 index 2942756..93ea1d2 100644 --- 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 index e1a8b3c..c69bdad 100644 --- 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