From f6ba01a6463fa16c329881c8e93dfdcc52c50ed5 Mon Sep 17 00:00:00 2001 From: Abhay Joshi Date: Fri, 22 Jan 2016 14:32:52 -0800 Subject: [PATCH] Closes-Bug: #1522597 Added one more flag for xmpp auth - xmpp_dns_auth_enable. Change-Id: I2f8b1e6ecfbe7e9e970eb3b9e4805f09b2a9cf55 --- src/server_mgr_main.py | 2 -- src/server_mgr_puppet.py | 3 ++- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/server_mgr_main.py b/src/server_mgr_main.py index eda27759..2431dccf 100755 --- a/src/server_mgr_main.py +++ b/src/server_mgr_main.py @@ -3929,8 +3929,6 @@ def provision_server(self): provision_params['keystone_tenant'] = cluster_params['keystone_tenant'] provision_params['analytics_data_ttl'] = cluster_params['analytics_data_ttl'] provision_params['phy_interface'] = server_params['interface_name'] - if 'xmpp_auth_enabled' in cluster_params: - provision_params['xmpp_auth_enabled'] = cluster_params['xmpp_auth_enabled'] if 'contrail' in server: provision_params['contrail_params'] = server['contrail'] if 'gateway' in server and server['gateway']: diff --git a/src/server_mgr_puppet.py b/src/server_mgr_puppet.py index 5bff81c6..ed6c0909 100644 --- a/src/server_mgr_puppet.py +++ b/src/server_mgr_puppet.py @@ -260,7 +260,8 @@ def add_cluster_parameters(self, cluster_params): "use_certificates" : ["use_certs", "boolean"], "contrail_logoutput" : ["contrail_logoutput", "boolean"], "enable_ceilometer": ["enable_ceilometer", "boolean"], - "xmpp_auth_enabled": ["xmpp_auth_enabled", "boolean"] + "xmpp_dns_auth_enable": ["xmpp_dns_auth_enable", "boolean"], + "xmpp_auth_enable": ["xmpp_auth_enable", "boolean"] } data = ''