From: Clint Byrum <clint@fewbar.com>
Date: Thu, 16 May 2013 23:10:20 +0000 (-0700)
Subject: Pushing passwords into mysql and other fixes.
X-Git-Tag: opnfv-6.0.0~3011
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=1536112575cb05d38ed17d5fd5a556f10fb7d371;p=apex-tripleo-heat-templates.git

Pushing passwords into mysql and other fixes.

Generating and distributing usernames/passwords is just too complicated
with Heat at this stage, so we need to push them into mysql from the
template.
---

diff --git a/notcompute.yaml b/notcompute.yaml
index f63307d1..3579760b 100644
--- a/notcompute.yaml
+++ b/notcompute.yaml
@@ -93,6 +93,23 @@ Resources:
         Ref: ServicePassword
       admin-token:
         Ref: AdminToken
+      mysql:
+        create-users:
+          - database: keystone
+            username: keystone
+            password: {Ref: KeystoneDBPassword}
+          - database: heat
+            username: heat
+            password: {Ref: HeatDBPassword}
+          - database: glance
+            username: glance
+            password: {Ref: GlanceDBPassword}
+          - database: nova
+            username: nova
+            password: {Ref: NovaDBPassword}
+          - database: quantum
+            username: quantum
+            password: {Ref: QuantumDBPassword}
       glance:
         db:
           Fn::Join:
@@ -120,12 +137,13 @@ Resources:
             Ref: AWS::StackName
           region:
             Ref: AWS::Region
+        auth_encryption_key: unset
       interfaces:
         control:
           Ref: NovaInterfaces
       keystone:
         host:
-          Fn::GetAtt: [ notocmpute, PrivateIp ]
+          Fn::GetAtt: [ notcompute, PrivateIp ]
         db:
           Fn::Join:
             - ''
@@ -153,6 +171,10 @@ Resources:
           Fn::GetAtt: [ notcompute , PrivateIp ]
         password:
           Ref: RabbitPassword
+        users:
+          username: guest
+          password:
+            Ref: RabbitPassword
       service-password:
         Ref: ServicePassword
     Properties: