Skip to content

Commit

Permalink
Setting SSL params in correct dashboard settings
Browse files Browse the repository at this point in the history
file to allow openstack dashboard to communicate with keystone.

Closes-Bug: 1655799
(cherry picked from commit 594c678)

Change-Id: I17a3a995cffa13f598fde607491658a0e19946e8
  • Loading branch information
cijohnson committed Jan 25, 2017
1 parent 212b6aa commit 1176587
Showing 1 changed file with 4 additions and 3 deletions.
7 changes: 4 additions & 3 deletions contrail_provisioning/openstack/setup.py
Expand Up @@ -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()
Expand All @@ -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:
Expand Down

0 comments on commit 1176587

Please sign in to comment.