Merge lp:~james-page/charms/trusty/neutron-api-odl/kilo-support into lp:~openstack-charmers/charms/trusty/neutron-api-odl/vpp

[James Page]

[lp:~james-page/charms/trusty/neutron-api-odl/kilo-support]

10. By James Page on 2015-07-16

Drop backports PPA, networking-odl now in cloud-archive

11. By James Page on 2015-07-20

Add extra type drivers for kilo

12. By James Page on 2015-07-20

Tidy templates

[Liam Young (gnuoy)]

Approve

review: Approve

[Liam Young (gnuoy)]

FYI Tested with cisco-vpp deploy

=== modified file 'config.yaml'
--- config.yaml	2015-06-24 12:44:33 +0000
+++ config.yaml	2015-07-20 10:51:26 +0000
@@ -1,18 +1,4 @@
 options:
-  use-syslog:
-    type: boolean
-    default: False
-    description: |
-      By default, all services will log into their corresponding log files.
-      Setting this to True will force all services to log to the syslog.
-  debug:
-    default: False
-    type: boolean
-    description: Enable debug logging
-  verbose:
-    default: False
-    type: boolean
-    description: Enable verbose logging
   vlan-ranges:
     type: string
     default: "physnet1:1000:2000"
@@ -29,3 +15,7 @@
         vxlan
       .
       Multiple types can be provided - field is space delimited.
+  security-groups:
+    default: false
+    type: boolean
+    description: Enable OpenDayLight managed security groups.

=== modified file 'hooks/odl_data.py'
--- hooks/odl_data.py	2015-06-30 15:30:27 +0000
+++ hooks/odl_data.py	2015-07-20 10:51:26 +0000
@@ -70,26 +70,9 @@
         # first nodes private-address
         self['odl_ip'] = first_contoller.get('private-address')
         self['odl_port'] = first_contoller.get('port')
-        # ODL passing wrong port atm
-        self['odl_port'] = '8181'
         self['odl_username'] = first_contoller.get('username')
         self['odl_password'] = first_contoller.get('password')
 
-    def provide_data(self):
-        odl_cmds = {
-            'feature:install': [
-                'cosc-cvpn-ovs-rest',
-                'odl-netconf-connector-all'
-            ],
-            'log:set': {
-                'TRACE': ['cosc-cvpn-ovs-rest', 'odl-netconf-connector-all'],
-            }
-        }
-        relation_info = {
-            'odl-cmds': json.dump(odl_cmds)
-        }
-        return relation_info
-
     def is_ready(self):
         if 'password' in self.get_first_data():
             return True
@@ -99,9 +82,9 @@
 
 class ConfigTranslation(dict):
     def __init__(self):
-        self['use_syslog'] = config('use-syslog')
         self['vlan_ranges'] = config('vlan-ranges')
         self['overlay_network_type'] = self.get_overlay_network_type()
+        self['security_groups'] = config('security-groups')
 
     def get_overlay_network_type(self):
         overlay_networks = config('overlay-network-type').split()

=== modified file 'hooks/odl_utils.py'
--- hooks/odl_utils.py	2015-06-24 12:44:33 +0000
+++ hooks/odl_utils.py	2015-07-20 10:51:26 +0000
@@ -1,13 +1,10 @@
-from charmhelpers.core.hookenv import(
-    INFO,
-    config,
-    log,
-)
 from charmhelpers.fetch import (
     apt_install,
     filter_installed_packages,
 )
 
+from charmhelpers.contrib.openstack.utils import os_release
+
 NEUTRON_CONF_DIR = "/etc/neutron"
 NEUTRON_CONF = '%s/neutron.conf' % NEUTRON_CONF_DIR
 ML2_CONF = '%s/plugins/ml2/ml2_conf.ini' % NEUTRON_CONF_DIR
@@ -23,6 +20,8 @@
 
 def install_packages(servicename):
     pkgs = filter_installed_packages(determine_packages())
+    if os_release('neutron-common') >= 'kilo':
+        pkgs.extend(['python-networking-odl'])
     apt_install(pkgs)
 
 

=== removed directory 'templates/icehouse'
=== removed file 'templates/icehouse/neutron.conf'
--- templates/icehouse/neutron.conf	2015-06-24 12:22:08 +0000
+++ templates/icehouse/neutron.conf	1970-01-01 00:00:00 +0000
@@ -1,40 +0,0 @@
-# icehouse
-###############################################################################
-# [ WARNING ]
-# Configuration file maintained by Juju. Local changes may be overwritten.
-# Config managed by neutron-openvswitch charm
-###############################################################################
-[DEFAULT]
-verbose = {{ verbose }}
-debug = {{ debug }}
-use_syslog = {{ use_syslog }}
-state_path = /var/lib/neutron
-lock_path = $state_path/lock
-bind_host = 0.0.0.0
-bind_port = 9696
-{% if network_device_mtu -%}
-network_device_mtu = {{ network_device_mtu }}
-{% endif -%}
-{% if core_plugin -%}
-core_plugin =  {{ core_plugin }}
-{% endif -%}
-
-api_paste_config = /etc/neutron/api-paste.ini
-auth_strategy = keystone
-{% if notifications == 'True' -%}
-notification_driver = neutron.openstack.common.notifier.rpc_notifier
-{% endif -%}
-default_notification_level = INFO
-notification_topics = notifications
-
-{% include "parts/rabbitmq" %}
-
-[QUOTAS]
-
-[DEFAULT_SERVICETYPE]
-
-[AGENT]
-root_helper = sudo neutron-rootwrap /etc/neutron/rootwrap.conf
-
-[keystone_authtoken]
-signing_dir = /var/lib/neutron/keystone-signing

=== removed directory 'templates/kilo'
=== removed file 'templates/kilo/ml2_conf.ini'
--- templates/kilo/ml2_conf.ini	2015-06-24 12:22:08 +0000
+++ templates/kilo/ml2_conf.ini	1970-01-01 00:00:00 +0000
@@ -1,41 +0,0 @@
-# kilo
-###############################################################################
-# [ WARNING ]
-# Configuration file maintained by Juju. Local changes may be overwritten.  
-###############################################################################
-[ml2]
-type_drivers = {{ overlay_network_type }}
-tenant_network_types = gre,vxlan,vlan,flat
-mechanism_drivers = opendaylight 
-
-[ml2_type_gre]
-tunnel_id_ranges = 1:1000
-
-[ml2_type_vxlan]
-vni_ranges = 1001:2000
-
-[ml2_odl]
-username = {{ odl_username }}
-password = {{ odl_password }}
-url = http://{{ odl_ip }}:{{ odl_port }}/controller/nb/v2/neutron
-
-[odl]
-nodes = 
-network_vlan_ranges = {{ vlan_ranges }}
-tunnel_id_ranges = 1:1000
-tun_peer_patch_port = patch-int
-int_peer_patch_port = patch-tun
-tenant_network_type = vlan
-tunnel_bridge = br-tun
-integration_bridge = br-int
-controllers = {{ odl_ip }}:{{ odl_port }}:admin:admin
-
-[agent]
-tunnel_types = {{ overlay_network_type }}
-{% if veth_mtu -%}
-veth_mtu = {{ veth_mtu }}
-{% endif %}
-
-[securitygroup]
-firewall_driver = neutron.agent.linux.firewall.NoopFirewallDriver
-enable_security_group = False

=== removed file 'templates/kilo/neutron.conf'
--- templates/kilo/neutron.conf	2015-06-24 12:22:08 +0000
+++ templates/kilo/neutron.conf	1970-01-01 00:00:00 +0000
@@ -1,42 +0,0 @@
-# icehouse
-###############################################################################
-# [ WARNING ]
-# Configuration file maintained by Juju. Local changes may be overwritten.
-# Config managed by neutron-openvswitch charm
-###############################################################################
-[DEFAULT]
-verbose = {{ verbose }}
-debug = {{ debug }}
-use_syslog = {{ use_syslog }}
-state_path = /var/lib/neutron
-bind_host = 0.0.0.0
-bind_port = 9696
-{% if network_device_mtu -%}
-network_device_mtu = {{ network_device_mtu }}
-{% endif -%}
-{% if core_plugin -%}
-core_plugin =  {{ core_plugin }}
-{% endif -%}
-
-api_paste_config = /etc/neutron/api-paste.ini
-auth_strategy = keystone
-notification_driver = neutron.openstack.common.notifier.rpc_notifier
-default_notification_level = INFO
-notification_topics = notifications
-
-{% include "section-zeromq" %}
-
-{% include "section-rabbitmq-oslo" %}
-
-[QUOTAS]
-
-[DEFAULT_SERVICETYPE]
-
-[AGENT]
-root_helper = sudo neutron-rootwrap /etc/neutron/rootwrap.conf
-
-[keystone_authtoken]
-signing_dir = /var/lib/neutron/keystone-signing
-
-[oslo_concurrency]
-lock_path = $state_path/lock

=== renamed file 'templates/icehouse/ml2_conf.ini' => 'templates/ml2_conf.ini'
--- templates/icehouse/ml2_conf.ini	2015-06-30 15:30:27 +0000
+++ templates/ml2_conf.ini	2015-07-20 10:51:26 +0000
@@ -1,12 +1,11 @@
-# kilo
 ###############################################################################
 # [ WARNING ]
-# Configuration file maintained by Juju. Local changes may be overwritten.  
+# Configuration file maintained by Juju. Local changes may be overwritten.
 ###############################################################################
 [ml2]
