Add username parameter for rabbit

Username is currently assumed to be guest in the configuration
files. This change makes it more explicit.

Configuration files in tripleo-image-elements will be updated
to use this parameter in an upcoming patch.

Change-Id: Ia176f4d573a3a293560c72236a4181befa678301
This commit is contained in:
Richard Su 2014-02-11 15:52:37 -08:00
parent 5577ae61ec
commit ff0959a200
8 changed files with 46 additions and 4 deletions

View File

@ -13,6 +13,9 @@ Parameters:
RabbitHost: RabbitHost:
Type: String Type: String
Default: {"Fn::Select": [ 0, {"Fn::Select": [ "ctlplane", {"Fn::GetAtt": [notCompute0, networks]} ]} ] } Default: {"Fn::Select": [ 0, {"Fn::Select": [ "ctlplane", {"Fn::GetAtt": [notCompute0, networks]} ]} ] }
RabbitUserName:
Type: String
Default: "guest"
RabbitPassword: RabbitPassword:
Type: String Type: String
Default: "guest" Default: "guest"
@ -59,6 +62,7 @@ Resources:
admin-password: {Ref: AdminPassword} admin-password: {Ref: AdminPassword}
rabbit: rabbit:
host: {Ref: RabbitHost} host: {Ref: RabbitHost}
username: {Ref: RabbitUserName}
password: {Ref: RabbitPassword} password: {Ref: RabbitPassword}
interfaces: interfaces:
control: {Ref: NeutronPublicInterface} control: {Ref: NeutronPublicInterface}

View File

@ -23,6 +23,7 @@ Resources:
SubKey: Resources.NovaCompute0Config SubKey: Resources.NovaCompute0Config
Parameters: Parameters:
ComputeImage: "123" ComputeImage: "123"
RabbitUserName: "guest"
RabbitPassword: "guest" RabbitPassword: "guest"
NovaCompute0: NovaCompute0:
Type: FileInclude Type: FileInclude

View File

@ -2,6 +2,8 @@ HeatTemplateFormatVersion: '2012-12-12'
Parameters: Parameters:
ComputeImage: ComputeImage:
Type: String Type: String
RabbitUserName:
Type: String
RabbitPassword: RabbitPassword:
Type: String Type: String
NoEcho: true NoEcho: true
@ -62,5 +64,6 @@ Resources:
- NovaCompute0 - NovaCompute0
- networks - networks
rabbit: rabbit:
username: {Ref: RabbitUserName}
password: {Ref: RabbitPassword} password: {Ref: RabbitPassword}

View File

@ -65,6 +65,8 @@ Parameters:
Description: Password for RabbitMQ Description: Password for RabbitMQ
Type: String Type: String
NoEcho: true NoEcho: true
RabbitUserName:
Type: String
RabbitPassword: RabbitPassword:
Type: String Type: String
NoEcho: true NoEcho: true
@ -180,10 +182,13 @@ Resources:
rabbit: rabbit:
host: host:
'127.0.0.1' '127.0.0.1'
username:
Ref: RabbitUserName
password: password:
Ref: RabbitPassword Ref: RabbitPassword
users: users:
username: guest username:
Ref: RabbitUserName
password: password:
Ref: RabbitPassword Ref: RabbitPassword
service-password: service-password:

View File

@ -22,6 +22,8 @@ Parameters:
Type: String Type: String
RabbitHost: RabbitHost:
Type: String Type: String
RabbitUserName:
Type: String
RabbitPassword: RabbitPassword:
Type: String Type: String
NoEcho: true NoEcho: true
@ -54,6 +56,7 @@ Resources:
ServicePassword: {Ref: ServicePassword} ServicePassword: {Ref: ServicePassword}
NeutronHost: {Ref: NeutronHost} NeutronHost: {Ref: NeutronHost}
RabbitHost: {Ref: RabbitHost} RabbitHost: {Ref: RabbitHost}
RabbitUserName: {Ref: RabbitUserName}
RabbitPassword: {Ref: RabbitPassword} RabbitPassword: {Ref: RabbitPassword}
NovaInterfaces: {Ref: NovaInterfaces} NovaInterfaces: {Ref: NovaInterfaces}
NovaComputeDriver: {Ref: NovaComputeDriver} NovaComputeDriver: {Ref: NovaComputeDriver}

View File

@ -39,6 +39,8 @@ Parameters:
Type: String Type: String
RabbitHost: RabbitHost:
Type: String Type: String
RabbitUserName:
Type: String
RabbitPassword: RabbitPassword:
Type: String Type: String
NoEcho: true NoEcho: true
@ -189,4 +191,5 @@ Resources:
admin-password: {Ref: AdminPassword} admin-password: {Ref: AdminPassword}
rabbit: rabbit:
host: {Ref: RabbitHost} host: {Ref: RabbitHost}
username: {Ref: RabbitUserName}
password: {Ref: RabbitPassword} password: {Ref: RabbitPassword}

View File

@ -115,6 +115,15 @@ Parameters:
NtpServer: NtpServer:
Type: String Type: String
Default: '' Default: ''
RabbitUserName:
Default: guest
Description: The username for RabbitMQ
Type: String
RabbitPassword:
Default: guest
Description: The password for RabbitMQ
Type: String
NoEcho: true
StaticHosts: StaticHosts:
Default: Default:
Fn::Join: Fn::Join:
@ -197,7 +206,6 @@ Resources:
Ref: HypervisorNeutronPublicInterface Ref: HypervisorNeutronPublicInterface
NeutronBridgeMappings: NeutronBridgeMappings:
Ref: NeutronBridgeMappings Ref: NeutronBridgeMappings
RabbitPassword: "guest"
StaticHosts: StaticHosts:
Ref: StaticHosts Ref: StaticHosts
NovaCompute0: NovaCompute0:
@ -388,7 +396,10 @@ Resources:
- Fn::GetAtt: - Fn::GetAtt:
- notCompute0 - notCompute0
- networks - networks
password: guest username:
Ref: RabbitUserName
password:
Ref: RabbitPassword
ntp: ntp:
servers: servers:
- {server: {Ref: NtpServer}, fudge: "stratum 0"} - {server: {Ref: NtpServer}, fudge: "stratum 0"}

View File

@ -57,6 +57,15 @@ Parameters:
Description: The password for the nova service account, used by nova-api. Description: The password for the nova service account, used by nova-api.
Type: String Type: String
NoEcho: true NoEcho: true
RabbitUserName:
Default: guest
Description: The username for RabbitMQ
Type: String
RabbitPassword:
Default: guest
Description: The password for RabbitMQ
Type: String
NoEcho: true
Resources: Resources:
AccessPolicy: AccessPolicy:
Properties: Properties:
@ -165,7 +174,10 @@ Resources:
Ref: NeutronPassword Ref: NeutronPassword
rabbit: rabbit:
host: 127.0.0.1 host: 127.0.0.1
password: guest username:
Ref: RabbitUserName
password:
Ref: RabbitPassword
undercloud: undercloud:
Type: OS::Nova::Server Type: OS::Nova::Server
Properties: Properties: