Skip to content

Commit c98db0f

Browse files
authored
Merge pull request #376 from markllama/remove_etc_appendix
remove unused code from pre-DNS
2 parents 1898b76 + e35a6fb commit c98db0f

File tree

3 files changed

+0
-25
lines changed

3 files changed

+0
-25
lines changed

infra.yaml

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -448,7 +448,6 @@ resources:
448448
properties:
449449
group: script
450450
inputs:
451-
- name: node_etc_host
452451
- name: node_hostname
453452
- name: node_type
454453
outputs:
@@ -472,13 +471,6 @@ resources:
472471
params:
473472
HOST: {get_param: hostname}
474473
DOMAIN: {get_param: domain_name}
475-
node_etc_host:
476-
str_replace:
477-
template: "IP HOST.DOMAIN HOST #openshift"
478-
params:
479-
IP: {get_attr: [port, fixed_ips, 0, ip_address]}
480-
HOST: {get_param: hostname}
481-
DOMAIN: {get_param: domain_name}
482474

483475
node_cleanup:
484476
type: OS::Heat::SoftwareConfig

master.yaml

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -440,7 +440,6 @@ resources:
440440
properties:
441441
group: script
442442
inputs:
443-
- name: node_etc_host
444443
- name: node_hostname
445444
- name: node_type
446445
outputs:
@@ -464,13 +463,6 @@ resources:
464463
params:
465464
HOST: {get_param: hostname}
466465
DOMAIN: {get_param: domain_name}
467-
node_etc_host:
468-
str_replace:
469-
template: "IP HOST.DOMAIN HOST #openshift"
470-
params:
471-
IP: {get_attr: [port, fixed_ips, 0, ip_address]}
472-
HOST: {get_param: hostname}
473-
DOMAIN: {get_param: domain_name}
474466

475467
node_cleanup:
476468
type: OS::Heat::SoftwareConfig

node.yaml

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -622,7 +622,6 @@ resources:
622622
properties:
623623
group: script
624624
inputs:
625-
- name: node_etc_host
626625
- name: node_hostname
627626
- name: node_type
628627
outputs:
@@ -647,14 +646,6 @@ resources:
647646
HOST: {get_param: hostname}
648647
SUFFIX: {get_attr: [random_hostname_suffix, value]}
649648
DOMAIN: {get_param: domain_name}
650-
node_etc_host:
651-
str_replace:
652-
template: "IP HOST-SUFFIX.DOMAIN HOST-SUFFIX #openshift"
653-
params:
654-
IP: {get_attr: [port, fixed_ips, 0, ip_address]}
655-
HOST: {get_param: hostname}
656-
SUFFIX: {get_attr: [random_hostname_suffix, value]}
657-
DOMAIN: {get_param: domain_name}
658649

659650
# Execute the ansible playbook(s) on the bastion server to configure the
660651
# openshift hosts and services

0 commit comments

Comments
 (0)