-type_drivers = {{ overlay_network_type }},local,flat,vlan,gre
+type_drivers = {{ overlay_network_type }},local,flat,vlan
 tenant_network_types = {{ overlay_network_type }}
-mechanism_drivers = opendaylight 
+mechanism_drivers = opendaylight
 
 [ml2_type_flat]
 # Provider nets only
@@ -20,11 +19,14 @@
 [ml2_type_vxlan]
 vni_ranges = 1001:2000
 
-[securitygroup]
-firewall_driver = neutron.agent.linux.firewall.NoopFirewallDriver
-enable_security_group = False
-
 [ml2_odl]
-url = http://{{ odl_ip }}:{{ odl_port }}/controller/nb/v2/neutron
 username = {{ odl_username }}
 password = {{ odl_password }}
+url = http://{{ odl_ip }}:{{ odl_port }}/controller/nb/v2/neutron
+
+[securitygroup]
+{% if security_groups -%}
+enable_security_group = True
+{% else -%}
+enable_security_group = False
+{% endif -%}

=== removed file 'templates/odl_registration'
--- templates/odl_registration	2015-06-24 12:22:08 +0000
+++ templates/odl_registration	1970-01-01 00:00:00 +0000
@@ -1,29 +0,0 @@
-<module xmlns="urn:opendaylight:params:xml:ns:yang:controller:config">
-  <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:md:sal:connector:netconf">prefix:sal-netconf-connector</type>
-  <name>{{ vpp_host }}</name>
-  <address xmlns="urn:opendaylight:params:xml:ns:yang:controller:md:sal:connector:netconf">{{ vpp_ip }}</address>
-  <port xmlns="urn:opendaylight:params:xml:ns:yang:controller:md:sal:connector:netconf">2022</port>
-  <username xmlns="urn:opendaylight:params:xml:ns:yang:controller:md:sal:connector:netconf">{{ vpp_username }}</username>
-  <password xmlns="urn:opendaylight:params:xml:ns:yang:controller:md:sal:connector:netconf">{{ vpp_password }}</password>
-  <tcp-only xmlns="urn:opendaylight:params:xml:ns:yang:controller:md:sal:connector:netconf">false</tcp-only>
-  <event-executor xmlns="urn:opendaylight:params:xml:ns:yang:controller:md:sal:connector:netconf">
-    <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:netty">prefix:netty-event-executor</type>
-    <name>global-event-executor</name>
-  </event-executor>
-  <binding-registry xmlns="urn:opendaylight:params:xml:ns:yang:controller:md:sal:connector:netconf">
-    <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:md:sal:binding">prefix:binding-broker-osgi-registry</type>
-    <name>binding-osgi-broker</name>
-  </binding-registry>
-  <dom-registry xmlns="urn:opendaylight:params:xml:ns:yang:controller:md:sal:connector:netconf">
-    <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:md:sal:dom">prefix:dom-broker-osgi-registry</type>
-    <name>dom-broker</name>
-  </dom-registry>
-  <client-dispatcher xmlns="urn:opendaylight:params:xml:ns:yang:controller:md:sal:connector:netconf">
-    <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:config:netconf">prefix:netconf-client-dispatcher</type>
-    <name>global-netconf-dispatcher</name>
-  </client-dispatcher>
-  <processing-executor xmlns="urn:opendaylight:params:xml:ns:yang:controller:md:sal:connector:netconf">
-    <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:threadpool">prefix:threadpool</type>
-    <name>global-netconf-processing-executor</name>
-  </processing-executor>
-</module>

=== removed directory 'templates/parts'
=== removed file 'templates/parts/rabbitmq'
--- templates/parts/rabbitmq	2015-06-24 12:22:08 +0000
+++ templates/parts/rabbitmq	1970-01-01 00:00:00 +0000
@@ -1,21 +0,0 @@
-{% if rabbitmq_host or rabbitmq_hosts -%}
-rabbit_userid = {{ rabbitmq_user }}
-rabbit_virtual_host = {{ rabbitmq_virtual_host }}
-rabbit_password = {{ rabbitmq_password }}
-{% if rabbitmq_hosts -%}
-rabbit_hosts = {{ rabbitmq_hosts }}
-{% if rabbitmq_ha_queues -%}
-rabbit_ha_queues = True
-rabbit_durable_queues = False
-{% endif -%}
-{% else -%}
-rabbit_host = {{ rabbitmq_host }}
-{% endif -%}
-{% if rabbit_ssl_port -%}
-rabbit_use_ssl = True
-rabbit_port = {{ rabbit_ssl_port }}
-{% if rabbit_ssl_ca -%}
-kombu_ssl_ca_certs = {{ rabbit_ssl_ca }}
-{% endif -%}
-{% endif -%}
-{% endif -%}