Merge lp:~james-page/charms/trusty/neutron-api/mitaka-b2 into lp:~openstack-charmers-archive/charms/trusty/neutron-api/next

[James Page]

[lp:~james-page/charms/trusty/neutron-api/mitaka-b2]

179. By James Page on 2016-02-24

Switch test as well

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

charm_lint_check #1377 neutron-api-next for james-page mp287028
    LINT OK: passed

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

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

charm_unit_test #1135 neutron-api-next for james-page mp287028
    UNIT OK: passed

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

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

charm_amulet_test #488 neutron-api-next for james-page mp287028
    AMULET FAIL: amulet-test failed

AMULET Results (max last 2 lines):
make: *** [functional_test] Error 1
ERROR:root:Make target returned non-zero.

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

[lp:~james-page/charms/trusty/neutron-api/mitaka-b2]

180. By James Page on 2016-02-25

Drop ec2 and objectstore tests - not pertinent to neutron-api and removed as of liberty

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

charm_lint_check #1466 neutron-api-next for james-page mp287028
    LINT OK: passed

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

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

charm_unit_test #1221 neutron-api-next for james-page mp287028
    UNIT OK: passed

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

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

charm_amulet_test #521 neutron-api-next for james-page mp287028
    AMULET FAIL: amulet-test failed

AMULET Results (max last 2 lines):
make: *** [functional_test] Error 1
ERROR:root:Make target returned non-zero.

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

[lp:~james-page/charms/trusty/neutron-api/mitaka-b2]

181. By James Page on 2016-02-25

Fixup relation data key

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

charm_lint_check #1468 neutron-api-next for james-page mp287028
    LINT OK: passed

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

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

charm_unit_test #1223 neutron-api-next for james-page mp287028
    UNIT OK: passed

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

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

charm_amulet_test #523 neutron-api-next for james-page mp287028
    AMULET FAIL: amulet-test failed

AMULET Results (max last 2 lines):
make: *** [functional_test] Error 1
ERROR:root:Make target returned non-zero.

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

=== modified file 'templates/mitaka/neutron.conf'
--- templates/mitaka/neutron.conf	2016-01-21 05:54:06 +0000
+++ templates/mitaka/neutron.conf	2016-02-25 11:25:47 +0000
@@ -71,8 +71,8 @@
 auth_url = {{ auth_protocol }}://{{ auth_host }}:{{ auth_port }}/v2.0
 username = {{ admin_user }}
 password = {{ admin_password }}
-tenant_id = {{ admin_tenant_id }}
-{% endif -%}
+project_name = {{ admin_tenant_name }}
+{% endif %}
 
 [quotas]
 {% if quota_driver -%}

=== modified file 'tests/basic_deployment.py'
--- tests/basic_deployment.py	2016-01-22 03:50:29 +0000
+++ tests/basic_deployment.py	2016-02-25 11:25:47 +0000
@@ -190,9 +190,7 @@
             # Juno or earlier
             neutron_services.append('neutron-metering-agent')
 
-        nova_cc_services = ['nova-api-ec2',
-                            'nova-api-os-compute',
-                            'nova-objectstore',
+        nova_cc_services = ['nova-api-os-compute',
                             'nova-cert',
                             'nova-scheduler',
                             'nova-conductor']
@@ -446,7 +444,7 @@
                 'region_name': 'RegionOne',
                 'username': rel_napi_ks['service_username'],
                 'password': rel_napi_ks['service_password'],
-                'tenant_id': rel_napi_ks['service_tenant_id'],
+                'project_name': rel_napi_ks['service_tenant'],
             }
         else:
             # Liberty or earlier - nova bits