diff options
| author |   Robert Collins <rbtcollins@hp.com> | 2013-09-13 19:04:49 +1200 |
|---|---|---|
| committer | Robert Collins <rbtcollins@hp.com> | 2013-09-14 16:23:42 +1200 |
| commit | 3ad09e4e41ee40a4aa4436542f85953f0ab6b2c4 (patch) | |
| tree | af7f2fd5e969ca9278f155b174d6b352da536fdf | |
| parent | eadb34841f7b56b8c778800aabd8c41ff665153a (diff) | |
Get rid of global service-password.
No longer needed, less globals == win.
Change-Id: I2872e5a8775a09b2e857ef082f3b86109785a126
| -rw-r--r-- | nova-compute-instance.yaml | 11 | ||||
| -rw-r--r-- | overcloud-source.yaml | 2 | ||||
| -rw-r--r-- | undercloud-vm.yaml | 1 |
3 files changed, 5 insertions, 9 deletions
diff --git a/nova-compute-instance.yaml b/nova-compute-instance.yaml index b461d971..a3210447 100644 --- a/nova-compute-instance.yaml +++ b/nova-compute-instance.yaml @@ -1,6 +1,10 @@ HeatTemplateFormatVersion: '2012-12-12' Description: 'Nova Compute' Parameters: + AdminPassword: + Default: unset + Description: The password for the keystone admin account, used for monitoring, querying neutron etc. + Type: String KeyName: Description: Name of an existing EC2 KeyPair to enable SSH access to the instances Type: String @@ -14,9 +18,6 @@ Parameters: Default: overcloud-compute KeystoneHost: Type: String - ServicePassword: - Description: admin_password for setting up auth in nova. - Type: String NeutronHost: Type: String RabbitHost: @@ -120,9 +121,7 @@ Resources: network_vlan_ranges: {Ref: NeutronNetworkVLANRanges} bridge_mappings: {Ref: NeutronBridgeMappings} enable_tunneling: {Ref: NeutronEnableTunnelling} - - service-password: {Ref: ServicePassword} - admin-password: {Ref: ServicePassword} + admin-password: {Ref: AdminPassword} rabbit: host: {Ref: RabbitHost} password: {Ref: RabbitPassword} diff --git a/overcloud-source.yaml b/overcloud-source.yaml index 2505ba21..ff209483 100644 --- a/overcloud-source.yaml +++ b/overcloud-source.yaml @@ -98,7 +98,6 @@ Resources: NeutronNetworkVLANRanges: "" NeutronBridgeMappings: "" RabbitPassword: "guest" - ServicePassword: "unset" NovaCompute0: Type: FileInclude Path: nova-compute-instance.yaml @@ -225,7 +224,6 @@ Resources: - notcompute - PrivateIp password: guest - service-password: unset notcompute: Type: OS::Nova::Server Properties: diff --git a/undercloud-vm.yaml b/undercloud-vm.yaml index 7941b0da..428372ef 100644 --- a/undercloud-vm.yaml +++ b/undercloud-vm.yaml @@ -159,7 +159,6 @@ Resources: swift: store_user: unset store_key: unset - service-password: unset notcompute: Type: OS::Nova::Server Properties: |