Merge lp:~celebdor/charms/trusty/nova-cloud-controller/midonet into lp:~openstack-charmers-archive/charms/trusty/nova-cloud-controller/next

[Antoni Segura Puimedon]

[uosci-testing-bot (uosci-testing-bot)]

charm_unit_test #10678 nova-cloud-controller-next for celebdor mp273717
    UNIT OK: passed

Build: http://10.245.162.77:8080/job/charm_unit_test/10678/

[uosci-testing-bot (uosci-testing-bot)]

charm_amulet_test #7189 nova-cloud-controller-next for celebdor mp273717
    AMULET FAIL: amulet-test failed

AMULET Results (max last 2 lines):
make: *** [test] Error 1
ERROR:root:Make target returned non-zero.

Full amulet test output: http://paste.ubuntu.com/12706944/
Build: http://10.245.162.77:8080/job/charm_amulet_test/7189/

[James Page (james-page)]

review: Needs Fixing

Unmerged revisions

200. By Antoni Segura Puimedon <email address hidden> on 2015-10-07

Add template and config changes for MidoNet neutron plugin support

199. By Antoni Segura Puimedon <email address hidden> on 2015-10-07

CH sync for MidoNet support

=== modified file 'config.yaml'
--- config.yaml	2015-10-02 12:05:06 +0000
+++ config.yaml	2015-10-07 15:52:42 +0000
@@ -420,3 +420,9 @@
       under the "filter:ratelimit" section as "limits". The syntax for these
       rules is documented at
       http://docs.openstack.org/kilo/config-reference/content/configuring-compute-API.html
+  shared_secret:
+    default: ""
+    type: string
+    description: |
+      Shared secret between neutron-metadata agent and the nova-api metadata
+      server for signed communication (Used for MidoNet deployments).
 
=== modified file 'hooks/charmhelpers/contrib/openstack/amulet/utils.py'
--- hooks/charmhelpers/contrib/openstack/amulet/utils.py	2015-09-22 02:07:16 +0000
+++ hooks/charmhelpers/contrib/openstack/amulet/utils.py	2015-10-07 15:52:42 +0000
@@ -752,7 +752,7 @@
             self.log.debug('SSL is enabled  @{}:{} '
                            '({})'.format(host, port, unit_name))
             return True
-        elif not port and not conf_ssl:
+        elif not conf_ssl:
             self.log.debug('SSL not enabled @{}:{} '
                            '({})'.format(host, port, unit_name))
             return False
 
=== modified file 'hooks/charmhelpers/contrib/openstack/context.py'
--- hooks/charmhelpers/contrib/openstack/context.py	2015-09-22 02:45:17 +0000
+++ hooks/charmhelpers/contrib/openstack/context.py	2015-10-07 15:52:42 +0000
@@ -14,6 +14,7 @@
 # You should have received a copy of the GNU Lesser General Public License
 # along with charm-helpers.  If not, see <http://www.gnu.org/licenses/>.
 
+import glob
 import json
 import os
 import re
@@ -951,6 +952,19 @@
                     'config': config}
         return ovs_ctxt
 
+    def midonet_ctxt(self):
+        driver = neutron_plugin_attribute(self.plugin, 'driver',
+                                          self.network_manager)
+        midonet_config = neutron_plugin_attribute(self.plugin, 'config',
+                                                  self.network_manager)
+        mido_ctxt = {'core_plugin': driver,
+                     'neutron_plugin': 'midonet',
+                     'neutron_security_groups': self.neutron_security_groups,
+                     'local_ip': unit_private_ip(),
+                     'config': midonet_config}
+
+        return mido_ctxt
+
     def __call__(self):
         if self.network_manager not in ['quantum', 'neutron']:
             return {}
@@ -972,6 +986,8 @@
             ctxt.update(self.nuage_ctxt())
         elif self.plugin == 'plumgrid':
             ctxt.update(self.pg_ctxt())
+        elif self.plugin == 'midonet':
+            ctxt.update(self.midonet_ctxt())
 
         alchemy_flags = config('neutron-alchemy-flags')
         if alchemy_flags:
@@ -1363,7 +1379,7 @@
             normalized.update({port: port for port in resolved
                                if port in ports})
             if resolved:
-                return {bridge: normalized[port] for port, bridge in
+                return {normalized[port]: bridge for port, bridge in
                         six.iteritems(portmap) if port in normalized.keys()}
 
         return None
@@ -1374,12 +1390,22 @@
     def __call__(self):
         ctxt = {}
         mappings = super(PhyNICMTUContext, self).__call__()
-        if mappings and mappings.values():
-            ports = mappings.values()
+        if mappings and mappings.keys():
+            ports = sorted(mappings.keys())
             napi_settings = NeutronAPIContext()()
             mtu = napi_settings.get('network_device_mtu')
+            all_ports = set()
+            # If any of ports is a vlan device, its underlying device must have
+            # mtu applied first.
+            for port in ports:
+                for lport in glob.glob("/sys/class/net/%s/lower_*" % port):
+                    lport = os.path.basename(lport)
+                    all_ports.add(lport.split('_')[1])
+
+            all_ports = list(all_ports)
+            all_ports.extend(ports)
             if mtu:
-                ctxt["devs"] = '\\n'.join(ports)
+                ctxt["devs"] = '\\n'.join(all_ports)
                 ctxt['mtu'] = mtu
 
         return ctxt
 
=== modified file 'hooks/charmhelpers/contrib/openstack/neutron.py'
--- hooks/charmhelpers/contrib/openstack/neutron.py	2015-09-22 02:45:17 +0000
+++ hooks/charmhelpers/contrib/openstack/neutron.py	2015-10-07 15:52:42 +0000
@@ -209,6 +209,20 @@
             'server_packages': ['neutron-server',
                                 'neutron-plugin-plumgrid'],
             'server_services': ['neutron-server']
+        },
+        'midonet': {
+            'config': '/etc/neutron/plugins/midonet/midonet.ini',
+            'driver': 'midonet.neutron.plugin.MidonetPluginV2',
+            'contexts': [
+                context.SharedDBContext(user=config('neutron-database-user'),
+                                        database=config('neutron-database'),
+                                        relation_prefix='neutron',
+                                        ssl_dir=NEUTRON_CONF_DIR)],
+            'services': [],
+            'packages': [[headers_package()] + determine_dkms_package()],
+            'server_packages': ['neutron-server',
+                                'python-neutron-plugin-midonet'],
+            'server_services': ['neutron-server']
         }
     }
     if release >= 'icehouse':
