Get rid of global service-password.
No longer needed, less globals == win. Change-Id: I2872e5a8775a09b2e857ef082f3b86109785a126
This commit is contained in:
parent
eadb34841f
commit
3ad09e4e41
|
@ -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}
|
||||
|
|
|
@ -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:
|
||||
|
|
|
@ -159,7 +159,6 @@ Resources:
|
|||
swift:
|
||||
store_user: unset
|
||||
store_key: unset
|
||||
service-password: unset
|
||||
notcompute:
|
||||
Type: OS::Nova::Server
|
||||
Properties:
|
||||
|
|
Loading…
Reference in New Issue