From 3797d30922d78c600dea1de9b6d84eb06d17f3b4 Mon Sep 17 00:00:00 2001 From: Abhay Joshi Date: Mon, 25 Jan 2016 21:39:44 -0800 Subject: [PATCH] Closes-Bug: #1537291 Old contrail code expects the sequencing parameters to be set using old params structure, i.e. contrail::params::enable_.... This is determined based on how initially the sequencing params are set. Change-Id: I391e391c29cfb4d893237573443bf0c828762cb9 --- src/server_mgr_puppet.py | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/server_mgr_puppet.py b/src/server_mgr_puppet.py index fe72af62..877fee0b 100644 --- a/src/server_mgr_puppet.py +++ b/src/server_mgr_puppet.py @@ -774,13 +774,11 @@ def modify_server_hiera_data(self, server_id, hiera_file, role_steps_list, self._smgr_log.log(self._smgr_log.DEBUG, "role-tuple: %s = %s" % (role_step_tuple[0], role_step_tuple[1])) if server_id == role_step_tuple[0]: role_step = role_step_tuple[1].replace('-', '_') - key = 'contrail::params::enable_' + role_step key = 'contrail::sequencing::enable_' + role_step + if key not in hiera_data_dict: + key = 'contrail::params::enable_' + role_step self._smgr_log.log(self._smgr_log.DEBUG, "role-key: %s %s" % (key, enable)) - if enable: - hiera_data_dict[key] = True - else: - hiera_data_dict[key] = False + hiera_data_dict[key] = enable data = yaml.dump(hiera_data_dict, default_style='\'', indent=4) with open(hiera_file, "w") as hiera_fh: hiera_fh.write(data)