Hand modifying notcompute to work with elements.

diff --git a/notcompute.yaml b/notcompute.yaml
index a5c0cb4..f63307d 100644 (file)
--- a/notcompute.yaml
+++ b/notcompute.yaml
@@ -1,43 +1,6 @@
 Description: Nova API,Keystone,Heat Engine and API,Glance,Quantum,Dedicated MySQL
   server,Dedicated RabbitMQ Server
 HeatTemplateFormatVersion: '2012-12-12'
-Outputs:
-  GlancePassword:
-    Fn::GetAtt:
-    - GlancePassword
-    - Data
-  GlanceUser:
-    Ref: GlanceUser
-  HeatPassword:
-    Fn::GetAtt:
-    - HeatPassword
-    - Data
-  HeatUser:
-    Ref: HeatUser
-  KeystonePassword:
-    Fn::GetAtt:
-    - KeystonePassword
-    - Data
-  KeystoneUser:
-    Ref: KeystoneUser
-  MySQLHost:
-    Fn::GetAtt:
-    - notcompute
-    - PrivateIp
-  NovaPassword:
-    Fn::GetAtt:
-    - NovaPassword
-    - Data
-  NovaUser:
-    Ref: NovaUser
-  RabbitMQHost:
-    Fn::GetAtt:
-    - notcompute
-    - PrivateIp
-  RabbitMQPassword:
-    Fn::GetAtt:
-    - RabbitMQPassword
-    - Data
 Parameters:
   AdminToken:
     Type: String
@@ -61,55 +24,35 @@ Parameters:
     Default: ''
     Description: User to use for replication from bootstrap host
     Type: String
-  GlanceDSN:
-    Description: DSN for connecting to glance database
-    Type: String
-  GlanceUser:
-    Default: heat
-    Description: Glance database username.
+  GlanceDBPassword:
+    Description: Password for connecting to glance database
     Type: String
-  HeatUser:
-    Default: heat
-    Description: Heat database username.
+  HeatDBPassword:
+    Description: Password for accessing Heat database.
     Type: String
   InstanceType:
-    Default: bm.small
+    Default: baremetal
     Description: Use this flavor
     Type: String
   KeyName:
     Default: default
     Description: Name of an existing EC2 KeyPair to enable SSH access to the instances
     Type: String
-  KeystoneDSN:
-    Description: DSN for connecting to keystone
-    Type: String
-  KeystoneHost:
+  KeystoneDBPassword:
+    Description: Password for connecting to keystone
     Type: String
-  KeystoneUser:
-    Default: keystone
-    Description: Keystone database username.
-    Type: String
-  NovaDSN:
-    Description: DSN for connecting to nova database
+  NovaDBPassword:
+    Description: Password for connecting to nova database
     Type: String
   NovaInterfaces:
     Default: eth0
     Type: String
-  NovaUser:
-    Default: heat
-    Description: Glance database username.
-    Type: String
-  QuantumDSN:
-    Description: DSN for connecting to quantum database
+  QuantumDBPassword:
+    Description: Password for connecting to quantum database
     Type: String
   QuantumInterfaces:
     Default: eth0
     Type: String
-  RabbitHost:
-    Type: String
-  RabbitMQHost:
-    Description: Host for RabbitMQ
-    Type: String
   RabbitMQPassword:
     Description: Password for RabbitMQ
     Type: String
@@ -118,8 +61,6 @@ Parameters:
   ServicePassword:
     Description: admin_password for setting up auth in nova.
     Type: String
-  networkingImage:
-    Type: String
   notcomputeImage:
     Type: String
 Resources:
@@ -128,140 +69,16 @@ Resources:
       AllowedResources:
       - notcompute
     Type: OS::Heat::AccessPolicy
-  ApiAccessPolicy:
-    Properties:
-      AllowedResources:
-      - KeystoneLaunch
-      - notcompute
-    Type: OS::Heat::AccessPolicy
-  ApiKey:
-    Properties:
-      UserName:
-        Ref: ApiUser
-    Type: AWS::IAM::AccessKey
-  ApiUser:
-    Properties:
-      Policies:
-      - Ref: ApiAccessPolicy
-    Type: AWS::IAM::User
-  GlancePassword:
-    DependsOn: notcompute
-    Properties:
-      Handle:
-        Ref: GlancePasswordHandle
-      Timeout: 90
-    Type: AWS::CloudFormation::WaitCondition
-  GlancePasswordHandle:
-    Type: AWS::CloudFormation::WaitConditionHandle
-  HeatAccessPolicy:
-    Properties:
-      AllowedResources:
-      - notcompute
-    Type: OS::Heat::AccessPolicy
-  HeatKey:
-    Properties:
-      UserName:
-        Ref: HeatUser
-    Type: AWS::IAM::AccessKey
-  HeatPassword:
-    DependsOn: notcompute
-    Properties:
-      Handle:
-        Ref: HeatPasswordHandle
-      Timeout: 90
-    Type: AWS::CloudFormation::WaitCondition
-  HeatPasswordHandle:
-    Type: AWS::CloudFormation::WaitConditionHandle
-  HeatUser:
-    Properties:
-      Policies:
-      - Ref: HeatAccessPolicy
-    Type: AWS::IAM::User
   Key:
     Properties:
       UserName:
         Ref: User
     Type: AWS::IAM::AccessKey
