aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--nova-compute-instance.yaml5
-rw-r--r--overcloud-source.yaml21
2 files changed, 26 insertions, 0 deletions
diff --git a/nova-compute-instance.yaml b/nova-compute-instance.yaml
index 6c2671c0..8b2411ee 100644
--- a/nova-compute-instance.yaml
+++ b/nova-compute-instance.yaml
@@ -86,6 +86,10 @@ Parameters:
Type: String
NeutronEnableTunnelling:
Type: String
+ StaticHosts:
+ Default: ''
+ Description: Static content to append to /etc/hosts
+ Type: String
Resources:
ComputeAccessPolicy:
Type: OS::Heat::AccessPolicy
@@ -158,6 +162,7 @@ Resources:
compute_agent: {Ref: CeilometerComputeAgent}
glance:
host: {Ref: GlanceHost}
+ hosts: {Ref: StaticHosts}
keystone:
host: {Ref: KeystoneHost}
neutron:
diff --git a/overcloud-source.yaml b/overcloud-source.yaml
index 7fd7505f..77b4c529 100644
--- a/overcloud-source.yaml
+++ b/overcloud-source.yaml
@@ -63,6 +63,10 @@ Parameters:
Description: The password for the ceilometer service account.
Type: String
NoEcho: true
+ CloudName:
+ Default: ''
+ Description: The DNS name of this cloud. E.g. ci-overcloud.tripleo.org
+ Type: String
NovaComputeDriver:
Default: libvirt.LibvirtDriver
Type: String
@@ -111,6 +115,20 @@ Parameters:
NtpServer:
Type: String
Default: ''
+ StaticHosts:
+ Default:
+ Fn::Join:
+ - ' '
+ - - Fn::Select:
+ - 0
+ - Fn::Select:
+ - ctlplane
+ - Fn::GetAtt:
+ - notCompute0
+ - networks
+ - {Ref: CloudName}
+ Description: Static content to append to /etc/hosts
+ Type: String
Resources:
AccessPolicy:
Properties:
@@ -180,6 +198,8 @@ Resources:
NeutronBridgeMappings:
Ref: NeutronBridgeMappings
RabbitPassword: "guest"
+ StaticHosts:
+ Ref: StaticHosts
NovaCompute0:
Type: FileInclude
Path: nova-compute-instance.yaml
@@ -283,6 +303,7 @@ Resources:
- notCompute0
- networks
- ':8000/v1/waitcondition'
+ hosts: {Ref: StaticHosts}
keystone:
db: mysql://keystone:unset@localhost/keystone
host: