Merge "[heat] updated the templates according to latest stable/havana"

packstack/plugins/heat_750.py

@@ -55,6 +55,19 @@ def initConfig(controllerObject):
          "NEED_CONFIRM"    : True,
          "CONDITION"       : False },
 
+        {"CMD_OPTION"      : "heat-auth-encryption-key",
+         "USAGE"           : "The encryption key to use for authentication info in database",
+         "PROMPT"          : "Enter the authentication key for Heat to use for authenticate info in database",
+         "OPTION_LIST"     : [],
+         "VALIDATORS"      : [validators.validate_not_empty],
+         "DEFAULT_VALUE"   : uuid.uuid4().hex[:16],
+         "MASK_INPUT"      : True,
+         "LOOSE_VALIDATION": False,
+         "CONF_NAME"       : "CONFIG_HEAT_AUTH_ENC_KEY",
+         "USE_DEFAULT"     : True,
+         "NEED_CONFIRM"    : True,
+         "CONDITION"       : False },
+
         {"CMD_OPTION"      : "heat-ks-passwd",
          "USAGE"           : "The password to use for the Heat to authenticate with Keystone",
          "PROMPT"          : "Enter the password for the Heat Keystone access",
@@ -204,11 +217,13 @@ def create_keystone_manifest(config):
 
 def create_cloudwatch_manifest(config):
     manifestfile = "%s_heatcw.pp" % controller.CONF['CONFIG_HEAT_CLOUDWATCH_HOST']
-    manifestdata = getManifestTemplate("heat_cloudwatch.pp")
+    manifestdata = getManifestTemplate(get_mq(config, "heat"))
+    manifestdata += getManifestTemplate("heat_cloudwatch.pp")
     appendManifestFile(manifestfile, manifestdata, marker='heat')
 
 
 def create_cfn_manifest(config):
     manifestfile = "%s_heatcnf.pp" % controller.CONF['CONFIG_HEAT_CFN_HOST']
-    manifestdata = getManifestTemplate("heat_cfn.pp")
+    manifestdata = getManifestTemplate(get_mq(config, "heat"))
+    manifestdata += getManifestTemplate("heat_cfn.pp")
     appendManifestFile(manifestfile, manifestdata, marker='heat')

packstack/puppet/templates/heat.pp

@@ -1,8 +1,3 @@
-
-class {"heat::db":
-    sql_connection => "mysql://heat:%(CONFIG_HEAT_DB_PW)s@%(CONFIG_MYSQL_HOST)s/heat"
-}
-
 class { 'heat::api':
 }
 
@@ -10,4 +5,5 @@ class { 'heat::engine':
     heat_metadata_server_url      => 'http://%(CONFIG_HEAT_METADATA_HOST)s:8000',
     heat_waitcondition_server_url => 'http://%(CONFIG_HEAT_METADATA_HOST)s:8000/v1/waitcondition',
     heat_watch_server_url         => 'http://%(CONFIG_HEAT_WATCH_HOST)s:8003',
+    auth_encryption_key           => '%(CONFIG_HEAT_AUTH_ENC_KEY)s',
 }

packstack/puppet/templates/heat_cfn.pp

@@ -1,6 +1,2 @@
-class {"heat::db":
-    sql_connection => "mysql://heat:%(CONFIG_HEAT_DB_PW)s@%(CONFIG_MYSQL_HOST)s/heat"
-}
-
 class { 'heat::api_cfn':
 }

packstack/puppet/templates/heat_cloudwatch.pp

@@ -1,6 +1,2 @@
-class {"heat::db":
-    sql_connection => "mysql://heat:%(CONFIG_HEAT_DB_PW)s@%(CONFIG_MYSQL_HOST)s/heat"
-}
-
 class { 'heat::api_cloudwatch':
 }

packstack/puppet/templates/heat_qpid.pp

@@ -8,4 +8,5 @@ class { 'heat':
     qpid_password     => '%(CONFIG_AMQP_AUTH_PASSWORD)s',
     verbose           => true,
     debug             => %(CONFIG_DEBUG_MODE)s,
+    sql_connection    => "mysql://heat:%(CONFIG_HEAT_DB_PW)s@%(CONFIG_MYSQL_HOST)s/heat",
 }

packstack/puppet/templates/heat_rabbitmq.pp

@@ -8,4 +8,5 @@ class { 'heat':
     rabbit_password   => '%(CONFIG_AMQP_AUTH_PASSWORD)s',
     verbose           => true,
     debug             => %(CONFIG_DEBUG_MODE)s,
+    sql_connection    => "mysql://heat:%(CONFIG_HEAT_DB_PW)s@%(CONFIG_MYSQL_HOST)s/heat",
 }

packstack/puppet/templates/keystone_heat.pp

@@ -1,20 +1,17 @@
+# heat::keystone::auth
+class {"heat::keystone::auth":
+    password => "%(CONFIG_HEAT_KS_PW)s",
+    public_address => "%(CONFIG_HEAT_HOST)s",
+    admin_address => "%(CONFIG_HEAT_HOST)s",
+    internal_address => "%(CONFIG_HEAT_HOST)s",
+}
 
 if '%(CONFIG_HEAT_CFN_INSTALL)s' == 'y' {
-    class {"heat::keystone::auth":
+    # heat::keystone::cfn
+    class {"heat::keystone::auth_cfn":
         password => "%(CONFIG_HEAT_KS_PW)s",
-        heat_public_address => "%(CONFIG_HEAT_HOST)s",
+        public_address => "%(CONFIG_HEAT_HOST)s",
-        heat_admin_address => "%(CONFIG_HEAT_HOST)s",
+        admin_address => "%(CONFIG_HEAT_HOST)s",
-        heat_internal_address => "%(CONFIG_HEAT_HOST)s",
+        internal_address => "%(CONFIG_HEAT_HOST)s",
-        cfn_public_address => "%(CONFIG_HEAT_HOST)s",
-        cfn_admin_address => "%(CONFIG_HEAT_HOST)s",
-        cfn_internal_address => "%(CONFIG_HEAT_HOST)s",
-    }
-} else {
-    class {"heat::keystone::auth":
-        password => "%(CONFIG_HEAT_KS_PW)s",
-        heat_public_address => "%(CONFIG_HEAT_HOST)s",
-        heat_admin_address => "%(CONFIG_HEAT_HOST)s",
-        heat_internal_address => "%(CONFIG_HEAT_HOST)s",
-        cfn_auth_name => undef,
     }
 }