-  KeystonePassword:
-    DependsOn: notcompute
-    Properties:
-      Handle:
-        Ref: KeystonePasswordHandle
-      Timeout: 90
-    Type: AWS::CloudFormation::WaitCondition
-  KeystonePasswordHandle:
-    Type: AWS::CloudFormation::WaitConditionHandle
-  NovaPassword:
-    DependsOn: notcompute
-    Properties:
-      Handle:
-        Ref: NovaPasswordHandle
-      Timeout: 90
-    Type: AWS::CloudFormation::WaitCondition
-  NovaPasswordHandle:
-    Type: AWS::CloudFormation::WaitConditionHandle
-  RabbitMQPassword:
-    DependsOn: notcompute
-    Properties:
-      Handle:
-        Ref: RabbitMQPasswordHandle
-      Timeout: 60
-    Type: AWS::CloudFormation::WaitCondition
-  RabbitMQPasswordHandle:
-    Type: AWS::CloudFormation::WaitConditionHandle
   User:
     Properties:
       Policies:
       - Ref: AccessPolicy
     Type: AWS::IAM::User
-  networking:
-    Metadata:
-      OpenStack::ImageBuilder::Elements:
-      - quantum
-      OpenStack::Role: networking
-      admin-password:
-        Ref: ServicePassword
-      heat:
-        access_key_id:
-          Ref: Key
-        refresh:
-        - resource: Quantum
-        secret_key:
-          Fn::GetAtt:
-          - Key
-          - SecretAccessKey
-        stack:
-          name:
-            Ref: AWS::StackName
-          region:
-            Ref: AWS::Region
-      interfaces:
-        control:
-          Ref: QuantumInterfaces
-      keystone:
-        host:
-          Ref: KeystoneHost
-      quantum:
-        ovs_db:
-          Ref: QuantumDSN
-      rabbit:
-        host:
-          Ref: RabbitHost
-        password:
-          Ref: RabbitPassword
-      service-password:
-        Ref: ServicePassword
-      swift:
-        store_key: ''
-        store_user: ''
-    Properties:
-      ImageId:
-        Ref: networkingImage
-      InstanceType:
-        Ref: InstanceType
-      KeyName:
-        Ref: KeyName
-    Type: AWS::EC2::Instance
   notcompute:
     Metadata:
       OpenStack::ImageBuilder::Elements:
@@ -272,19 +89,28 @@ Resources:
       - glance
       - mysql-migration
       - rabbitmq-server
-      OpenStack::Role: stateless
       admin-password:
         Ref: ServicePassword
       admin-token:
         Ref: AdminToken
       glance:
         db:
-          Ref: GlanceDSN
+          Fn::Join:
+            - ''
+            - - 'mysql://glance:'
+              - {Ref: GlanceDBPassword}
+              - '@127.0.0.1/glance'
       heat:
+        db:
+          Fn::Join:
+            - ''
+            - - 'mysql://heat:'
+              - {Ref: HeatDBPassword}
+              - '@127.0.0.1/heat'
         access_key_id:
           Ref: Key
         refresh:
-        - resource: NovaApi
+        - resource: notcompute
         secret_key:
           Fn::GetAtt:
           - Key
@@ -299,64 +125,36 @@ Resources:
           Ref: NovaInterfaces
       keystone:
         host:
-          Ref: KeystoneHost
-      mysql:
-        create-users:
-        - database: keystone
-          userhandle:
-            Ref: KeystonePasswordHandle
-          username:
-            Ref: KeystoneUser
-        - database: heat
-          userhandle:
-            Ref: HeatPasswordHandle
-          username:
-            Ref: HeatUser
-        - database: glance
-          userhandle:
-            Ref: GlancePasswordHandle
-          username:
-            Ref: GlanceUser
-        - database: nova
-          userhandle:
-            Ref: NovaPasswordHandle
-          username:
-            Ref: NovaUser
-      mysql-migration:
-        bootstrap_host:
-          Ref: BootstrapHost
-        slave_password:
-          Ref: BootstrapSlavePassword
-        slave_user:
-          Ref: BootstrapSlaveUser
-        users:
-          dump:
-            password:
-              Ref: BootstrapDumpPassword
-            username: dump
-          root:
-            password:
-              Ref: BootstrapRootPassword
-            username: root
+          Fn::GetAtt: [ notocmpute, PrivateIp ]
+        db:
+          Fn::Join:
+            - ''
+            - - 'mysql://keystone:'
+              - {Ref: KeystoneDBPassword}
+              - '@127.0.0.1/keystone'
       nova:
         db:
-          Ref: NovaDSN
+          Fn::Join:
+            - ''
+            - - 'mysql://nova:'
+              - {Ref: NovaDBPassword}
+              - '@127.0.0.1/nova'
       quantum:
         host:
-          Ref: QuantumHost
+          Fn::GetAtt: [ notcompute , PrivateIp ]
+        ovs_db:
+          Fn::Join:
+            - ''
+            - - 'mysql://quantum:'
+              - {Ref: QuantumDBPassword}
+              - '@127.0.0.1/ovs_quantum'
       rabbit:
         host:
-          Ref: RabbitHost
+          Fn::GetAtt: [ notcompute , PrivateIp ]
         password:
           Ref: RabbitPassword
-      rabbitmq:
-        password_handle:
-          Ref: RabbitMQPasswordHandle
       service-password:
         Ref: ServicePassword
-      swift:
-        store_key: ''
-        store_user: ''
     Properties:
       ImageId:
         Ref: notcomputeImage