works but missing stuff

diff --git a/mysql.yaml b/mysql.yaml
index 073a9be..722cff8 100644 (file)
--- a/mysql.yaml
+++ b/mysql.yaml
@@ -11,10 +11,6 @@ Parameters:
     Default: bm.small
   MySQLImage:
     Type: String
-  KeystoneUser:
-    Description: Keystone database username.
-    Type: String
-    Default: keystone
   BootstrapUrl:
     Description: Fetch a mysql dump file from this URL and load it
     Type: String
@@ -45,8 +41,6 @@ Resources:
         mysql:
           users:
             - database: keystone
-              username: {Ref: KeystoneUser}
-              userhandle: {Ref: KeystonePasswordHandle}
           bootstrap_url: {Ref: BootstrapUrl}
           root_cnf_url: {Ref: BootstrapRootCnfUrl}
         heat:
@@ -65,17 +59,6 @@ Resources:
       InstanceType: {Ref: InstanceType}
       KeyName: {Ref: KeyName}
       UserData: "#!/bin/bash\ntouch /tmp/userdata-finished\necho Userdata finished $(date)\n"
-  KeystonePasswordHandle:
-    Type: AWS::CloudFormation::WaitConditionHandle
-  KeystonePassword:
-    DependsOn: MySQL
-    Type: AWS::CloudFormation::WaitCondition
-    Properties:
-      Handle: {Ref: KeystonePasswordHandle}
-      Timeout: 60
 Outputs:
     MySQLHost: 
         Fn::GetAtt: [ MySQL , PrivateIp ]
-    KeystonePassword:
-        Fn::GetAtt: [ KeystonePassword, Data ]
-    KeystoneUser: {Ref: KeystoneUser}