diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2014-07-02 18:16:24 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2014-07-02 18:16:24 +0000 |
| commit | 836ccb71847da461bf81fb20ffcac5e3abfd127c (patch) | |
| tree | e76fe948490e0ea210ef5b2029bee60ad59d40a7 /nova-compute-instance.yaml | |
| parent | 484c0551b2b39fa1932394ca2062ab5a4509194f (diff) | |
| parent | 306841c7f2bce5ce8da4dcfa6f127abfa9a6283b (diff) | |
Merge "Enable multi-node rabbitmq cluster"
Diffstat (limited to 'nova-compute-instance.yaml')
| -rw-r--r-- | nova-compute-instance.yaml | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/nova-compute-instance.yaml b/nova-compute-instance.yaml index f0a64cbf..3ac423b3 100644 --- a/nova-compute-instance.yaml +++ b/nova-compute-instance.yaml @@ -77,8 +77,6 @@ Parameters: Default: '' Description: A port to add to the NeutronPhysicalBridge. Type: String - RabbitHost: - Type: String RabbitUserName: Type: String RabbitPassword: @@ -145,9 +143,9 @@ Parameters: Type: String NeutronEnableTunnelling: Type: String - HostsConfig: + AllNodesConfig: Type: String - Description: OS::Heat::Config to use for hosts file deployment + Description: OS::Heat::Config to use for all nodes deployment LiveUpdateUserName: Type: String Description: The live-update username for the undercloud Glance API. @@ -214,7 +212,6 @@ Resources: neutron_public_interface: {Ref: NeutronPublicInterface} neutron_password: {Ref: NeutronPassword} admin_password: {Ref: AdminPassword} - rabbit_host: {Ref: RabbitHost} rabbit_username: {Ref: RabbitUserName} rabbit_password: {Ref: RabbitPassword} live_update_host: {Ref: LiveUpdateHost} @@ -224,10 +221,10 @@ Resources: nova_image: {Ref: NovaImage} live_update_image_id: {Ref: LiveUpdateComputeImage} ntp_server: {Ref: NtpServer} - NovaCompute0HostsDeploy: + NovaCompute0AllNodesDeploy: Type: OS::Heat::StructuredDeployment Properties: - config: {Ref: HostsConfig} + config: {Ref: AllNodesConfig} server: {Ref: NovaCompute0} signal_transport: NO_SIGNAL NovaCompute0Passthrough: |