Merge "Setting SSL params in correct dashboard settings" into R3.2

Juniper · Jan 31, 2017 · 46cb140 · 46cb140
2 parents e4f3b02 + 1a9d29f
commit 46cb140
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/contrail_provisioning/openstack/setup.py b/contrail_provisioning/openstack/setup.py
@@ -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()
@@ -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"