Merge lp:~james-page/charms/trusty/neutron-gateway/xenial into lp:~openstack-charmers-archive/charms/trusty/neutron-gateway/next

Proposed by James Page on 2016-02-12
Status: Merged
Merged at revision: 164
Proposed branch: lp:~james-page/charms/trusty/neutron-gateway/xenial
Merge into: lp:~openstack-charmers-archive/charms/trusty/neutron-gateway/next
Diff against target: 94 lines (+61/-10)
2 files modified
templates/mitaka/nova.conf (+34/-0)
tests/basic_deployment.py (+27/-10)
To merge this branch: bzr merge lp:~james-page/charms/trusty/neutron-gateway/xenial
Reviewer Review Type Date Requested Status
David Ames 2016-02-12 Approve on 2016-02-17
Ryan Beisner (community) Approve on 2016-02-17
Review via email: mp+285862@code.launchpad.net
To post a comment you must log in.

charm_lint_check #375 neutron-gateway-next for james-page mp285862
    LINT OK: passed

Build: http://10.245.162.36:8080/job/charm_lint_check/375/

charm_unit_test #298 neutron-gateway-next for james-page mp285862
    UNIT OK: passed

Build: http://10.245.162.36:8080/job/charm_unit_test/298/

charm_amulet_test #149 neutron-gateway-next for james-page mp285862
    AMULET FAIL: amulet-test failed

AMULET Results (max last 2 lines):
2016-02-12 18:43:55,513 validate_config_data DEBUG: Validating config file data (fwaas in /etc/neutron/fwaas_driver.ini on neutron-gateway/0)...
ERROR:root:Make target returned non-zero.

Full amulet test output: http://paste.ubuntu.com/15027737/
Build: http://10.245.162.36:8080/job/charm_amulet_test/149/

David Ames (thedac) wrote :

This one also seems legit. I could not root cause it yet.

review: Needs Fixing
166. By James Page on 2016-02-17

Drop ec2 and objectstore checks for now

charm_lint_check #727 neutron-gateway-next for james-page mp285862
    LINT OK: passed

Build: http://10.245.162.36:8080/job/charm_lint_check/727/

charm_unit_test #634 neutron-gateway-next for james-page mp285862
    UNIT OK: passed

Build: http://10.245.162.36:8080/job/charm_unit_test/634/

167. By James Page on 2016-02-17

Fixup checks for neutron section in nova.conf

charm_lint_check #730 neutron-gateway-next for james-page mp285862
    LINT OK: passed

Build: http://10.245.162.36:8080/job/charm_lint_check/730/

charm_unit_test #637 neutron-gateway-next for james-page mp285862
    UNIT OK: passed

Build: http://10.245.162.36:8080/job/charm_unit_test/637/

168. By James Page on 2016-02-17

Fixup endpoint checks

charm_lint_check #744 neutron-gateway-next for james-page mp285862
    LINT OK: passed

Build: http://10.245.162.36:8080/job/charm_lint_check/744/

charm_unit_test #650 neutron-gateway-next for james-page mp285862
    UNIT OK: passed

Build: http://10.245.162.36:8080/job/charm_unit_test/650/

charm_amulet_test #281 neutron-gateway-next for james-page mp285862
    AMULET FAIL: amulet-test failed

AMULET Results (max last 2 lines):
2016-02-17 12:28:15,418 _validate_dict_data DEBUG: expected: {'quantum_port': '9696', 'auth_port': '35357', 'auth_protocol': 'http', 'keystone_host': <bound method OpenStackAmuletUtils.valid_ip of <charmhelpers.contrib.openstack.amulet.utils.OpenStackAmuletUtils object at 0x2b9bdd05d590>>, 'auth_host': <bound method OpenStackAmuletUtils.valid_ip of <charmhelpers.contrib.openstack.amulet.utils.OpenStackAmuletUtils object at 0x2b9bdd05d590>>, 'service_username': 'nova', 'service_tenant_name': 'services', 'service_protocol': 'http', 'service_tenant': 'services', 'quantum_url': <bound method OpenStackAmuletUtils.valid_url of <charmhelpers.contrib.openstack.amulet.utils.OpenStackAmuletUtils object at 0x2b9bdd05d590>>, 'service_password': <bound method OpenStackAmuletUtils.not_null of <charmhelpers.contrib.openstack.amulet.utils.OpenStackAmuletUtils object at 0x2b9bdd05d590>>, 'service_port': '5000', 'region': 'RegionOne', 'quantum_host': <bound method OpenStackAmuletUtils.valid_ip of <charmhelpers.contrib.openstack.amulet.utils.OpenStackAmuletUtils object at 0x2b9bdd05d590>>, 'private-address': <bound method OpenStackAmuletUtils.valid_ip of <charmhelpers.contrib.openstack.amulet.utils.OpenStackAmuletUtils object at 0x2b9bdd05d590>>, 'quantum_plugin': 'ovs'}
ERROR:root:Make target returned non-zero.

