From 11765872697374c82cd276b703a7661dbcd534be Mon Sep 17 00:00:00 2001 From: Ignatious Johnson Christopher Date: Wed, 25 Jan 2017 15:10:22 -0800 Subject: [PATCH] Setting SSL params in correct dashboard settings file to allow openstack dashboard to communicate with keystone. Closes-Bug: 1655799 (cherry picked from commit 594c678762f2acc6c04e15715090cbe424ffcd13) Change-Id: I17a3a995cffa13f598fde607491658a0e19946e8 --- contrail_provisioning/openstack/setup.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/contrail_provisioning/openstack/setup.py b/contrail_provisioning/openstack/setup.py index 0445432b..a3e696ef 100755 --- a/contrail_provisioning/openstack/setup.py +++ b/contrail_provisioning/openstack/setup.py @@ -195,10 +195,12 @@ def fixup_config_files(self): barbican_ini_file = "/etc/barbican/vassals/barbican-api.ini" # TODO till post of openstack-horizon.spec is fixed... - if (os.path.isdir("/etc/openstack_dashboard")): + if (os.path.isfile("/etc/openstack_dashboard/local_settings")): dashboard_setting_file = "/etc/openstack_dashboard/local_settings" - else: + elif (os.path.isfile("/etc/openstack-dashboard/local_settings")): dashboard_setting_file = "/etc/openstack-dashboard/local_settings" + else: + dashboard_setting_file = "/etc/openstack-dashboard/local_settings.py" if self.pdist in ['fedora', 'centos', 'redhat']: dashboard_version = self.get_openstack_dashboard_version() @@ -208,7 +210,6 @@ def fixup_config_files(self): else: local("sudo sed -i 's/ALLOWED_HOSTS =/#ALLOWED_HOSTS =/g' %s" %(dashboard_setting_file)) - dashboard_setting_file = "/etc/openstack-dashboard/local_settings.py" with settings(warn_only=True): is_v3 = local('grep "^OPENSTACK_KEYSTONE_MULTIDOMAIN_SUPPORT = True" %s' % dashboard_setting_file) if self._args.keystone_version == 'v3' and is_v3.failed: