Merge "Added support for parametrized help_url path." into stable/havana

xbezdick · Jan 7, 2014 · ad9117d · ad9117d
2 parents 4684099 + 72e3088
commit ad9117d
Show file tree

Hide file tree

Showing 4 changed files with 39 additions and 2 deletions.
diff --git a/manifests/init.pp b/manifests/init.pp
@@ -73,6 +73,10 @@
 #    (optional) Location of template to use for local_settings.py generation.
 #    Defaults to 'horizon/local_settings.py.erb'.
 #
+#  [*help_url*]
+#    (optional) Location where the documentation should point.
+#    Defaults to 'http://docs.openstack.org'.
+
 class horizon(
   $secret_key,
   $fqdn                    = $::fqdn,
@@ -96,6 +100,7 @@
   $horizon_cert            = undef,
   $horizon_key             = undef,
   $horizon_ca              = undef,
+  $help_url                = 'http://docs.openstack.org',
   $local_settings_template = 'horizon/local_settings.py.erb'
 ) {
 

diff --git a/spec/classes/horizon_init_spec.rb b/spec/classes/horizon_init_spec.rb
@@ -121,14 +121,30 @@
       before do
         params.merge!({
           :django_debug            => 'True',
+          :help_url                => 'https://docs.openstack.org',
           :local_settings_template => fixtures_path + '/override_local_settings.py.erb'
         })
       end
 
       it 'uses the custom local_settings.py template' do
         verify_contents(subject, '/etc/openstack-dashboard/local_settings.py', [
           '# Custom local_settings.py',
-          'DEBUG = True'
+          'DEBUG = True',
+          "HORIZON_CONFIG = {",
+          "    'dashboards': ('project', 'admin', 'settings',),",
+          "    'default_dashboard': 'project',",
+          "    'user_home': 'openstack_dashboard.views.get_user_home',",
+          "    'ajax_queue_limit': 10,",
+          "    'auto_fade_alerts': {",
+          "        'delay': 3000,",
+          "        'fade_duration': 1500,",
+          "        'types': ['alert-success', 'alert-info']",
+          "    },",
+          "    'help_url': \"https://docs.openstack.org\",",
+          "    'exceptions': {'recoverable': exceptions.RECOVERABLE,",
+          "                   'not_found': exceptions.NOT_FOUND,",
+          "                   'unauthorized': exceptions.UNAUTHORIZED},",
+          "}",
         ])
       end
     end

diff --git a/spec/fixtures/override_local_settings.py.erb b/spec/fixtures/override_local_settings.py.erb
@@ -1,2 +1,18 @@
 # Custom local_settings.py
 DEBUG = <%= django_debug %>
+
+HORIZON_CONFIG = {
+    'dashboards': ('project', 'admin', 'settings',),
+    'default_dashboard': 'project',
+    'user_home': 'openstack_dashboard.views.get_user_home',
+    'ajax_queue_limit': 10,
+    'auto_fade_alerts': {
+        'delay': 3000,
+        'fade_duration': 1500,
+        'types': ['alert-success', 'alert-info']
+    },
+    'help_url': "<%= help_url %>",
+    'exceptions': {'recoverable': exceptions.RECOVERABLE,
+                   'not_found': exceptions.NOT_FOUND,
+                   'unauthorized': exceptions.UNAUTHORIZED},
+}
diff --git a/templates/local_settings.py.erb b/templates/local_settings.py.erb
@@ -63,7 +63,7 @@ HORIZON_CONFIG = {
         'fade_duration': 1500,
         'types': ['alert-success', 'alert-info']
     },
-    'help_url': "http://docs.openstack.org",
+    'help_url': "<%= @help_url %>",
     'exceptions': {'recoverable': exceptions.RECOVERABLE,
                    'not_found': exceptions.NOT_FOUND,
                    'unauthorized': exceptions.UNAUTHORIZED},