Merge lp:~james-page/charms/trusty/quantum-gateway/kilo-support into lp:~openstack-charmers/charms/trusty/quantum-gateway/next

[James Page]

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

charm_unit_test #954 quantum-gateway-next for james-page mp247105
    UNIT OK: passed

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

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

charm_lint_check #925 quantum-gateway-next for james-page mp247105
    LINT FAIL: lint-test failed

LINT Results (max last 2 lines):
  hooks/quantum_utils.py:170:80: E501 line too long (80 > 79 characters)
  make: *** [lint] Error 1

Full lint test output: http://paste.ubuntu.com/9803678/
Build: http://10.245.162.77:8080/job/charm_lint_check/925/

[lp:~james-page/charms/trusty/quantum-gateway/kilo-support]

83. By James Page on 2015-01-21

Fixup lint

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

charm_amulet_test #1147 quantum-gateway-next for james-page mp247105
    AMULET OK: passed

Build: http://10.245.162.77:8080/job/charm_amulet_test/1147/

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

charm_lint_check #928 quantum-gateway-next for james-page mp247105
    LINT OK: passed

Build: http://10.245.162.77:8080/job/charm_lint_check/928/

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

charm_unit_test #957 quantum-gateway-next for james-page mp247105
    UNIT OK: passed

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

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

charm_amulet_test #1150 quantum-gateway-next for james-page mp247105
    AMULET OK: passed

Build: http://10.245.162.77:8080/job/charm_amulet_test/1150/

[lp:~james-page/charms/trusty/quantum-gateway/kilo-support]

84. By James Page on 2015-01-21

Add nova template for kilo

85. By James Page on 2015-01-21

Move options around a bit

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

charm_lint_check #933 quantum-gateway-next for james-page mp247105
    LINT OK: passed

Build: http://10.245.162.77:8080/job/charm_lint_check/933/

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

charm_unit_test #962 quantum-gateway-next for james-page mp247105
    UNIT OK: passed

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

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

charm_amulet_test #1155 quantum-gateway-next for james-page mp247105
    AMULET OK: passed

Build: http://10.245.162.77:8080/job/charm_amulet_test/1155/

[Liam Young (gnuoy)]

approve

review: Approve

=== modified file 'hooks/quantum_utils.py'
--- hooks/quantum_utils.py	2015-01-09 14:35:59 +0000
+++ hooks/quantum_utils.py	2015-01-21 12:15:21 +0000
@@ -163,14 +163,17 @@
     '''Return a list of packages for install based on the configured plugin'''
     plugin = remap_plugin(config('plugin'))
     packages = deepcopy(GATEWAY_PKGS[networking_name()][plugin])
-    if (get_os_codename_install_source(config('openstack-origin'))
-            >= 'icehouse' and plugin == 'ovs'
-            and lsb_release()['DISTRIB_CODENAME'] < 'utopic'):
-        # NOTE(jamespage) neutron-vpn-agent supercedes l3-agent for icehouse
-        # but openswan was removed in utopic.
-        packages.remove('neutron-l3-agent')
-        packages.append('neutron-vpn-agent')
-        packages.append('openswan')
+    source = get_os_codename_install_source(config('openstack-origin'))
+    if plugin == 'ovs':
+        if (source >= 'icehouse' and
+                lsb_release()['DISTRIB_CODENAME'] < 'utopic'):
+            # NOTE(jamespage) neutron-vpn-agent supercedes l3-agent for
+            # icehouse but openswan was removed in utopic.
+            packages.remove('neutron-l3-agent')
+            packages.append('neutron-vpn-agent')
+            packages.append('openswan')
+        if source >= 'kilo':
+            packages.append('python-neutron-fwaas')
     return packages
 
 

