X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=notcompute.yaml;h=5a4d9d21d01a4b5d3da10960fd74d773d9ccd52a;hb=65351560a421f40c0d66d6dcb00ee5515d5feb0f;hp=3579760b2c16b1473b44416d97f2e4b7c7503433;hpb=1536112575cb05d38ed17d5fd5a556f10fb7d371;p=apex-tripleo-heat-templates.git

diff --git a/notcompute.yaml b/notcompute.yaml
index 3579760b..5a4d9d21 100644
--- a/notcompute.yaml
+++ b/notcompute.yaml
@@ -1,4 +1,4 @@
-Description: Nova API,Keystone,Heat Engine and API,Glance,Quantum,Dedicated MySQL
+Description: Nova API,Keystone,Heat Engine and API,Glance,Neutron,Dedicated MySQL
   server,Dedicated RabbitMQ Server
 HeatTemplateFormatVersion: '2012-12-12'
 Parameters:
@@ -8,6 +8,7 @@ Parameters:
     Default: ''
     Description: Password to use for mysqldump from Bootstrap Host
     Type: String
+    NoEcho: true
   BootstrapHost:
     Default: ''
     Description: Load mysqldump from this Host
@@ -16,10 +17,12 @@ Parameters:
     Default: ''
     Description: Root password for localhost access after bootstrap
     Type: String
+    NoEcho: true
   BootstrapSlavePassword:
     Default: ''
     Description: Password to use with BootstrapSlaveUser
     Type: String
+    NoEcho: true
   BootstrapSlaveUser:
     Default: ''
     Description: User to use for replication from bootstrap host
@@ -27,9 +30,19 @@ Parameters:
   GlanceDBPassword:
     Description: Password for connecting to glance database
     Type: String
+    NoEcho: true
+  GlanceNotifierStrategy:
+    Description: Strategy to use for Glance notification queue
+    Type: String
+    Default: noop
+  GlanceLogFile:
+    Description: The filepath of the file to use for logging messages from Glance.
+    Type: String
+    Default: ''
   HeatDBPassword:
     Description: Password for accessing Heat database.
     Type: String
+    NoEcho: true
   InstanceType:
     Default: baremetal
     Description: Use this flavor
@@ -41,35 +54,48 @@ Parameters:
   KeystoneDBPassword:
     Description: Password for connecting to keystone
     Type: String
+    NoEcho: true
   NovaDBPassword:
     Description: Password for connecting to nova database
     Type: String
+    NoEcho: true
   NovaInterfaces:
     Default: eth0
     Type: String
-  QuantumDBPassword:
-    Description: Password for connecting to quantum database
+  NeutronDBPassword:
+    Description: Password for connecting to neutron database
     Type: String
-  QuantumInterfaces:
+    NoEcho: true
+  NeutronInterfaces:
     Default: eth0
     Type: String
   RabbitMQPassword:
     Description: Password for RabbitMQ
     Type: String
+    NoEcho: true
+  RabbitUserName:
+    Type: String
   RabbitPassword:
     Type: String
+    NoEcho: true
   ServicePassword:
     Description: admin_password for setting up auth in nova.
     Type: String
+    NoEcho: true
   notcomputeImage:
     Type: String
+  HeatStackDomainAdminPassword:
+    Description: Password for heat_domain_admin user.
+    Type: String
+    Default: ''
+    NoEcho: true
 Resources:
   AccessPolicy:
     Properties:
       AllowedResources:
-      - notcompute
+      - notCompute0
     Type: OS::Heat::AccessPolicy
-  Key:
+  notCompute0Key:
     Properties:
       UserName:
         Ref: User
@@ -79,7 +105,7 @@ Resources:
       Policies:
       - Ref: AccessPolicy
     Type: AWS::IAM::User
-  notcompute:
+  notCompute0:
     Metadata:
       OpenStack::ImageBuilder::Elements:
       - nova-api
@@ -107,9 +133,9 @@ Resources:
           - database: nova
             username: nova
             password: {Ref: NovaDBPassword}
-          - database: quantum
-            username: quantum
-            password: {Ref: QuantumDBPassword}
+          - database: neutron
+            username: neutron
+            password: {Ref: NeutronDBPassword}
       glance:
         db:
           Fn::Join:
@@ -117,6 +143,10 @@ Resources:
             - - 'mysql://glance:'
               - {Ref: GlanceDBPassword}
               - '@127.0.0.1/glance'
+          notifier-strategy:
+            Ref: GlanceNotifierStrategy
+          log-file:
+            Ref: GlanceLogFile
       heat:
         db:
           Fn::Join:
@@ -125,12 +155,12 @@ Resources:
               - {Ref: HeatDBPassword}
               - '@127.0.0.1/heat'
         access_key_id:
-          Ref: Key
+          Ref: notCompute0Key
         refresh:
-        - resource: notcompute
+        - resource: notCompute0
         secret_key:
           Fn::GetAtt:
-          - Key
+          - notCompute0Key
           - SecretAccessKey
         stack:
           name:
@@ -138,12 +168,13 @@ Resources:
           region:
             Ref: AWS::Region
         auth_encryption_key: unset
+        stack_domain_admin_password: {Ref: HeatStackDomainAdminPassword}
       interfaces:
         control:
           Ref: NovaInterfaces
       keystone:
         host:
-          Fn::GetAtt: [ notcompute, PrivateIp ]
+          '127.0.0.1'
         db:
           Fn::Join:
             - ''
@@ -157,24 +188,31 @@ Resources:
             - - 'mysql://nova:'
               - {Ref: NovaDBPassword}
               - '@127.0.0.1/nova'
-      quantum:
+      neutron:
         host:
-          Fn::GetAtt: [ notcompute , PrivateIp ]
+          '127.0.0.1'
         ovs_db:
           Fn::Join:
             - ''
-            - - 'mysql://quantum:'
-              - {Ref: QuantumDBPassword}
-              - '@127.0.0.1/ovs_quantum'
+            - - 'mysql://neutron:'
+              - {Ref: NeutronDBPassword}
+              - '@127.0.0.1/ovs_neutron'
       rabbit:
         host:
-          Fn::GetAtt: [ notcompute , PrivateIp ]
+          '127.0.0.1'
+        username:
+          Ref: RabbitUserName
         password:
           Ref: RabbitPassword
         users:
-          username: guest
+          username:
+            Ref: RabbitUserName
           password:
             Ref: RabbitPassword
+        cookie:
+          Fn::GetAtt:
+          - RabbitCookie
+          - value
       service-password:
         Ref: ServicePassword
     Properties: