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

[James Page]

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

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/

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

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/

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

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)]

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

review: Needs Fixing

[lp:~james-page/charms/trusty/neutron-gateway/xenial]

166. By James Page on 2016-02-17

Drop ec2 and objectstore checks for now

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

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/

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

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/

[lp:~james-page/charms/trusty/neutron-gateway/xenial]

167. By James Page on 2016-02-17

Fixup checks for neutron section in nova.conf

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

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/

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

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/

[lp:~james-page/charms/trusty/neutron-gateway/xenial]

168. By James Page on 2016-02-17

Fixup endpoint checks

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

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/

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

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/

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

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/

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

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/

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

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)]

LGTM, merging.

review: Approve

=== added directory 'templates/mitaka'
=== added file 'templates/mitaka/nova.conf'
--- templates/mitaka/nova.conf	1970-01-01 00:00:00 +0000
+++ templates/mitaka/nova.conf	2016-02-17 11:43:41 +0000
@@ -0,0 +1,34 @@
+# mitaka
+###############################################################################
+# [ WARNING ]
+# Configuration file maintained by Juju. Local changes may be overwritten.
+###############################################################################
+[DEFAULT]
+logdir=/var/log/nova
+state_path=/var/lib/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
+# Access to neutron API services
+network_api_class=nova.network.neutronv2.api.API
+
+{% include "section-zeromq" %}
+
+[neutron]
+url={{ quantum_url }}
+auth_plugin=password
+project_name={{ service_tenant }}
+username={{ service_username }}
+password={{ service_password }}
+auth_url={{ service_protocol }}://{{ keystone_host }}:{{ service_port }}
+region={{ region }}
+service_metadata_proxy=True
+metadata_proxy_shared_secret={{ shared_secret }}
+
+{% include "section-rabbitmq-oslo" %}
+
+[oslo_concurrency]
+lock_path=/var/lock/nova

=== modified file 'tests/basic_deployment.py'
--- tests/basic_deployment.py	2016-01-22 04:29:30 +0000
+++ tests/basic_deployment.py	2016-02-17 11:43:41 +0000
@@ -193,6 +193,10 @@
                             'nova-scheduler',
                             'nova-conductor']
 
+        if self._get_openstack_release_string() >= 'liberty':
+            nova_cc_services.remove('nova-api-ec2')
+            nova_cc_services.remove('nova-objectstore')
+
         commands = {
             self.mysql_sentry: ['mysql'],
             self.keystone_sentry: ['keystone'],
@@ -874,16 +878,29 @@
             expected['oslo_concurrency'] = {
                 'lock_path': '/var/lock/nova'
             }
-            expected['neutron'] = {
-                'auth_strategy': 'keystone',
-                'url': nova_cc_relation['quantum_url'],
-                'admin_tenant_name': 'services',
-                'admin_username': 'nova',
-                'admin_password': nova_cc_relation['service_password'],
-                'admin_auth_url': ep,
-                'service_metadata_proxy': 'True',
-                'metadata_proxy_shared_secret': u.not_null
-            }
+            if self._get_openstack_release() >= self.trusty_mitaka:
+                expected['neutron'] = {
+                    'url': nova_cc_relation['quantum_url'],
+                    'auth_plugin': 'password',
+                    'project_name': 'services',
+                    'username': 'nova',
+                    'password': nova_cc_relation['service_password'],
+                    'auth_url': ep.split('/v')[0],
+                    'region': 'RegionOne',
+                    'service_metadata_proxy': 'True',
+                    'metadata_proxy_shared_secret': u.not_null
+                }
+            else:
+                expected['neutron'] = {
+                    'auth_strategy': 'keystone',
+                    'url': nova_cc_relation['quantum_url'],
+                    'admin_tenant_name': 'services',
+                    'admin_username': 'nova',
+                    'admin_password': nova_cc_relation['service_password'],
+                    'admin_auth_url': ep,
+                    'service_metadata_proxy': 'True',
+                    'metadata_proxy_shared_secret': u.not_null
+                }
         else:
             # Juno or earlier
             expected['DEFAULT'].update({