Remove ImageBuilder::Elements from templates

We're not using this metadata for anything.

Change-Id: I9d27c76dfa7223cbd16b9afe967696644137b8d6

diff --git a/block-storage-nfs.yaml b/block-storage-nfs.yaml
index c165383..93ac4f6 100644 (file)
--- 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 758778d..f7a8633 100644 (file)
--- 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: