Merge lp:~springfield-team/charms/precise/openstack-dashboard/trunk into lp:~openstack-charmers-archive/charms/precise/openstack-dashboard/trunk

[ChingWei Chang]

This merge proposal is prepared for supporting Cisco Nexus 1000V dashboard for its related extension tab/panel.
config.yaml
New parameter for supporting Cisco N1KV specific policy profile profile-support.

hooks/horizon_contexts.py
Context logic to retrieve profile-support

templates/havana/local_settings.py
For profile-support setting

[Marco Ceppi (marcoceppi)]

Leaving for openstack-charmers, thanks!!

review: Abstain

[ChingWei Chang (cwchang)]

We have merged with latest Icehouse merge to charm store now.
Please re-review this version

[James Page (james-page)]

Thanks for this proposal.

I think you need to tweak the way that the profile_support is handled. Specifically

1) config.yaml

Don't provide a default on "None" - the default is null which translates into None in python once parsed.

Also lets drop "-support" from the configuration key - its really just the profile.

Some comments in the description as to which values work would be nice as well.

2) local_settings.py

Rather than dropping the value directly into local settings, I'd prefer to see a conditional code block in the template that sets the profile_support value if its not None, and defaults the the original code if its None.

3) hooks/horizon_contexts.py

Please validate that the profile-support config is a supported value - 'cisco' or None should be right I think.

Thanks!

review: Needs Fixing

[lp:~springfield-team/charms/precise/openstack-dashboard/trunk]

32. By Shiv Prasad Rao on 2014-06-13

Bug fix for havana deployment

33. By Shiv Prasad Rao on 2014-07-22

Chaning profile-support to profile
changes to address review comments

34. By Shiv Prasad Rao on 2014-07-22

sync revision 31 from lp:charms/openstack-dashboard

[Shiv Prasad Rao (shivrao)]

Addressed the comments:

1) changed the config parameter to "profile" in config.yaml. It was originally created as profile-support because the parameter in the local_setting is profile-support.

2) Added conditional code block in local_settings.py

3) added validation for supported value. Currently it is only cisco.

review: Needs Resubmitting

[lp:~springfield-team/charms/precise/openstack-dashboard/trunk]

35. By Dulanjalie Ganegedara on 2014-08-01

adding charmhelper support to use --keyserver option for public PPA

Unmerged revisions

=== modified file 'config.yaml'
--- config.yaml	2014-02-03 12:34:56 +0000
+++ config.yaml	2014-07-22 07:19:40 +0000
@@ -87,3 +87,6 @@
     secret:
         type: string
         description: Secret for Horizon to use when securing internal data; set this when using multiple dashboard units.
+    profile:
+        type: string
+        description: Default profile for the dashboard. Eg. cisco

=== modified file 'hooks/horizon_contexts.py'
--- hooks/horizon_contexts.py	2014-02-27 10:07:57 +0000
+++ hooks/horizon_contexts.py	2014-07-22 07:19:40 +0000
@@ -83,7 +83,8 @@
             'default_role': config('default-role'),
             "webroot": config('webroot'),
             "ubuntu_theme": config('ubuntu-theme') in ['yes', True],
-            "secret": config('secret') or pwgen()
+            "secret": config('secret') or pwgen(),
+            'support_profile': config('profile') if config('profile') in ['cisco'] else None,
         }
         return ctxt
 
@@ -119,3 +120,12 @@
                 'ssl_configured': False,
             }
         return ctxt
+
+class RouterSettingContext(OSContextGenerator):
+    def __call__(self):
+        ''' Enable/Disable Router Tab on horizon '''
+        ctxt = {
+            'disable_router': False if config('profile') in  ['cisco'] else True
+        }
+        return ctxt
+

=== modified file 'hooks/horizon_utils.py'
--- hooks/horizon_utils.py	2014-05-21 10:06:19 +0000
+++ hooks/horizon_utils.py	2014-07-22 07:19:40 +0000
@@ -40,6 +40,7 @@
 APACHE_24_DEFAULT = "%s/sites-available/000-default.conf" % (APACHE_CONF_DIR)
 APACHE_SSL = "%s/sites-available/default-ssl" % (APACHE_CONF_DIR)
 APACHE_DEFAULT = "%s/sites-available/default" % (APACHE_CONF_DIR)
+ROUTER_SETTING = "/usr/share/openstack-dashboard/openstack_dashboard/enabled/_40_router.py"
 
 TEMPLATES = 'templates'
 
@@ -86,6 +87,10 @@
         'hook_contexts': [horizon_contexts.HorizonHAProxyContext()],
         'services': ['haproxy'],
     }),
+    (ROUTER_SETTING, {
+        'hook_contexts': [horizon_contexts.RouterSettingContext()],
+        'services': ['apache2'],
+    }),
 ])
 
 
@@ -122,6 +127,10 @@
         configs.register(APACHE_SSL,
                          CONFIG_FILES[APACHE_SSL]['hook_contexts'])
 
+    if os.path.exists(os.path.dirname(ROUTER_SETTING)):
+        configs.register(ROUTER_SETTING,
+                         CONFIG_FILES[ROUTER_SETTING]['hook_contexts'])
+    
     return configs
 
 

=== modified file 'templates/havana/local_settings.py'
--- templates/havana/local_settings.py	2014-05-28 16:05:37 +0000
+++ templates/havana/local_settings.py	2014-07-22 07:19:40 +0000
@@ -160,10 +160,16 @@
     # The profile_support option is used to detect if an external router can be
     # configured via the dashboard. When using specific plugins the
     # profile_support can be turned on if needed.
+    #'profile_support': None,
+    #'profile_support': 'cisco', # Example of value set to support Cisco
+    {% if support_profile -%}
+    'profile_support': '{{ support_profile }}',
+    {% else -%}
     'profile_support': None,
-    #'profile_support': 'cisco',
+    {% endif -%}
 }
 
+
 # The OPENSTACK_IMAGE_BACKEND settings can be used to customize features
 # in the OpenStack Dashboard related to the Image service, such as the list
 # of supported image formats.

=== added file 'templates/icehouse/_40_router.py'
--- templates/icehouse/_40_router.py	1970-01-01 00:00:00 +0000
+++ templates/icehouse/_40_router.py	2014-07-22 07:19:40 +0000
@@ -0,0 +1,10 @@
+#The name of the dashboard to be added to HORIZON['dashboards']. Required.
+DASHBOARD = 'router'
+
+# A list of applications to be added to INSTALLED_APPS.
+ADD_INSTALLED_APPS = [
+    'openstack_dashboard.dashboards.router',
+]
+
+# If set to True, this dashboard will not be added to the settings.
+DISABLED = {{ disable_router }}

=== modified file 'templates/icehouse/local_settings.py'
--- templates/icehouse/local_settings.py	2014-05-28 16:05:37 +0000
+++ templates/icehouse/local_settings.py	2014-07-22 07:19:40 +0000
@@ -163,8 +163,13 @@
     # The profile_support option is used to detect if an external router can be
     # configured via the dashboard. When using specific plugins the
     # profile_support can be turned on if needed.
+    #'profile_support': None,
+    #'profile_support': 'cisco', # Example of value set to support Cisco
+    {% if support_profile -%}
+    'profile_support': '{{ support_profile }}',
+    {% else -%}
     'profile_support': None,
-    #'profile_support': 'cisco',
+    {% endif -%}
 }
 
 # The OPENSTACK_IMAGE_BACKEND settings can be used to customize features