Full amulet test output: http://paste.ubuntu.com/15099836/
Build: http://10.245.162.36:8080/job/charm_amulet_test/281/

charm_amulet_test #284 neutron-gateway-next for james-page mp285862
    AMULET FAIL: amulet-test failed

AMULET Results (max last 2 lines):
juju-test.conductor.019-basic-trusty-mitaka DEBUG : Got exit code: 1
ERROR:root:Make target returned non-zero.

Full amulet test output: http://paste.ubuntu.com/15099927/
Build: http://10.245.162.36:8080/job/charm_amulet_test/284/

charm_amulet_test #297 neutron-gateway-next for james-page mp285862
    AMULET OK: passed

Build: http://10.245.162.36:8080/job/charm_amulet_test/297/

Ryan Beisner (1chb1n) :
review: Approve
David Ames (thedac) wrote :

LGTM, merging.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== added directory 'templates/mitaka'
2=== added file 'templates/mitaka/nova.conf'
3--- templates/mitaka/nova.conf 1970-01-01 00:00:00 +0000
4+++ templates/mitaka/nova.conf 2016-02-17 11:43:41 +0000
5@@ -0,0 +1,34 @@
6+# mitaka
7+###############################################################################
8+# [ WARNING ]
9+# Configuration file maintained by Juju. Local changes may be overwritten.
10+###############################################################################
11+[DEFAULT]
12+logdir=/var/log/nova
13+state_path=/var/lib/nova
14+root_helper=sudo nova-rootwrap /etc/nova/rootwrap.conf
15+verbose= {{ verbose }}
16+use_syslog = {{ use_syslog }}
17+api_paste_config=/etc/nova/api-paste.ini
18+enabled_apis=metadata
19+multi_host=True
20+# Access to neutron API services
21+network_api_class=nova.network.neutronv2.api.API
22+
23+{% include "section-zeromq" %}
24+
25+[neutron]
26+url={{ quantum_url }}
27+auth_plugin=password
28+project_name={{ service_tenant }}
29+username={{ service_username }}
30+password={{ service_password }}
31+auth_url={{ service_protocol }}://{{ keystone_host }}:{{ service_port }}
32+region={{ region }}
33+service_metadata_proxy=True
34+metadata_proxy_shared_secret={{ shared_secret }}
35+
36+{% include "section-rabbitmq-oslo" %}
37+
38+[oslo_concurrency]
39+lock_path=/var/lock/nova
40
41=== modified file 'tests/basic_deployment.py'
42--- tests/basic_deployment.py 2016-01-22 04:29:30 +0000
43+++ tests/basic_deployment.py 2016-02-17 11:43:41 +0000
44@@ -193,6 +193,10 @@
45 'nova-scheduler',
46 'nova-conductor']
47
48+ if self._get_openstack_release_string() >= 'liberty':
49+ nova_cc_services.remove('nova-api-ec2')
50+ nova_cc_services.remove('nova-objectstore')
51+
52 commands = {
53 self.mysql_sentry: ['mysql'],
54 self.keystone_sentry: ['keystone'],
55@@ -874,16 +878,29 @@
56 expected['oslo_concurrency'] = {
57 'lock_path': '/var/lock/nova'
58 }
59- expected['neutron'] = {
60- 'auth_strategy': 'keystone',
61- 'url': nova_cc_relation['quantum_url'],
62- 'admin_tenant_name': 'services',
63- 'admin_username': 'nova',
64- 'admin_password': nova_cc_relation['service_password'],
65- 'admin_auth_url': ep,
66- 'service_metadata_proxy': 'True',
67- 'metadata_proxy_shared_secret': u.not_null
68- }
69+ if self._get_openstack_release() >= self.trusty_mitaka:
70+ expected['neutron'] = {
71+ 'url': nova_cc_relation['quantum_url'],
72+ 'auth_plugin': 'password',
73+ 'project_name': 'services',
74+ 'username': 'nova',
75+ 'password': nova_cc_relation['service_password'],
76+ 'auth_url': ep.split('/v')[0],
77+ 'region': 'RegionOne',
78+ 'service_metadata_proxy': 'True',
79+ 'metadata_proxy_shared_secret': u.not_null
80+ }
81+ else:
82+ expected['neutron'] = {
83+ 'auth_strategy': 'keystone',
84+ 'url': nova_cc_relation['quantum_url'],
85+ 'admin_tenant_name': 'services',
86+ 'admin_username': 'nova',
87+ 'admin_password': nova_cc_relation['service_password'],
88+ 'admin_auth_url': ep,
89+ 'service_metadata_proxy': 'True',
90+ 'metadata_proxy_shared_secret': u.not_null
91+ }
92 else:
93 # Juno or earlier
94 expected['DEFAULT'].update({

Subscribers

People subscribed via source and target branches