Merge next branch

hooks/charmhelpers/contrib/openstack/context.py

@@ -808,6 +808,19 @@ class NeutronContext(OSContextGenerator):
 
         return ovs_ctxt
 
+    def nuage_ctxt(self):
+        driver = neutron_plugin_attribute(self.plugin, 'driver',
+                                          self.network_manager)
+        config = neutron_plugin_attribute(self.plugin, 'config',
+                                          self.network_manager)
+        nuage_ctxt = {'core_plugin': driver,
+                      'neutron_plugin': 'vsp',
+                      'neutron_security_groups': self.neutron_security_groups,
+                      'local_ip': unit_private_ip(),
+                      'config': config}
+
+        return nuage_ctxt
+
     def nvp_ctxt(self):
         driver = neutron_plugin_attribute(self.plugin, 'driver',
                                           self.network_manager)
@@ -891,6 +904,8 @@ class NeutronContext(OSContextGenerator):
             ctxt.update(self.n1kv_ctxt())
         elif self.plugin == 'Calico':
             ctxt.update(self.calico_ctxt())
+        elif self.plugin == 'vsp':
+            ctxt.update(self.nuage_ctxt())
 
         alchemy_flags = config('neutron-alchemy-flags')
         if alchemy_flags:

hooks/charmhelpers/contrib/openstack/neutron.py

@@ -180,6 +180,19 @@ def neutron_plugins():
                           'nova-api-metadata']],
             'server_packages': ['neutron-server', 'calico-control'],
             'server_services': ['neutron-server']
+        },
+        'vsp': {
+            'config': '/etc/neutron/plugins/nuage/nuage_plugin.ini',
+            'driver': 'neutron.plugins.nuage.plugin.NuagePlugin',
+            'contexts': [
+                context.SharedDBContext(user=config('neutron-database-user'),
+                                        database=config('neutron-database'),
+                                        relation_prefix='neutron',
+                                        ssl_dir=NEUTRON_CONF_DIR)],
+            'services': [],
+            'packages': [],
+            'server_packages': ['neutron-server', 'neutron-plugin-nuage'],
+            'server_services': ['neutron-server']
         }
     }
     if release >= 'icehouse':

hooks/charmhelpers/contrib/openstack/templates/git.upstart

@@ -12,4 +12,6 @@ exec start-stop-daemon --start --chuid {{ user_name }} \
             {% for config_file in config_files -%}
             --config-file={{ config_file }} \
             {% endfor -%}
+            {% if log_file -%}
             --log-file={{ log_file }}
+            {% endif -%}

hooks/charmhelpers/core/strutils.py

@@ -33,9 +33,9 @@ def bool_from_string(value):
 
     value = value.strip().lower()
 
-    if value in ['y', 'yes', 'true', 't']:
+    if value in ['y', 'yes', 'true', 't', 'on']:
         return True
-    elif value in ['n', 'no', 'false', 'f']:
+    elif value in ['n', 'no', 'false', 'f', 'off']:
         return False
 
     msg = "Unable to interpret string value '%s' as boolean" % (value)

hooks/cinder_utils.py

@@ -81,6 +81,7 @@ COMMON_PACKAGES = [
     'cinder-common',
     'gdisk',
     'haproxy',
+    'librbd1',  # bug 1440948 vol-from-img
     'python-jinja2',
     'python-keystoneclient',
     'python-mysqldb',

tests/basic_deployment.py

@@ -193,9 +193,9 @@ class CinderBasicDeployment(OpenStackAmuletDeployment):
                                                           obj_count)
 
     def obj_is_status(self, obj, obj_id, stat='available',
-                      msg='openstack object status check', max_wait=60):
+                      msg='openstack object status check', max_wait=120):
         ''''Wait for an openstack object status to be as expected.
-            By default, expect an available status within 60s.  Useful
+            By default, expect an available status within 120s.  Useful
             when confirming cinder volumes, snapshots, glance images, etc.
             reach a certain state/status within a specified time.'''
         # NOTE(beisner): need to move to charmhelpers, and adjust calls here.