Merge "Remove ImageBuilder::Elements from templates"

2014-08-01 11:13:34 +00:00 · 2014-08-01 11:13:34 +00:00 · 9413fb3098
commit 9413fb3098
parent fdd49d86b9 3355f5edef
2 changed files with 0 additions and 9 deletions
--- 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:
--- 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: