diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2014-08-01 11:13:34 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2014-08-01 11:13:34 +0000 |
| commit | 9413fb3098254fb8cbeb5d4951aba474b8755afb (patch) | |
| tree | 23ed0fb76df52530f7873b513b911574ca2ca6cb | |
| parent | fdd49d86b904141e9e1cbb2c855c0acd7c7759fb (diff) | |
| parent | 3355f5edefdebb245eda42708d2ad9a761d77025 (diff) | |
Merge "Remove ImageBuilder::Elements from templates"
| -rw-r--r-- | block-storage-nfs.yaml | 1 | ||||
| -rw-r--r-- | controller.yaml | 8 |
2 files changed, 0 insertions, 9 deletions
diff --git a/block-storage-nfs.yaml b/block-storage-nfs.yaml index c1653837..93ac4f65 100644 --- a/block-storage-nfs.yaml +++ b/block-storage-nfs.yaml @@ -49,7 +49,6 @@ Resources: secret_access_key: Fn::GetAtt: [ BlockStorageKey, SecretAccessKey ] stack_name: {Ref: 'AWS::StackName'} - OpenStack::ImageBuilder::Elements: [ cinder ] keystone: host: {"Fn::Select": [ 0, {"Fn::Select": [ "ctlplane", {"Fn::GetAtt": [controller0, networks]} ]} ] } cinder: diff --git a/controller.yaml b/controller.yaml index 758778d8..f7a8633e 100644 --- a/controller.yaml +++ b/controller.yaml @@ -107,14 +107,6 @@ Resources: Type: AWS::IAM::User controller0: Metadata: - OpenStack::ImageBuilder::Elements: - - nova-api - - keystone - - heat-api - - heat-engine - - glance - - mysql-migration - - rabbitmq-server admin-password: Ref: ServicePassword admin-token: |