From 04027e783f8aa4d8f1c56c7f2b50ac49ba16194d Mon Sep 17 00:00:00 2001 From: Giulio Fidente Date: Tue, 28 Apr 2015 05:38:11 -0400 Subject: Remove hardcoded references to .novalocal in hostnames Remove references to the .novalocal domain part in the hosts file. Change-Id: Idf14907adaf2f35440b6f28870fe18434eadd1be Depends-On: Iadfdf4120c4d1c9b6976321753957fd4eecf301c --- ceph-storage.yaml | 2 +- cinder-storage.yaml | 2 +- compute.yaml | 2 +- controller.yaml | 2 +- deprecated/overcloud-source.yaml | 16 ---------------- puppet/ceph-storage-puppet.yaml | 2 +- puppet/cinder-storage-puppet.yaml | 2 +- puppet/compute-puppet.yaml | 2 +- puppet/controller-puppet.yaml | 2 +- puppet/hieradata/common.yaml | 1 - puppet/swift-storage-puppet.yaml | 2 +- swift-storage.yaml | 2 +- 12 files changed, 10 insertions(+), 27 deletions(-) diff --git a/ceph-storage.yaml b/ceph-storage.yaml index f89d5f3a..07d7f568 100644 --- a/ceph-storage.yaml +++ b/ceph-storage.yaml @@ -114,7 +114,7 @@ outputs: hosts_entry: value: str_replace: - template: "IP HOST HOST.novalocal" + template: "IP HOST" params: IP: {get_attr: [CephStorage, networks, ctlplane, 0]} HOST: {get_attr: [CephStorage, name]} diff --git a/cinder-storage.yaml b/cinder-storage.yaml index f26ef3e2..7d44094f 100644 --- a/cinder-storage.yaml +++ b/cinder-storage.yaml @@ -159,7 +159,7 @@ outputs: hosts_entry: value: str_replace: - template: "IP HOST HOST.novalocal" + template: "IP HOST" params: IP: {get_attr: [BlockStorage, networks, ctlplane, 0]} HOST: {get_attr: [BlockStorage, name]} diff --git a/compute.yaml b/compute.yaml index f7e434f5..672687ca 100644 --- a/compute.yaml +++ b/compute.yaml @@ -427,7 +427,7 @@ outputs: Server's IP address and hostname in the /etc/hosts format value: str_replace: - template: "IP HOST HOST.novalocal" + template: "IP HOST" params: IP: {get_attr: [NovaCompute, networks, ctlplane, 0]} HOST: {get_attr: [NovaCompute, name]} diff --git a/controller.yaml b/controller.yaml index b578a252..e6d410f5 100644 --- a/controller.yaml +++ b/controller.yaml @@ -922,7 +922,7 @@ outputs: Server's IP address and hostname in the /etc/hosts format value: str_replace: - template: IP HOST HOST.novalocal CLOUDNAME + template: IP HOST CLOUDNAME params: IP: {get_attr: [Controller, networks, ctlplane, 0]} HOST: {get_attr: [Controller, name]} diff --git a/deprecated/overcloud-source.yaml b/deprecated/overcloud-source.yaml index 82fe6755..d355c4df 100644 --- a/deprecated/overcloud-source.yaml +++ b/deprecated/overcloud-source.yaml @@ -877,10 +877,6 @@ resources: - ' ' - - {get_attr: [NovaCompute0, networks, ctlplane, 0]} - {get_attr: [NovaCompute0, name]} - - Fn::Join: - - '.' - - - {get_attr: [NovaCompute0, name]} - - 'novalocal' - Fn::Join: - "\n" - Merge::Map: @@ -889,10 +885,6 @@ resources: - ' ' - - {get_attr: [BlockStorage0, networks, ctlplane, 0]} - {get_attr: [BlockStorage0, name]} - - Fn::Join: - - '.' - - - {get_attr: [BlockStorage0, name]} - - 'novalocal' - Fn::Join: - "\n" - Merge::Map: @@ -901,10 +893,6 @@ resources: - ' ' - - {get_attr: [SwiftStorage0, networks, ctlplane, 0]} - {get_attr: [SwiftStorage0, name]} - - Fn::Join: - - '.' - - - {get_attr: [SwiftStorage0, name]} - - 'novalocal' - Fn::Join: - "\n" - Merge::Map: @@ -913,10 +901,6 @@ resources: - ' ' - - {get_attr: [controller0, networks, ctlplane, 0]} - {get_attr: [controller0, name]} - - Fn::Join: - - '.' - - - {get_attr: [controller0, name]} - - 'novalocal' - {get_param: CloudName} rabbit: nodes: diff --git a/puppet/ceph-storage-puppet.yaml b/puppet/ceph-storage-puppet.yaml index 660ea30a..bc9b4b5a 100644 --- a/puppet/ceph-storage-puppet.yaml +++ b/puppet/ceph-storage-puppet.yaml @@ -94,7 +94,7 @@ outputs: hosts_entry: value: str_replace: - template: "IP HOST HOST.novalocal" + template: "IP HOST" params: IP: {get_attr: [CephStorage, networks, ctlplane, 0]} HOST: {get_attr: [CephStorage, name]} diff --git a/puppet/cinder-storage-puppet.yaml b/puppet/cinder-storage-puppet.yaml index de96809a..708f6a9b 100644 --- a/puppet/cinder-storage-puppet.yaml +++ b/puppet/cinder-storage-puppet.yaml @@ -206,7 +206,7 @@ outputs: hosts_entry: value: str_replace: - template: "IP HOST HOST.novalocal" + template: "IP HOST" params: IP: {get_attr: [BlockStorage, networks, ctlplane, 0]} HOST: {get_attr: [BlockStorage, name]} diff --git a/puppet/compute-puppet.yaml b/puppet/compute-puppet.yaml index a31ea858..367bc405 100644 --- a/puppet/compute-puppet.yaml +++ b/puppet/compute-puppet.yaml @@ -446,7 +446,7 @@ outputs: Server's IP address and hostname in the /etc/hosts format value: str_replace: - template: "IP HOST HOST.novalocal" + template: "IP HOST" params: IP: {get_attr: [NovaCompute, networks, ctlplane, 0]} HOST: {get_attr: [NovaCompute, name]} diff --git a/puppet/controller-puppet.yaml b/puppet/controller-puppet.yaml index 4e04eb0e..4cf6ff64 100644 --- a/puppet/controller-puppet.yaml +++ b/puppet/controller-puppet.yaml @@ -858,7 +858,7 @@ outputs: Server's IP address and hostname in the /etc/hosts format value: str_replace: - template: IP HOST HOST.novalocal CLOUDNAME + template: IP HOST CLOUDNAME params: IP: {get_attr: [Controller, networks, ctlplane, 0]} HOST: {get_attr: [Controller, name]} diff --git a/puppet/hieradata/common.yaml b/puppet/hieradata/common.yaml index 14ba97e2..b468aa13 100644 --- a/puppet/hieradata/common.yaml +++ b/puppet/hieradata/common.yaml @@ -11,4 +11,3 @@ nova::network::neutron::neutron_admin_tenant_name: 'service' nova::network::neutron::neutron_admin_username: 'neutron' nova::network::neutron::vif_plugging_is_fatal: false nova::network::neutron::vif_plugging_timeout: 30 - diff --git a/puppet/swift-storage-puppet.yaml b/puppet/swift-storage-puppet.yaml index c3eb9536..45922436 100644 --- a/puppet/swift-storage-puppet.yaml +++ b/puppet/swift-storage-puppet.yaml @@ -136,7 +136,7 @@ outputs: hosts_entry: value: str_replace: - template: "IP HOST HOST.novalocal" + template: "IP HOST" params: IP: {get_attr: [SwiftStorage, networks, ctlplane, 0]} HOST: {get_attr: [SwiftStorage, name]} diff --git a/swift-storage.yaml b/swift-storage.yaml index 7160c14d..42c591d2 100644 --- a/swift-storage.yaml +++ b/swift-storage.yaml @@ -145,7 +145,7 @@ outputs: hosts_entry: value: str_replace: - template: "IP HOST HOST.novalocal" + template: "IP HOST" params: IP: {get_attr: [SwiftStorage, networks, ctlplane, 0]} HOST: {get_attr: [SwiftStorage, name]} -- cgit 1.2.3-korg