summaryrefslogtreecommitdiffstats
path: root/overcloud-source.yaml
diff options
context:
space:
mode:
Diffstat (limited to 'overcloud-source.yaml')
-rw-r--r--overcloud-source.yaml22
1 files changed, 13 insertions, 9 deletions
diff --git a/overcloud-source.yaml b/overcloud-source.yaml
index 02ecdfa1..70c8f7d7 100644
--- a/overcloud-source.yaml
+++ b/overcloud-source.yaml
@@ -286,7 +286,6 @@ Resources:
Parameters:
NovaApiHost: {'Fn::Select': [ip_address, 'Fn::Select': [0, 'Fn::GetAtt': [ControlVirtualIP, fixed_ips]]]}
KeystoneHost: {'Fn::Select': [ip_address, 'Fn::Select': [0, 'Fn::GetAtt': [ControlVirtualIP, fixed_ips]]]}
- RabbitHost: {'Fn::Select': [ip_address, 'Fn::Select': [0, 'Fn::GetAtt': [ControlVirtualIP, fixed_ips]]]}
NeutronHost: {'Fn::Select': [ip_address, 'Fn::Select': [0, 'Fn::GetAtt': [ControlVirtualIP, fixed_ips]]]}
GlanceHost: {'Fn::Select': [ip_address, 'Fn::Select': [0, 'Fn::GetAtt': [ControlVirtualIP, fixed_ips]]]}
NovaDSN: {"Fn::Join": ['', ['mysql://nova:unset@', {'Fn::Select': [ip_address, 'Fn::Select': [0, 'Fn::GetAtt': [ControlVirtualIP, fixed_ips]]]}, '/nova']]}
@@ -303,12 +302,12 @@ Resources:
Ref: HypervisorNeutronPublicInterface
NeutronBridgeMappings:
Ref: NeutronBridgeMappings
- NovaCompute0Hosts:
+ NovaCompute0AllNodes:
Type: FileInclude
Path: nova-compute-instance.yaml
- SubKey: Resources.NovaCompute0HostsDeploy
+ SubKey: Resources.NovaCompute0AllNodesDeploy
Parameters:
- HostsConfig: {Ref: allHostsConfig}
+ AllNodesConfig: {Ref: allNodesConfig}
NovaCompute0Passthrough:
Type: OS::Heat::StructuredDeployment
Properties:
@@ -442,8 +441,6 @@ Resources:
service-password:
Ref: NovaPassword
rabbit:
- host:
- get_input: controller_host
username:
Ref: RabbitUserName
password:
@@ -481,10 +478,10 @@ Resources:
key_name:
Ref: KeyName
user_data_format: SOFTWARE_CONFIG
- controller0Hosts:
+ controller0AllNodesConfig:
Type: OS::Heat::StructuredDeployment
Properties:
- config: {Ref: allHostsConfig}
+ config: {Ref: allNodesConfig}
server: {Ref: controller0}
signal_transport: NO_SIGNAL
controller0Deployment:
@@ -527,7 +524,7 @@ Resources:
- - 'http://'
- {'Fn::Select': [ip_address, 'Fn::Select': [0, 'Fn::GetAtt': [ControlVirtualIP, fixed_ips]]]}
- ':8000/v1/waitcondition'
- allHostsConfig:
+ allNodesConfig:
Type: OS::Heat::StructuredConfig
Properties:
config:
@@ -587,6 +584,13 @@ Resources:
- show
- 'novalocal'
- {Ref: CloudName}
+ rabbit:
+ nodes:
+ Fn::Join:
+ - ','
+ - Merge::Map:
+ controller0:
+ {"Fn::Select": [ name, {"Fn::GetAtt": [controller0, show]} ] }
controller0SSLDeployment:
Type: OS::Heat::StructuredDeployment
Properties: