Remove unmaintained individual service templates

First rule in the zombie apocalypse: Burn the dead.

Change-Id: I952c630ca424d114feb643a6c34d182cad660f26

10 files changed, 0 insertions, 838 deletions

diff --git a/bootstack-vm.yaml b/bootstack-vm.yaml
deleted file mode 100644
index f55633b1..00000000
--- a/bootstack-vm.yaml
+++ /dev/null
@@ -1,107 +0,0 @@
-Description: Nova API,Keystone,Heat Engine and API,Glance,Neutron,Dedicated MySQL
-  server,Dedicated RabbitMQ Server
-HeatTemplateFormatVersion: '2012-12-12'
-Parameters:
-  InstanceType:
-    Default: baremetal
-    Description: Flavor to request when deploying.
-    Type: String
-  KeyName:
-    Default: default
-    Description: Name of an existing EC2 KeyPair to enable SSH access to the instances
-    Type: String
-  Image:
-    Default: overcloud-control
-    Type: String
-  PowerUserName:
-    Default: stack
-    Description: What username to ssh to the virtual power host with.
-    Type: String
-Resources:
-  AccessPolicy:
-    Properties:
-      AllowedResources:
-      - notcompute
-    Type: OS::Heat::AccessPolicy
-  Key:
-    Properties:
-      UserName:
-        Ref: User
-    Type: AWS::IAM::AccessKey
-  User:
-    Properties:
-      Policies:
-      - Ref: AccessPolicy
-    Type: AWS::IAM::User
-  notcompute:
-    Metadata:
-      OpenStack::Heat::Stack: {}
-      Openstack::ImageBuilder::Elements: [ boot-stack, heat-cfntools, heat-localip, neutron-network-node ]
-      admin-password: unset
-      admin-token: unset
-      controller-address: 0.0.0.0
-      cinder:
-        db: mysql://cinder:unset@localhost/cinder
-        volume_size_mb: '5000'
-      db-password: unset
-      glance:
-        db: mysql://glance:unset@localhost/glance
-        host: 0.0.0.0
-      heat:
-        admin_password: unset
-        admin_tenant_name: service
-        admin_user: heat
-        auth_encryption_key: unset___________
-        db: mysql://heat:unset@localhost/heat
-        heat_watch_server_url: http://0.0.0.0:8003
-        metadata_server_url: http://0.0.0.0:8000
-        waitcondition_server_url: http://0.0.0.0:8000/v1/waitcondition
-        access_key_id:
-          Ref: Key
-        refresh:
-        - resource: notcompute
-        secret_key:
-          Fn::GetAtt:
-          - Key
-          - SecretAccessKey
-        stack:
-          name:
-            Ref: AWS::StackName
-          region:
-            Ref: AWS::Region
-      interfaces:
-        control: eth2
-      keystone:
-        db: mysql://keystone:unset@localhost/keystone
-        host: 0.0.0.0
-      nova:
-        compute_driver: libvirt.LibvirtDriver
-        db: mysql://nova:unset@localhost/nova
-        host: 0.0.0.0
-      neutron:
-        floatingip_end: 192.0.2.64
-        floatingip_range: 192.0.2.0/24
-        floatingip_start: 192.0.2.45
-        host: 0.0.0.0
-        metadata_proxy_shared_secret: unset
-        ovs_db: mysql://neutron:unset@localhost/ovs_neutron?charset=utf8
-        ovs:
-          public_interface: eth0
-          fixed_range:
-            start: 10.0.0.2
-            end: 10.255.255.254
-          tenant_network_type: gre
-          enable_tunneling: 'True'
-          local_ip: 0.0.0.0
-      rabbit:
-        host: 0.0.0.0
-        password: guest
-      service-password: unset
-    Properties:
-      ImageId:
-        Ref: Image
-      InstanceType:
-        Ref: InstanceType
-      KeyName:
-        Ref: KeyName
-    Type: AWS::EC2::Instance
diff --git a/glance.yaml b/glance.yaml
deleted file mode 100644
index 2980e6a6..00000000
--- a/glance.yaml
+++ /dev/null
@@ -1,70 +0,0 @@
-HeatTemplateFormatVersion: '2012-12-12'
-Description: 'Glance'
-Parameters:
-  KeyName: 
-    Description: Name of an existing EC2 KeyPair to enable SSH access to the instances
-    Type: String
-    Default: default
-  InstanceType:
-    Description: Use this flavor
-    Type: String
-    Default: bm.small
-  GlanceDSN:
-    Description: DSN for connecting to glance database
-    Type: String
-  GlanceImage:
-    Type: String
-  KeystoneHost:
-    Type: String
-  ServicePassword:
-    Description: admin_password for setting up auth in keystone.
-    Type: String
-  RabbitHost:
-    Type: String
-  RabbitPassword:
-    Type: String
-Resources:
-  AccessPolicy:
-    Type: OS::Heat::AccessPolicy
-    Properties:
-      AllowedResources: [ Glance ]
-  User:
-    Type: AWS::IAM::User
-    Properties:
-      Policies: [ { Ref: AccessPolicy } ]
-  Key:
-    Type: AWS::IAM::AccessKey
-    Properties:
-      UserName:
-        Ref: User
-  Glance:
-    Type: AWS::EC2::Instance
-    Properties:
-      ImageId:
-        {Ref: GlanceImage}
-      InstanceType: {Ref: InstanceType}
-      KeyName: {Ref: KeyName}
-    Metadata:
-      OpenStack::Role: stateless
-      OpenStack::ImageBuilder::Elements: [ glance ]
-      heat: 
-        access_key_id:
-          Ref: Key
-        secret_key:
-          Fn::GetAtt: [ Key, SecretAccessKey ]
-        stack:
-          name: {Ref: 'AWS::StackName'}
-          region: {Ref: 'AWS::Region'}
-        refresh:
-          - resource: Glance
-      keystone:
-        host: {Ref: KeystoneHost}
-      glance:
-        db: {Ref: GlanceDSN}
-      service-password: {Ref: ServicePassword}
-      rabbit:
-        host: {Ref: RabbitHost}
-        password: {Ref: RabbitPassword}
-      swift:
-        store_user: ''
-        store_key: ''
diff --git a/heat-allinone.yaml b/heat-allinone.yaml
deleted file mode 100644
index 13fb1dbb..00000000
--- a/heat-allinone.yaml
+++ /dev/null
@@ -1,59 +0,0 @@
-HeatTemplateFormatVersion: '2012-12-12'
-Description: 'Heat Engine and API'
-Parameters:
-  KeyName: 
-    Description: Name of an existing EC2 KeyPair to enable SSH access to the instances
-    Type: String
-    Default: default
-  InstanceType:
-    Description: Use this flavor
-    Type: String
-    Default: bm.small
-  HeatUser:
-    Description: Heat database username.
-    Type: String
-    Default: heat
-  HeatImage:
-    Type: String
-  RabbitMQHost:
-    Description: Host for RabbitMQ
-    Type: String
-  RabbitMQPassword:
-    Description: Password for RabbitMQ
-    Type: String
-Resources:
-  HeatAccessPolicy:
-    Type: OS::Heat::AccessPolicy
-    Properties:
-      AllowedResources: [ Heat ]
-  HeatUser:
-    Type: AWS::IAM::User
-    Properties:
-      Policies: [ { Ref: HeatAccessPolicy } ]
-  HeatKey:
-    Type: AWS::IAM::AccessKey
-    Properties:
-      UserName:
-        Ref: HeatUser
-  Heat:
-    Type: AWS::EC2::Instance
-    Properties:
-      ImageId:
-        {Ref: HeatImage}
-    Metadata:
-      OpenStack::Role: stateful
-      OpenStack::ImageBuilder::Elements: [ heat-api, heat-engine ]
-      heat:
-        rpc_backend: heat.openstack.common.rpc.impl_kombu
-        rabbit:
-          host: {Ref: RabbitMQHost}
-          password: {Ref: RabbitMQPassword}
-        access_key_id:
-          Ref: HeatKey
-        secret_key:
-          Fn::GetAtt: [ HeatKey, SecretAccessKey ]
-        stack:
-          name: {Ref: 'AWS::StackName'}
-          region: {Ref: 'AWS::Region'}
-        refresh:
-          - resource: Heat
diff --git a/heat.yaml b/heat.yaml
deleted file mode 100644
index d4c3eefc..00000000
--- a/heat.yaml
+++ /dev/null
@@ -1,110 +0,0 @@
-HeatTemplateFormatVersion: '2012-12-12'
-Description: 'Heat Engine and API'
-Parameters:
-  KeyName: 
-    Description: Name of an existing EC2 KeyPair to enable SSH access to the instances
-    Type: String
-    Default: default
-  InstanceType:
-    Description: Use this flavor
-    Type: String
-    Default: bm.small
-  HeatUser:
-    Description: Heat database username.
-    Type: String
-    Default: heat
-  HeatEngineImage:
-    Type: String
-  HeatApiImage:
-    Type: String
-  RabbitMQHost:
-    Description: Host for RabbitMQ
-    Type: String
-  RabbitMQPassword:
-    Description: Password for RabbitMQ
-    Type: String
-  ApiGroupSize:
-    Description: How many API nodes to run
-    Type: Integer
-    Default: 1
-  AvailabilityZones:
-    Type: List
-    Default: [ 1 ]
-Resources:
-  EngineAccessPolicy:
-    Type: OS::Heat::AccessPolicy
-    Properties:
-      AllowedResources: [ HeatEngine ]
-  EngineUser:
-    Type: AWS::IAM::User
-    Properties:
-      Policies: [ { Ref: EngineAccessPolicy } ]
-  EngineKey:
-    Type: AWS::IAM::AccessKey
-    Properties:
-      UserName:
-        Ref: EngineUser
-  ApiAccessPolicy:
-    Type: OS::Heat::AccessPolicy
-    Properties:
-      AllowedResources: [ HeatAPI, HeatAPILaunch ]
-  ApiUser:
-    Type: AWS::IAM::User
-    Properties:
-      Policies: [ { Ref: ApiAccessPolicy } ]
-  ApiKey:
-    Type: AWS::IAM::AccessKey
-    Properties:
-      UserName:
-        Ref: ApiUser
-  HeatAPILaunch:
-    Type: AWS::AutoScaling::LaunchConfiguration
-    Metadata:
-      OpenStack::ImageBuilder::Elements: [ heat-api ]
-      heat:
-        rpc_backend: heat.openstack.common.rpc.impl_kombu
-        rabbit:
-          host: {Ref: RabbitMQHost}
-          password: {Ref: RabbitMQPassword}
-        access_key_id:
-          Ref: ApiKey
-        secret_key:
-          Fn::GetAtt: [ ApiKey, SecretAccessKey ]
-        stack:
-          name: {Ref: 'AWS::StackName'}
-          region: {Ref: 'AWS::Region'}
-        refresh:
-          - resource: HeatAPILaunch
-    Properties:
-      ImageId:
-        {Ref: HeatApiImage}
-      InstanceType: {Ref: InstanceType}
-      KeyName: {Ref: KeyName}
-  HeatAPI:
-    Type: OS::Heat::InstanceGroup
-    Properties:
-      LaunchConfiguration: {Ref: HeatApiLaunch}
-      Size: {Ref: ApiGroupSize}
-      AvailabilityZones: {Ref: AvailabilityZones}
-  HeatEngine:
-    Type: AWS::EC2::Instance
-    Properties:
-      ImageId:
-        {Ref: HeatEngineImage}
-    Metadata:
-      OpenStack::Role: stateful
-      OpenStack::ImageBuilder::Elements: [ heat-engine ]
-      heat:
-        rpc_backend: heat.openstack.common.rpc.impl_kombu
-        rabbit:
-          host: {Ref: RabbitMQHost}
-          password: {Ref: RabbitMQPassword}
-        access_key_id:
-          Ref: EngineKey
-        secret_key:
-          Fn::GetAtt: [ EngineKey, SecretAccessKey ]
-        stack:
-          name: {Ref: 'AWS::StackName'}
-          region: {Ref: 'AWS::Region'}
-        refresh:
-          - resource: HeatEngine
diff --git a/keystone.yaml b/keystone.yaml
deleted file mode 100644
index ef6d1146..00000000
--- a/keystone.yaml
+++ /dev/null
@@ -1,55 +0,0 @@
-HeatTemplateFormatVersion: '2012-12-12'
-Description: 'Keystone'
-Parameters:
-  KeyName: 
-    Description: Name of an existing EC2 KeyPair to enable SSH access to the instances
-    Type: String
-    Default: default
-  InstanceType:
-    Description: Use this flavor
-    Type: String
-    Default: bm.small
-  KeystoneDSN:
-    Description: DSN for connecting to keystone
-    Type: String
-  KeystoneImage:
-    Type: String
-  AdminToken:
-    Type: String
-Resources:
-  ApiAccessPolicy:
-    Type: OS::Heat::AccessPolicy
-    Properties:
-      AllowedResources: [ Keystone ]
-  ApiUser:
-    Type: AWS::IAM::User
-    Properties:
-      Policies: [ { Ref: ApiAccessPolicy } ]
-  ApiKey:
-    Type: AWS::IAM::AccessKey
-    Properties:
-      UserName:
-        Ref: ApiUser
-  Keystone:
-    Type: AWS::EC2::Instance
-    Properties:
-      ImageId:
-        {Ref: KeystoneImage}
-      InstanceType: {Ref: InstanceType}
-      KeyName: {Ref: KeyName}
-    Metadata:
-      OpenStack::Role: stateless
-      OpenStack::ImageBuilder::Elements: [ keystone ]
-      heat: 
-        access_key_id:
-          Ref: ApiKey
-        secret_key:
-          Fn::GetAtt: [ ApiKey, SecretAccessKey ]
-        stack:
-          name: {Ref: 'AWS::StackName'}
-          region: {Ref: 'AWS::Region'}
-        refresh:
-          - resource: Keystone
-      admin-token: {Ref: AdminToken}
-      keystone:
-        db: {Ref: KeystoneDSN}
diff --git a/mysql.yaml b/mysql.yaml
deleted file mode 100644
index f93ae283..00000000
--- a/mysql.yaml
+++ /dev/null
@@ -1,155 +0,0 @@
-HeatTemplateFormatVersion: '2012-12-12'
-Description: 'Dedicated MySQL server'
-Parameters:
-  KeyName: 
-    Description: Name of an existing EC2 KeyPair to enable SSH access to the instances
-    Type: String
-    Default: default
-  InstanceType:
-    Description: Use this flavor
-    Type: String
-    Default: bm.small
-  KeystoneUser:
-    Description: Keystone database username.
-    Type: String
-    Default: keystone
-  HeatUser:
-    Description: Heat database username.
-    Type: String
-    Default: heat
-  GlanceUser:
-    Description: Glance database username.
-    Type: String
-    Default: glance
-  NovaUser:
-    Description: Nova database username.
-    Type: String
-    Default: nova
-  MySQLImage:
-    Type: String
-  BootstrapHost:
-    Description: Load mysqldump from this Host
-    Type: String
-    Default: ''
-  BootstrapRootPassword:
-    Description: Root password for localhost access after bootstrap
-    Type: String
-    Default: ''
-  BootstrapDumpPassword:
-    Description: Password to use for mysqldump from Bootstrap Host
-    Type: String
-    Default: ''
-  BootstrapSlaveUser:
-    Description: User to use for replication from bootstrap host
-    Type: String
-    Default: ''
-  BootstrapSlavePassword:
-    Description: Password to use with BootstrapSlaveUser
-    Type: String
-    Default: ''
-Resources:
-  ApiAccessPolicy:
-    Type: OS::Heat::AccessPolicy
-    Properties:
-      AllowedResources: [ MySQL ]
-  ApiUser:
-    Type: AWS::IAM::User
-    Properties:
-      Policies: [ { Ref: ApiAccessPolicy } ]
-  ApiKey:
-    Type: AWS::IAM::AccessKey
-    Properties:
-      UserName:
-        Ref: ApiUser
-  MySQL:
-    Type: AWS::EC2::Instance
-    Metadata:
-      OpenStack::Role: stateful
-      OpenStack::ImageBuilder::Elements: [ mysql-migration ]
-      mysql:
-        create-users:
-          - database: keystone
-            username: {Ref: KeystoneUser}
-            userhandle: {Ref: KeystonePasswordHandle}
-          - database: heat
-            username: {Ref: HeatUser}
-            userhandle: {Ref: HeatPasswordHandle}
-          - database: glance
-            username: {Ref: GlanceUser}
-            userhandle: {Ref: GlancePasswordHandle}
-          - database: nova
-            username: {Ref: NovaUser}
-            userhandle: {Ref: NovaPasswordHandle}
-      mysql-migration:
-        users:
-          root:
-            username: root
-            password: {Ref: BootstrapRootPassword}
-          dump:
-            username: dump
-            password: {Ref: BootstrapDumpPassword}
-        bootstrap_host: {Ref: BootstrapHost}
-        slave_user: {Ref: BootstrapSlaveUser}
-        slave_password: {Ref: BootstrapSlavePassword}
-      heat:
-        access_key_id:
-          Ref: ApiKey
-        secret_key:
-          Fn::GetAtt: [ ApiKey, SecretAccessKey ]
-        stack:
-          name: {Ref: 'AWS::StackName'}
-          region: {Ref: 'AWS::Region'}
-        refresh:
-          - resource: MySQL
-    Properties:
-      ImageId:
-        {Ref: MySQLImage}
-      InstanceType: {Ref: InstanceType}
-      KeyName: {Ref: KeyName}
-  NovaPasswordHandle:
-    Type: AWS::CloudFormation::WaitConditionHandle
-  NovaPassword:
-    DependsOn: MySQL
-    Type: AWS::CloudFormation::WaitCondition
-    Properties:
-      Handle: {Ref: NovaPasswordHandle}
-      Timeout: 90
-  GlancePasswordHandle:
-    Type: AWS::CloudFormation::WaitConditionHandle
-  GlancePassword:
-    DependsOn: MySQL
-    Type: AWS::CloudFormation::WaitCondition
-    Properties:
-      Handle: {Ref: GlancePasswordHandle}
-      Timeout: 90
-  HeatPasswordHandle:
-    Type: AWS::CloudFormation::WaitConditionHandle
-  HeatPassword:
-    DependsOn: MySQL
-    Type: AWS::CloudFormation::WaitCondition
-    Properties:
-      Handle: {Ref: HeatPasswordHandle}
-      Timeout: 90
-  KeystonePasswordHandle:
-    Type: AWS::CloudFormation::WaitConditionHandle
-  KeystonePassword:
-    DependsOn: MySQL
-    Type: AWS::CloudFormation::WaitCondition
-    Properties:
-      Handle: {Ref: KeystonePasswordHandle}
-      Timeout: 90
-Outputs:
-    MySQLHost: 
-        Fn::GetAtt: [ MySQL , PrivateIp ]
-    KeystonePassword:
-        Fn::GetAtt: [ KeystonePassword, Data ]
-    KeystoneUser: {Ref: KeystoneUser}
-    HeatPassword:
-        Fn::GetAtt: [ HeatPassword, Data ]
-    HeatUser: {Ref: HeatUser}
-    GlancePassword:
-        Fn::GetAtt: [ GlancePassword, Data ]
-    GlanceUser: {Ref: GlanceUser}
-    NovaPassword:
-        Fn::GetAtt: [ NovaPassword, Data ]
-    NovaUser: {Ref: NovaUser}
diff --git a/nova-api.yaml b/nova-api.yaml
deleted file mode 100644
index 3f4fc877..00000000
--- a/nova-api.yaml
+++ /dev/null
@@ -1,78 +0,0 @@
-HeatTemplateFormatVersion: '2012-12-12'
-Description: 'Nova API'
-Parameters:
-  KeyName: 
-    Description: Name of an existing EC2 KeyPair to enable SSH access to the instances
-    Type: String
-    Default: default
-  InstanceType:
-    Description: Use this flavor
-    Type: String
-    Default: bm.small
-  NovaDSN:
-    Description: DSN for connecting to nova database
-    Type: String
-  NovaImage:
-    Type: String
-  KeystoneHost:
-    Type: String
-  ServicePassword:
-    Description: admin_password for setting up auth in nova.
-    Type: String
-  RabbitHost:
-    Type: String
-  RabbitPassword:
-    Type: String
-  NovaInterfaces:
-    Type: String
-    Default: eth0
-Resources:
-  AccessPolicy:
-    Type: OS::Heat::AccessPolicy
-    Properties:
-      AllowedResources: [ NovaApi ]
-  User:
-    Type: AWS::IAM::User
-    Properties:
-      Policies: [ { Ref: AccessPolicy } ]
-  Key:
-    Type: AWS::IAM::AccessKey
-    Properties:
-      UserName:
-        Ref: User
-  NovaApi:
-    Type: AWS::EC2::Instance
-    Properties:
-      ImageId:
-        {Ref: NovaImage}
-      InstanceType: {Ref: InstanceType}
-      KeyName: {Ref: KeyName}
-    Metadata:
-      OpenStack::Role: stateless
-      OpenStack::ImageBuilder::Elements: [ nova-api ]
-      heat: 
-        access_key_id:
-          Ref: Key
-        secret_key:
-          Fn::GetAtt: [ Key, SecretAccessKey ]
-        stack:
-          name: {Ref: 'AWS::StackName'}
-          region: {Ref: 'AWS::Region'}
-        refresh:
-          - resource: NovaApi
-      keystone:
-        host: {Ref: KeystoneHost}
-      nova:
-        db: {Ref: NovaDSN}
-      neutron:
-        host: {Ref: NeutronHost}
-      service-password: {Ref: ServicePassword}
-      admin-password: {Ref: ServicePassword}
-      rabbit:
-        host: {Ref: RabbitHost}
-        password: {Ref: RabbitPassword}
-      swift:
-        store_user: ''
-        store_key: ''
-      interfaces:
-        control: {Ref: NovaInterfaces}
diff --git a/nova-compute.yaml b/nova-compute.yaml
deleted file mode 100644
index dd7db49a..00000000
--- a/nova-compute.yaml
+++ /dev/null
@@ -1,89 +0,0 @@
-HeatTemplateFormatVersion: '2012-12-12'
-Description: 'Nova Compute'
-Parameters:
-  KeyName: 
-    Description: Name of an existing EC2 KeyPair to enable SSH access to the instances
-    Type: String
-    Default: default
-  InstanceType:
-    Description: Use this flavor
-    Type: String
-    Default: baremetal
-  NovaImage:
-    Type: String
-  KeystoneHost:
-    Type: String
-  ServicePassword:
-    Description: admin_password for setting up auth in nova.
-    Type: String
-  NeutronHost:
-    Type: String
-  RabbitHost:
-    Type: String
-  RabbitPassword:
-    Type: String
-  NovaInterfaces:
-    Type: String
-    Default: eth0
-  NovaComputeSize:
-    Type: Number
-    Default: 1
-  NovaComputeDriver:
-    Type: String
-    Default: libvirt.LibvirtDriver
-Resources:
-  AccessPolicy:
-    Type: OS::Heat::AccessPolicy
-    Properties:
-      AllowedResources: [ NovaCompute ]
-  User:
-    Type: AWS::IAM::User
-    Properties:
-      Policies: [ { Ref: AccessPolicy } ]
-  Key:
-    Type: AWS::IAM::AccessKey
-    Properties:
-      UserName:
-        Ref: User
-  NovaLaunch:
-    Type: AWS::AutoScaling::LaunchConfiguration
-    Properties:
-      ImageId:
-        {Ref: NovaImage}
-      InstanceType: {Ref: InstanceType}
-      KeyName: {Ref: KeyName}
-    Metadata:
-      OpenStack::ImageBuilder::Elements: [ nova-compute ]
-      heat: 
-        access_key_id:
-          Ref: Key
-        secret_key:
-          Fn::GetAtt: [ Key, SecretAccessKey ]
-        stack:
-          name: {Ref: 'AWS::StackName'}
-          region: {Ref: 'AWS::Region'}
-        refresh:
-          - resource: NovaCompute
-      nova:
-        compute_driver: {Ref: NovaComputeDriver}
-      keystone:
-        host: {Ref: KeystoneHost}
-      neutron:
-        host: {Ref: NeutronHost}
-      service-password: {Ref: ServicePassword}
-      admin-password: {Ref: ServicePassword}
-      rabbit:
-        host: {Ref: RabbitHost}
-        password: {Ref: RabbitPassword}
-      swift:
-        store_user: ''
-        store_key: ''
-      interfaces:
-        control: {Ref: NovaInterfaces}
-  NovaCompute:
-      Type: OS::Heat::InstanceGroup
-      Properties:
-        LaunchConfigurationName: {Ref: NovaLaunch}
-        Size: {Ref: NovaComputeSize}
-        AvailabilityZones:
-          Fn::GetAZs: ''
diff --git a/quantum.yaml b/quantum.yaml
deleted file mode 100644
index 57debec0..00000000
--- a/quantum.yaml
+++ /dev/null
@@ -1,76 +0,0 @@
-HeatTemplateFormatVersion: '2012-12-12'
-Description: 'Neutron'
-Parameters:
-  KeyName: 
-    Description: Name of an existing EC2 KeyPair to enable SSH access to the instances
-    Type: String
-    Default: default
-  InstanceType:
-    Description: Use this flavor
-    Type: String
-    Default: bm.small
-  NeutronDSN:
-    Description: DSN for connecting to neutron database
-    Type: String
-  NeutronImage:
-    Type: String
-  KeystoneHost:
-    Type: String
-  ServicePassword:
-    Description: admin_password for setting up auth in neutron.
-    Type: String
-  RabbitHost:
-    Type: String
-  RabbitPassword:
-    Type: String
-  NeutronInterfaces:
-    Type: String
-    Default: eth0
-Resources:
-  AccessPolicy:
-    Type: OS::Heat::AccessPolicy
-    Properties:
-      AllowedResources: [ Neutron ]
-  User:
-    Type: AWS::IAM::User
-    Properties:
-      Policies: [ { Ref: AccessPolicy } ]
-  Key:
-    Type: AWS::IAM::AccessKey
-    Properties:
-      UserName:
-        Ref: User
-  Neutron:
-    Type: AWS::EC2::Instance
-    Properties:
-      ImageId:
-        {Ref: NeutronImage}
-      InstanceType: {Ref: InstanceType}
-      KeyName: {Ref: KeyName}
-    Metadata:
-      OpenStack::Role: networking
-      OpenStack::ImageBuilder::Elements: [ neutron ]
-      heat: 
-        access_key_id:
-          Ref: Key
-        secret_key:
-          Fn::GetAtt: [ Key, SecretAccessKey ]
-        stack:
-          name: {Ref: 'AWS::StackName'}
-          region: {Ref: 'AWS::Region'}
-        refresh:
-          - resource: Neutron
-      keystone:
-        host: {Ref: KeystoneHost}
-      neutron:
-        ovs_db: {Ref: NeutronDSN}
-      service-password: {Ref: ServicePassword}
-      admin-password: {Ref: ServicePassword}
-      rabbit:
-        host: {Ref: RabbitHost}
-        password: {Ref: RabbitPassword}
-      swift:
-        store_user: ''
-        store_key: ''
-      interfaces:
-        control: {Ref: NeutronInterfaces}
diff --git a/rabbitmq.yaml b/rabbitmq.yaml
deleted file mode 100644
index 80e28eb6..00000000
--- a/rabbitmq.yaml
+++ /dev/null
@@ -1,39 +0,0 @@
-HeatTemplateFormatVersion: '2012-12-12'
-Description: 'Dedicated RabbitMQ Server'
-Parameters:
-  KeyName: 
-    Description: Name of an existing EC2 KeyPair to enable SSH access to the instances
-    Type: String
-    Default: default
-  InstanceType:
-    Description: Use this flavor
-    Type: String
-    Default: bm.small
-  RabbitMQImage:
-    Type: String
-Resources:
-  RabbitMQ:
-    Type: AWS::EC2::Instance
-    Metadata:
-      OpenStack::Role: stateful
-      OpenStack::ImageBuilder::Elements: [ rabbitmq-server ]
-      rabbitmq:
-        password_handle: {Ref: RabbitMQPasswordHandle}
-    Properties:
-      ImageId:
-        {Ref: RabbitMQImage}
-      InstanceType: {Ref: InstanceType}
-      KeyName: {Ref: KeyName}
-  RabbitMQPasswordHandle:
-    Type: AWS::CloudFormation::WaitConditionHandle
-  RabbitMQPassword:
-    DependsOn: RabbitMQ
-    Type: AWS::CloudFormation::WaitCondition
-    Properties:
-      Handle: {Ref: RabbitMQPasswordHandle}
-      Timeout: 60
-Outputs:
-    RabbitMQHost: 
-        Fn::GetAtt: [ RabbitMQ , PrivateIp ]
-    RabbitMQPassword:
-        Fn::GetAtt: [ RabbitMQPassword, Data ]