diff options
| author |   Clint Byrum <clint@fewbar.com> | 2013-04-18 14:04:06 -0700 |
|---|---|---|
| committer | Clint Byrum <clint@fewbar.com> | 2013-04-18 14:04:06 -0700 |
| commit | 41fb3c49045fd5dc6ae3ec013c51e8b8428d1fff (patch) | |
| tree | fc4970ad2a2f1abdb86f81c4cb6aeba40f1c748e /keystone.yaml | |
| parent | 9954c0f5b2fda18757c2bcb5240c4b19da7dc69e (diff) | |
Match Metadata with tripleo-image-elements.
Diffstat (limited to 'keystone.yaml')
| -rw-r--r-- | keystone.yaml | 21 |
1 files changed, 14 insertions, 7 deletions
diff --git a/keystone.yaml b/keystone.yaml index b17397a1..5c55c115 100644 --- a/keystone.yaml +++ b/keystone.yaml @@ -14,6 +14,8 @@ Parameters: Type: String KeystoneImage: Type: String + AdminToken: + Type: String Resources: ApiAccessPolicy: Type: OS::Heat::AccessPolicy @@ -36,15 +38,20 @@ Resources: InstanceType: {Ref: InstanceType} KeyName: {Ref: KeyName} Metadata: - OpenStack::Heat::CFNTools: - AWSAccessKeyId: + OpenStack::ImageBuilder::Elements: [ keystone ] + heat: + access_key_id: Ref: ApiKey - AWSSecretAccessKey: + secret_key: Fn::GetAtt: [ ApiKey, SecretAccessKey ] - OpenStack::ImageBuilder::Elements: [ keystone ] - OpenStack: - keystone: - db: {Ref: KeystoneDSN} + stack: + name: {Ref: 'AWS::StackName'} + region: {Ref: 'AWS::Region'} + refresh: + - resource: Keystone + admin-token: {Ref: AdminToken} + keystone: + db: {Ref: KeystoneDSN} Keystone: Type: OS::Heat::InstanceGroup Properties: |