summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRobert Collins <rbtcollins@hp.com>2013-09-13 18:48:05 +1200
committerRobert Collins <rbtcollins@hp.com>2013-09-14 16:23:42 +1200
commitae40df0c2aa33a6a6637ff20ef96d139def51806 (patch)
treecda1f1f8b3f5d8a28e27b446be52fea93bb186d4
parent680b67c4596ac870a9db75fb9c5832106eec00dd (diff)
Add Glance service password.
The in-instance scripts are about to require this. Change-Id: I0260da5502639acc60b2791e9f957952f7ab5956
-rw-r--r--overcloud-source.yaml6
-rw-r--r--undercloud-vm.yaml6
2 files changed, 12 insertions, 0 deletions
diff --git a/overcloud-source.yaml b/overcloud-source.yaml
index 845b0aea..8800aca8 100644
--- a/overcloud-source.yaml
+++ b/overcloud-source.yaml
@@ -18,6 +18,10 @@ Parameters:
Default: baremetal
Description: Flavor to request when deploying.
Type: String
+ GlancePassword:
+ Default: unset
+ Description: The password for the glance service account, used by the glance services.
+ Type: String
KeyName:
Default: default
Description: Name of an existing EC2 KeyPair to enable SSH access to the instances
@@ -132,6 +136,8 @@ Resources:
Fn::GetAtt:
- notcompute
- PrivateIp
+ service-password:
+ Ref: GlancePassword
os-collect-config:
cfn:
access_key_id:
diff --git a/undercloud-vm.yaml b/undercloud-vm.yaml
index cd24d966..efd3b02f 100644
--- a/undercloud-vm.yaml
+++ b/undercloud-vm.yaml
@@ -13,6 +13,10 @@ Parameters:
Default: baremetal
Description: Flavor to request when deploying.
Type: String
+ GlancePassword:
+ Default: unset
+ Description: The password for the glance service account, used by the glance services.
+ Type: String
KeyName:
Default: default
Description: Name of an existing EC2 KeyPair to enable SSH access to the instances
@@ -67,6 +71,8 @@ Resources:
glance:
db: mysql://glance:unset@localhost/glance
host: 127.0.0.1
+ service-password:
+ Ref: GlancePassword
heat:
admin_password: unset
admin_tenant_name: service