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.

Change-Id: I5b0d65234e72ff813522cea7ce72ae55171de0b4
Closes-Bug: 1655799
  • Loading branch information
cijohnson committed Jan 25, 2017
1 parent 3ebc6ba commit 1a9d29f
Showing 1 changed file with 4 additions and 3 deletions.
7 changes: 4 additions & 3 deletions contrail_provisioning/openstack/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -205,10 +205,12 @@ def fixup_config_files(self):
barbican_apache_file = "/etc/apache2/conf-available/barbican-api.conf"

# 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 @@ -225,7 +227,6 @@ def fixup_config_files(self):
local("sudo sed -i 's/^OPENSTACK_KEYSTONE_URL = \"http:/OPENSTACK_KEYSTONE_URL = \"https:/g' %s" % (dashboard_setting_file))
local("sudo sed -i 's/^#OPENSTACK_SSL_NO_VERIFY.*/OPENSTACK_SSL_NO_VERIFY = True/g' %s" % (dashboard_setting_file))

dashboard_setting_file = "/etc/openstack-dashboard/local_settings.py"
dashboard_keystone_policy_file = "/usr/share/openstack-dashboard/openstack_dashboard/conf/keystone_policy.json"
if (not os.path.isfile(dashboard_keystone_policy_file)):
dashboard_keystone_policy_file = "/etc/openstack-dashboard/keystone_policy.json"
Expand Down

0 comments on commit 1a9d29f

Please sign in to comment.