Merge lp:~gnuoy/charms/trusty/cisco-vpp/1515343 into lp:~openstack-charmers/charms/trusty/cisco-vpp/next

[Liam Young]

[lp:~gnuoy/charms/trusty/cisco-vpp/1515343]

123. By Liam Young on 2015-11-27

Merged service_host fix in

[James Page (james-page)]

Minor tidy points.

review: Needs Fixing

[lp:~gnuoy/charms/trusty/cisco-vpp/1515343]

124. By Liam Young on 2015-12-02

Merged prerequisite branch in

125. By Liam Young on 2015-12-02

Implement feedback from mp to handle the case where nova-compute does not set hugepages more neatly

[James Page (james-page)]

review: Approve

=== modified file 'hooks/services.py'
--- hooks/services.py	2015-12-02 07:36:37 +0000
+++ hooks/services.py	2015-12-02 07:36:37 +0000
@@ -34,6 +34,7 @@
             'data_ready': [
                 vpp_utils.install_vpp_packages,
                 vpp_utils.configure_ssh_keys,
+                vpp_utils.ensure_vpp_running,
             ],
         },
         {

=== modified file 'hooks/vpp_data.py'
--- hooks/vpp_data.py	2015-12-02 07:36:37 +0000
+++ hooks/vpp_data.py	2015-12-02 07:36:37 +0000
@@ -17,6 +17,7 @@
 NEUTRON_CONF_DIR = "/etc/neutron"
 SHARED_SECRET_FILE = "/etc/neutron/secret.txt"
 
+
 class NeutronPluginAPIRelation(helpers.RelationContext):
     name = 'neutron-plugin-api'
     interface = 'neutron-plugin-api'
@@ -82,6 +83,13 @@
         super(NeutronPluginRelation, self).__init__(*args, **kwargs)
         self['shared_secret'] = self.get_metadata_secret()
 
+    def get_data(self):
+        super(NeutronPluginRelation, self).get_data()
+        self['hugepage_number'] = None
+        if self.get('neutron-plugin') and len(self['neutron-plugin']):
+            self['hugepage_number'] = \
+                self['neutron-plugin'][0].get('hugepage_number')
+
     def get_metadata_secret(self):
         secret = None
         if os.path.exists(os.path.dirname(SHARED_SECRET_FILE)):

=== modified file 'hooks/vpp_utils.py'
--- hooks/vpp_utils.py	2015-12-02 07:36:37 +0000
+++ hooks/vpp_utils.py	2015-12-02 07:36:37 +0000
@@ -17,7 +17,11 @@
 )
 import vpp_data
 from charmhelpers.core.decorators import retry_on_exception
-from charmhelpers.core.services.base import service_restart
+from charmhelpers.core.host import (
+    service_restart,
+    service_stop,
+    service_running
+)
 
 ODL_NODE_QUERY_PATH = '/restconf/operational/opendaylight-inventory:nodes/'
 ODL_MAC_QUERY_PATH = '/restconf/config/neutron-vpp-map:neutron_net_map/'
@@ -95,7 +99,18 @@
     log('Restarting qn')
     debug_display_qn_pci_conf()
     service_restart('qn')
-    check_vpe_cli()
+    try:
+        check_vpe_cli()
+    except subprocess.CalledProcessError as e:
+        log('Error starting vpp, shutting down qn')
+        service_stop('qn')
+        subprocess.check_call(['/opt/cisco/vpe/bin/svm_cleanup'])
+        raise e
+
+
+def ensure_vpp_running(servicename):
+    if not service_running('qn'):
+        restart_qn()
 
 
 def reload_apparmor():

=== modified file 'templates/icehouse/neutron.conf'
--- templates/icehouse/neutron.conf	2015-12-02 07:36:37 +0000
+++ templates/icehouse/neutron.conf	2015-12-02 07:36:37 +0000
@@ -2,7 +2,7 @@
 ###############################################################################
 # [ WARNING ]
 # Configuration file maintained by Juju. Local changes may be overwritten.
-# Config managed by neutron-openvswitch charm
+# Config managed by cisco-vpp charm
 ###############################################################################
 [DEFAULT]
 verbose = {{ verbose }}

=== modified file 'templates/qn.conf'
--- templates/qn.conf	2015-08-17 10:51:37 +0000
+++ templates/qn.conf	2015-12-02 07:36:37 +0000
@@ -1,3 +1,12 @@
+###############################################################################
+## [ WARNING ]
+## Configuration file maintained by Juju. Local changes may be overwritten.
+## Config managed by cisco-vpp charm
+################################################################################
+{% if hugepage_number -%}
+# Trigger qn restart on hugepage change: {{ hugepage_number }}
+{% endif -%}
+
 lc_procs = { svm_cleanup vpe confd orca }
 
 install_root = "/opt/cisco/vpe"