summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Su <rwsu@redhat.com>2014-02-11 15:52:37 -0800
committerRichard Su <rwsu@redhat.com>2014-02-17 11:07:28 -0800
commitff0959a200cfad26d0c688bf293e3ebeb365ff48 (patch)
tree16171e1bf31f959becb23c5fde5af4f7fa6e5e7c
parent5577ae61ecc1799e49f80b551104a28f00d0bf89 (diff)
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
-rw-r--r--block-storage.yaml4
-rw-r--r--examples/scale1.yaml1
-rw-r--r--examples/scale2.yaml3
-rw-r--r--notcompute.yaml7
-rw-r--r--nova-compute-group.yaml3
-rw-r--r--nova-compute-instance.yaml3
-rw-r--r--overcloud-source.yaml15
-rw-r--r--undercloud-source.yaml14
8 files changed, 46 insertions, 4 deletions
diff --git a/block-storage.yaml b/block-storage.yaml
index 48496356..ef55506f 100644
--- a/block-storage.yaml
+++ b/block-storage.yaml
@@ -13,6 +13,9 @@ Parameters:
RabbitHost:
Type: String
Default: {"Fn::Select": [ 0, {"Fn::Select": [ "ctlplane", {"Fn::GetAtt": [notCompute0, networks]} ]} ] }
+ RabbitUserName:
+ Type: String
+ Default: "guest"
RabbitPassword:
Type: String
Default: "guest"
@@ -59,6 +62,7 @@ Resources:
admin-password: {Ref: AdminPassword}
rabbit:
host: {Ref: RabbitHost}
+ username: {Ref: RabbitUserName}
password: {Ref: RabbitPassword}
interfaces:
control: {Ref: NeutronPublicInterface}
diff --git a/examples/scale1.yaml b/examples/scale1.yaml
index c0a0763d..bbe618da 100644
--- a/examples/scale1.yaml
+++ b/examples/scale1.yaml
@@ -23,6 +23,7 @@ Resources:
SubKey: Resources.NovaCompute0Config
Parameters:
ComputeImage: "123"
+ RabbitUserName: "guest"
RabbitPassword: "guest"
NovaCompute0:
Type: FileInclude
diff --git a/examples/scale2.yaml b/examples/scale2.yaml
index d1a81fe5..8b3e4f8f 100644
--- a/examples/scale2.yaml
+++ b/examples/scale2.yaml
@@ -2,6 +2,8 @@ HeatTemplateFormatVersion: '2012-12-12'
Parameters:
ComputeImage:
Type: String
+ RabbitUserName:
+ Type: String
RabbitPassword:
Type: String
NoEcho: true
@@ -62,5 +64,6 @@ Resources:
- NovaCompute0
- networks
rabbit:
+ username: {Ref: RabbitUserName}
password: {Ref: RabbitPassword}
diff --git a/notcompute.yaml b/notcompute.yaml
index fe66f3bb..b097dd02 100644
--- a/notcompute.yaml
+++ b/notcompute.yaml
@@ -65,6 +65,8 @@ Parameters:
Description: Password for RabbitMQ
Type: String
NoEcho: true
+ RabbitUserName:
+ Type: String
RabbitPassword:
Type: String
NoEcho: true
@@ -180,10 +182,13 @@ Resources:
rabbit:
host:
'127.0.0.1'
+ username:
+ Ref: RabbitUserName
password:
Ref: RabbitPassword
users:
- username: guest
+ username:
+ Ref: RabbitUserName
password:
Ref: RabbitPassword
service-password:
diff --git a/nova-compute-group.yaml b/nova-compute-group.yaml
index 99420280..6a586433 100644
--- a/nova-compute-group.yaml
+++ b/nova-compute-group.yaml
@@ -22,6 +22,8 @@ Parameters:
Type: String
RabbitHost:
Type: String
+ RabbitUserName:
+ Type: String
RabbitPassword:
Type: String
NoEcho: true
@@ -54,6 +56,7 @@ Resources:
ServicePassword: {Ref: ServicePassword}
NeutronHost: {Ref: NeutronHost}
RabbitHost: {Ref: RabbitHost}
+ RabbitUserName: {Ref: RabbitUserName}
RabbitPassword: {Ref: RabbitPassword}
NovaInterfaces: {Ref: NovaInterfaces}
NovaComputeDriver: {Ref: NovaComputeDriver}
diff --git a/nova-compute-instance.yaml b/nova-compute-instance.yaml
index 8b2411ee..55665dce 100644
--- a/nova-compute-instance.yaml
+++ b/nova-compute-instance.yaml
@@ -39,6 +39,8 @@ Parameters:
Type: String
RabbitHost:
Type: String
+ RabbitUserName:
+ Type: String
RabbitPassword:
Type: String
NoEcho: true
@@ -189,4 +191,5 @@ Resources:
admin-password: {Ref: AdminPassword}
rabbit:
host: {Ref: RabbitHost}
+ username: {Ref: RabbitUserName}
password: {Ref: RabbitPassword}
diff --git a/overcloud-source.yaml b/overcloud-source.yaml
index 77b4c529..2bec12f9 100644
--- a/overcloud-source.yaml
+++ b/overcloud-source.yaml
@@ -115,6 +115,15 @@ Parameters:
NtpServer:
Type: String
Default: ''
+ RabbitUserName:
+ Default: guest
+ Description: The username for RabbitMQ
+ Type: String
+ RabbitPassword:
+ Default: guest
+ Description: The password for RabbitMQ
+ Type: String
+ NoEcho: true
StaticHosts:
Default:
Fn::Join:
@@ -197,7 +206,6 @@ Resources:
Ref: HypervisorNeutronPublicInterface
NeutronBridgeMappings:
Ref: NeutronBridgeMappings
- RabbitPassword: "guest"
StaticHosts:
Ref: StaticHosts
NovaCompute0:
@@ -388,7 +396,10 @@ Resources:
- Fn::GetAtt:
- notCompute0
- networks
- password: guest
+ username:
+ Ref: RabbitUserName
+ password:
+ Ref: RabbitPassword
ntp:
servers:
- {server: {Ref: NtpServer}, fudge: "stratum 0"}
diff --git a/undercloud-source.yaml b/undercloud-source.yaml
index 9c49e656..72a5beb1 100644
--- a/undercloud-source.yaml
+++ b/undercloud-source.yaml
@@ -57,6 +57,15 @@ Parameters:
Description: The password for the nova service account, used by nova-api.
Type: String
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:
AccessPolicy:
Properties:
@@ -165,7 +174,10 @@ Resources:
Ref: NeutronPassword
rabbit:
host: 127.0.0.1
- password: guest
+ username:
+ Ref: RabbitUserName
+ password:
+ Ref: RabbitPassword
undercloud:
Type: OS::Nova::Server
Properties: