From 21980f5d6519ac799a882e82713270d85efbaa9e Mon Sep 17 00:00:00 2001 From: Robert Collins Date: Fri, 13 Sep 2013 08:23:17 +1200 Subject: Make admin-password configurable. We use the admin password in in-instance scripts that configure e.g. nagios from the cloud metadata, but production clouds will all have unique passwords - it has to be a parameter. Change-Id: I1f6c697ce27580fd669c7623e7fcea4c96ec62d0 --- overcloud-source.yaml | 7 ++++++- undercloud-vm.yaml | 7 ++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/overcloud-source.yaml b/overcloud-source.yaml index 552f1149..c20f81f9 100644 --- a/overcloud-source.yaml +++ b/overcloud-source.yaml @@ -2,6 +2,10 @@ Description: Nova API,Keystone,Heat Engine and API,Glance,Neutron,Dedicated MySQ server,Dedicated RabbitMQ Server,Group of Nova Computes HeatTemplateFormatVersion: '2012-12-12' Parameters: + AdminPassword: + Default: unset + Description: The password for the keystone admin account, used for monitoring, querying neutron etc. + Type: String AdminToken: Default: unset Description: The keystone auth secret. @@ -100,7 +104,8 @@ Resources: - heat-cfntools - heat-localip - neutron-network-node - admin-password: unset + admin-password: + Ref: AdminPassword admin-token: Ref: AdminToken cinder: diff --git a/undercloud-vm.yaml b/undercloud-vm.yaml index 45a5386b..d2b4a4e4 100644 --- a/undercloud-vm.yaml +++ b/undercloud-vm.yaml @@ -1,6 +1,10 @@ escription: All-in-one baremetal OpenStack and all dependencies. HeatTemplateFormatVersion: '2012-12-12' Parameters: + AdminPassword: + Default: unset + Description: The password for the keystone admin account, used for monitoring, querying neutron etc. + Type: String AdminToken: Default: unset Description: The keystone auth secret. @@ -44,7 +48,8 @@ Resources: Metadata: OpenStack::Heat::Stack: {} Openstack::ImageBuilder::Elements: [ boot-stack, heat-cfntools, neutron-network-node ] - admin-password: unset + admin-password: + Ref: AdminPassword admin-token: Ref: AdminToken controller-address: -- cgit 1.2.3-korg