=== added directory 'templates/kilo'
=== added file 'templates/kilo/fwaas_driver.ini'
--- templates/kilo/fwaas_driver.ini	1970-01-01 00:00:00 +0000
+++ templates/kilo/fwaas_driver.ini	2015-01-21 12:15:21 +0000
@@ -0,0 +1,7 @@
+###############################################################################
+# [ WARNING ]
+# Configuration file maintained by Juju. Local changes may be overwritten.
+###############################################################################
+[fwaas]
+driver = neutron_fwaas.services.firewall.drivers.linux.iptables_fwaas.IptablesFwaasDriver
+enabled = True

=== added file 'templates/kilo/lbaas_agent.ini'
--- templates/kilo/lbaas_agent.ini	1970-01-01 00:00:00 +0000
+++ templates/kilo/lbaas_agent.ini	2015-01-21 12:15:21 +0000
@@ -0,0 +1,8 @@
+[DEFAULT]
+periodic_interval = 10
+interface_driver = neutron.agent.linux.interface.OVSInterfaceDriver
+ovs_use_veth = False
+device_driver = neutron_lbaas.services.loadbalancer.drivers.haproxy.namespace_driver.HaproxyNSDriver
+[haproxy]
+loadbalancer_state_path = $state_path/lbaas
+user_group = nogroup

=== added file 'templates/kilo/nova.conf'
--- templates/kilo/nova.conf	1970-01-01 00:00:00 +0000
+++ templates/kilo/nova.conf	2015-01-21 12:15:21 +0000
@@ -0,0 +1,29 @@
+# kilo
+###############################################################################
+# [ WARNING ]
+# Configuration file maintained by Juju. Local changes may be overwritten.
+###############################################################################
+[DEFAULT]
+logdir=/var/log/nova
+state_path=/var/lib/nova
+lock_path=/var/lock/nova
+root_helper=sudo nova-rootwrap /etc/nova/rootwrap.conf
+verbose= {{ verbose }}
+use_syslog = {{ use_syslog }}
+api_paste_config=/etc/nova/api-paste.ini
+enabled_apis=metadata
+multi_host=True
+{% include "parts/database" %}
+# Access to message bus
+{% include "parts/rabbitmq" %}
+# Access to neutron API services
+network_api_class=nova.network.neutronv2.api.API
+[neutron]
+auth_strategy=keystone
+url={{ quantum_url }}
+admin_tenant_name={{ service_tenant }}
+admin_username={{ service_username }}
+admin_password={{ service_password }}
+admin_auth_url={{ service_protocol }}://{{ keystone_host }}:{{ service_port }}/v2.0
+service_metadata_proxy=True
+metadata_proxy_shared_secret={{ shared_secret }}

=== added file 'templates/kilo/vpn_agent.ini'
--- templates/kilo/vpn_agent.ini	1970-01-01 00:00:00 +0000
+++ templates/kilo/vpn_agent.ini	2015-01-21 12:15:21 +0000
@@ -0,0 +1,8 @@
+###############################################################################
+# [ WARNING ]
+# Configuration file maintained by Juju. Local changes may be overwritten.
+###############################################################################
+[vpnagent]
+vpn_device_driver=neutron_vpnaas.services.vpn.device_drivers.ipsec.OpenSwanDriver
+[ipsec]
+ipsec_status_check_interval=60

=== modified file 'unit_tests/test_quantum_utils.py'
--- unit_tests/test_quantum_utils.py	2014-11-24 09:34:05 +0000
+++ unit_tests/test_quantum_utils.py	2015-01-21 12:15:21 +0000
@@ -132,6 +132,11 @@
         self.assertTrue('neutron-vpn-agent' in quantum_utils.get_packages())
         self.assertFalse('neutron-l3-agent' in quantum_utils.get_packages())
 
+    def test_get_packages_ovs_kilo(self):
+        self.config.return_value = 'ovs'
+        self.get_os_codename_install_source.return_value = 'kilo'
+        self.assertTrue('python-neutron-fwaas' in quantum_utils.get_packages())
+
     def test_configure_ovs_starts_service_if_required(self):
         self.config.return_value = 'ovs'
         self.service_running.return_value = False