diff options
| author |   Robert Collins <rbtcollins@hp.com> | 2013-09-11 21:44:53 +1200 |
|---|---|---|
| committer |   Clint Byrum <clint@fewbar.com> | 2013-09-11 12:54:29 -0700 |
| commit | 8695e9aee7f5c5b0e5930295a3337d8173992758 (patch) | |
| tree | 81fe70f42a274c18bcf6de7d4f06657c05f9283a | |
| parent | c34e381a46ea6808256abb3300760cb422192869 (diff) | |
Make the keystone admin token configurable.
Because unique is good for auth secrets.
Change-Id: Iaadc102d11d68d7fc059e62bd992de7ee6f2c818
| -rw-r--r-- | overcloud-source.yaml | 7 | ||||
| -rw-r--r-- | undercloud-vm.yaml | 7 |
2 files changed, 12 insertions, 2 deletions
diff --git a/overcloud-source.yaml b/overcloud-source.yaml index d86d5839..552f1149 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: + AdminToken: + Default: unset + Description: The keystone auth secret. + Type: String InstanceType: Default: baremetal Description: Flavor to request when deploying. @@ -97,7 +101,8 @@ Resources: - heat-localip - neutron-network-node admin-password: unset - admin-token: unset + admin-token: + Ref: AdminToken cinder: db: mysql://cinder:unset@localhost/cinder volume_size_mb: '5000' diff --git a/undercloud-vm.yaml b/undercloud-vm.yaml index 5fbe51f8..45a5386b 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: + AdminToken: + Default: unset + Description: The keystone auth secret. + Type: String InstanceType: Default: baremetal Description: Flavor to request when deploying. @@ -41,7 +45,8 @@ Resources: OpenStack::Heat::Stack: {} Openstack::ImageBuilder::Elements: [ boot-stack, heat-cfntools, neutron-network-node ] admin-password: unset - admin-token: unset + admin-token: + Ref: AdminToken controller-address: Fn::GetAtt: - notcompute |