From 2cdc1428f9a3ed8715a91a6be85a6638157a840b Mon Sep 17 00:00:00 2001 From: nitishkrishna Date: Mon, 27 Jul 2015 14:44:18 -0700 Subject: [PATCH] Partial-Bug: #1478101 - Heat Encryption Key set incorrectly The Parameter heat_encryption_key has been added to cluster params If this value is not set, the default value used by heat internally is used instead Change-Id: I3a94b0c24b89873fa5db94c75d32ec9364c57b5a --- src/openstack_hieradata.py | 2 +- src/server_mgr_puppet.py | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/openstack_hieradata.py b/src/openstack_hieradata.py index fecd7c9b..520d1e8a 100644 --- a/src/openstack_hieradata.py +++ b/src/openstack_hieradata.py @@ -81,7 +81,7 @@ ######## Heat openstack::heat::password: '$__openstack_password__' -openstack::heat::encryption_key: '' +openstack::heat::encryption_key: '$__heat_encryption_key__' ######## Horizon openstack::horizon::secret_key: '$__openstack_password__' diff --git a/src/server_mgr_puppet.py b/src/server_mgr_puppet.py index 200bc85d..f1e1168b 100644 --- a/src/server_mgr_puppet.py +++ b/src/server_mgr_puppet.py @@ -2134,6 +2134,7 @@ def build_openstack_hiera_file( mysql_root_password = cluster_params.get("mysql_root_password", "c0ntrail123") keystone_admin_token = cluster_params.get("service_token", "contrail123") keystone_admin_password = cluster_params.get("keystone_password", "contrail123") + heat_encryption_key = cluster_params.get("heat_encryption_key", "notgood but just long enough i think") subnet_address = str(IPNetwork( openstack_ip + "/" + subnet_mask).network) subnet_octets = subnet_address.split(".") @@ -2152,7 +2153,8 @@ def build_openstack_hiera_file( '__keystone_admin_token__': keystone_admin_token, '__keystone_admin_password__': keystone_admin_password, '__mysql_allowed_hosts__': (', '.join("'" + item + "'" for item in mysql_allowed_hosts)), - '__openstack_password__': keystone_admin_password + '__openstack_password__': keystone_admin_password, + '__heat_encryption_key__': heat_encryption_key } data = openstack_hieradata.template.safe_substitute(template_vals) outfile = open(hiera_filename, 'w')