@@ -310,10 +324,10 @@
 def parse_data_port_mappings(mappings, default_bridge='br-data'):
     """Parse data port mappings.
 
-    Mappings must be a space-delimited list of port:bridge mappings.
+    Mappings must be a space-delimited list of bridge:port.
 
-    Returns dict of the form {port:bridge} where port may be an mac address or
-    interface name.
+    Returns dict of the form {port:bridge} where ports may be mac addresses or
+    interface names.
     """
 
     # NOTE(dosaboy): we use rvalue for key to allow multiple values to be
 
=== modified file 'hooks/charmhelpers/contrib/openstack/templates/ceph.conf'
--- hooks/charmhelpers/contrib/openstack/templates/ceph.conf	2015-07-16 20:18:38 +0000
+++ hooks/charmhelpers/contrib/openstack/templates/ceph.conf	2015-10-07 15:52:42 +0000
@@ -13,3 +13,9 @@
 err to syslog = {{ use_syslog }}
 clog to syslog = {{ use_syslog }}
 
+[client]
+{% if rbd_client_cache_settings -%}
+{% for key, value in rbd_client_cache_settings.iteritems() -%}
+{{ key }} = {{ value }}
+{% endfor -%}
+{%- endif %}
 \ No newline at end of file
 
=== modified file 'templates/juno/nova.conf'
--- templates/juno/nova.conf	2015-09-17 20:15:37 +0000
+++ templates/juno/nova.conf	2015-10-07 15:52:42 +0000
@@ -60,7 +60,7 @@
 rbd_secret_uuid = {{ rbd_secret_uuid }}
 {% endif -%}
 
-{% if neutron_plugin and neutron_plugin == 'ovs' -%}
+{% if neutron_plugin and neutron_plugin in ('ovs', 'midonet') -%}
 libvirt_vif_driver = nova.virt.libvirt.vif.LibvirtGenericVIFDriver
 libvirt_user_virtio_for_bridges =  True
 {% if neutron_security_groups -%}
@@ -158,6 +158,12 @@
 admin_password = {{ admin_password }}
 {% endif -%}
 
+{% if neutron_plugin and neutron_plugin == 'midonet' -%}
+[neutron]
+service_metadata_proxy = True
+metadata_proxy_shared_secret = {{ shared_secret }}
+{% endif -%}
+
 [osapi_v3]
 enabled=True
 
 
=== modified file 'templates/kilo/nova.conf'
--- templates/kilo/nova.conf	2015-09-17 20:15:37 +0000
+++ templates/kilo/nova.conf	2015-10-07 15:52:42 +0000
@@ -53,7 +53,7 @@
 rbd_secret_uuid = {{ rbd_secret_uuid }}
 {% endif -%}
 
-{% if neutron_plugin and neutron_plugin == 'ovs' -%}
+{% if neutron_plugin and neutron_plugin in ('ovs', 'midonet') -%}
 libvirt_vif_driver = nova.virt.libvirt.vif.LibvirtGenericVIFDriver
 libvirt_user_virtio_for_bridges =  True
 {% if neutron_security_groups -%}
@@ -143,6 +143,10 @@
 admin_username = {{ admin_user }}
 admin_password = {{ admin_password }}
 admin_auth_url = {{ auth_protocol }}://{{ auth_host }}:{{ auth_port }}/v2.0
+{% if neutron_plugin and neutron_plugin == 'midonet' -%}
+service_metadata_proxy = True
+metadata_proxy_shared_secret = {{ shared_secret }}
+{% endif -%}
 {% endif -%}
 {% endif -%}
 
 
=== modified file 'tests/charmhelpers/contrib/openstack/amulet/utils.py'
--- tests/charmhelpers/contrib/openstack/amulet/utils.py	2015-09-22 02:07:16 +0000
+++ tests/charmhelpers/contrib/openstack/amulet/utils.py	2015-10-07 15:52:42 +0000
@@ -752,7 +752,7 @@
             self.log.debug('SSL is enabled  @{}:{} '
                            '({})'.format(host, port, unit_name))
             return True
-        elif not port and not conf_ssl:
+        elif not conf_ssl:
             self.log.debug('SSL not enabled @{}:{} '
                            '({})'.format(host, port, unit_name))
             return False