Juju Charms Collection
quantum-gateway package

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

  1. Trusty Tahr (14.04)
  2. kilo-support
  3. Merge into next
Proposed by James Page
Status: Merged
Merged at revision: 82
Proposed branch: lp:~james-page/charms/trusty/quantum-gateway/kilo-support
Merge into: lp:~openstack-charmers/charms/trusty/quantum-gateway/next
Diff against target: 118 lines (+68/-8)
6 files modified
hooks/quantum_utils.py (+11/-8)
templates/kilo/fwaas_driver.ini (+7/-0)
templates/kilo/lbaas_agent.ini (+8/-0)
templates/kilo/nova.conf (+29/-0)
templates/kilo/vpn_agent.ini (+8/-0)
unit_tests/test_quantum_utils.py (+5/-0)
To merge this branch: bzr merge lp:~james-page/charms/trusty/quantum-gateway/kilo-support
Reviewer Review Type Date Requested Status
Liam Young (community) Approve
Review via email: mp+247105@code.launchpad.net
To post a comment you must log in.
Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

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/

Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

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 updated
83. By James Page

Fixup lint

Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

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/

Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

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/

Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

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/

Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

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 updated
84. By James Page

Add nova template for kilo

85. By James Page

Move options around a bit

Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

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/

Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

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/

Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

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/

Revision history for this message
Liam Young (gnuoy) wrote :

approve

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== 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 @@
163 '''Return a list of packages for install based on the configured plugin'''163 '''Return a list of packages for install based on the configured plugin'''
164 plugin = remap_plugin(config('plugin'))164 plugin = remap_plugin(config('plugin'))
165 packages = deepcopy(GATEWAY_PKGS[networking_name()][plugin])165 packages = deepcopy(GATEWAY_PKGS[networking_name()][plugin])
166 if (get_os_codename_install_source(config('openstack-origin'))166 source = get_os_codename_install_source(config('openstack-origin'))
167 >= 'icehouse' and plugin == 'ovs'167 if plugin == 'ovs':
168 and lsb_release()['DISTRIB_CODENAME'] < 'utopic'):168 if (source >= 'icehouse' and
169 # NOTE(jamespage) neutron-vpn-agent supercedes l3-agent for icehouse169 lsb_release()['DISTRIB_CODENAME'] < 'utopic'):
170 # but openswan was removed in utopic.170 # NOTE(jamespage) neutron-vpn-agent supercedes l3-agent for
171 packages.remove('neutron-l3-agent')171 # icehouse but openswan was removed in utopic.
172 packages.append('neutron-vpn-agent')172 packages.remove('neutron-l3-agent')
173 packages.append('openswan')173 packages.append('neutron-vpn-agent')
174 packages.append('openswan')
175 if source >= 'kilo':
176 packages.append('python-neutron-fwaas')
174 return packages177 return packages
175178
176179
177180
=== 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 @@
1###############################################################################
2# [ WARNING ]
3# Configuration file maintained by Juju. Local changes may be overwritten.
4###############################################################################
5[fwaas]
6driver = neutron_fwaas.services.firewall.drivers.linux.iptables_fwaas.IptablesFwaasDriver
7enabled = True
08
=== 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 @@
1[DEFAULT]
2periodic_interval = 10
3interface_driver = neutron.agent.linux.interface.OVSInterfaceDriver
4ovs_use_veth = False
5device_driver = neutron_lbaas.services.loadbalancer.drivers.haproxy.namespace_driver.HaproxyNSDriver
6[haproxy]
7loadbalancer_state_path = $state_path/lbaas
8user_group = nogroup
09
=== 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 @@
1# kilo
2###############################################################################
3# [ WARNING ]
4# Configuration file maintained by Juju. Local changes may be overwritten.
5###############################################################################
6[DEFAULT]
7logdir=/var/log/nova
8state_path=/var/lib/nova
9lock_path=/var/lock/nova
10root_helper=sudo nova-rootwrap /etc/nova/rootwrap.conf
11verbose= {{ verbose }}
12use_syslog = {{ use_syslog }}
13api_paste_config=/etc/nova/api-paste.ini
14enabled_apis=metadata
15multi_host=True
16{% include "parts/database" %}
17# Access to message bus
18{% include "parts/rabbitmq" %}
19# Access to neutron API services
20network_api_class=nova.network.neutronv2.api.API
21[neutron]
22auth_strategy=keystone
23url={{ quantum_url }}
24admin_tenant_name={{ service_tenant }}
25admin_username={{ service_username }}
26admin_password={{ service_password }}
27admin_auth_url={{ service_protocol }}://{{ keystone_host }}:{{ service_port }}/v2.0
28service_metadata_proxy=True
29metadata_proxy_shared_secret={{ shared_secret }}
030
=== 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 @@
1###############################################################################
2# [ WARNING ]
3# Configuration file maintained by Juju. Local changes may be overwritten.
4###############################################################################
5[vpnagent]
6vpn_device_driver=neutron_vpnaas.services.vpn.device_drivers.ipsec.OpenSwanDriver
7[ipsec]
8ipsec_status_check_interval=60
09
=== 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 @@
132 self.assertTrue('neutron-vpn-agent' in quantum_utils.get_packages())132 self.assertTrue('neutron-vpn-agent' in quantum_utils.get_packages())
133 self.assertFalse('neutron-l3-agent' in quantum_utils.get_packages())133 self.assertFalse('neutron-l3-agent' in quantum_utils.get_packages())
134134
135 def test_get_packages_ovs_kilo(self):
136 self.config.return_value = 'ovs'
137 self.get_os_codename_install_source.return_value = 'kilo'
138 self.assertTrue('python-neutron-fwaas' in quantum_utils.get_packages())
139
135 def test_configure_ovs_starts_service_if_required(self):140 def test_configure_ovs_starts_service_if_required(self):
136 self.config.return_value = 'ovs'141 self.config.return_value = 'ovs'
137 self.service_running.return_value = False142 self.service_running.return_value = False

Subscribers

People subscribed via source and target branches