Juju Charms Collection
nova-compute package

Merge lp:~james-page/charms/trusty/nova-compute/fixup-dvr-metadata-proxy into lp:~openstack-charmers-archive/charms/trusty/nova-compute/next

  1. Trusty Tahr (14.04)
  2. fixup-dvr-metadata-proxy
  3. Merge into next
Proposed by James Page on 2015-04-21
Status: Merged
Merged at revision: 126
Proposed branch: lp:~james-page/charms/trusty/nova-compute/fixup-dvr-metadata-proxy
Merge into: lp:~openstack-charmers-archive/charms/trusty/nova-compute/next
Diff against target: 25 lines (+4/-5)
1 file modified
templates/kilo/nova.conf (+4/-5)
To merge this branch: bzr merge lp:~james-page/charms/trusty/nova-compute/fixup-dvr-metadata-proxy
Reviewer Review Type Date Requested Status
Liam Young 2015-04-21 Approve on 2015-04-21
Review via email: mp+256902@code.launchpad.net
To post a comment you must log in.
Liam Young (gnuoy) wrote :

Approve

review: Approve
uosci-testing-bot (uosci-testing-bot) wrote :

charm_lint_check #3683 nova-compute-next for james-page mp256902
    LINT OK: passed

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

uosci-testing-bot (uosci-testing-bot) wrote :

charm_unit_test #3471 nova-compute-next for james-page mp256902
    UNIT OK: passed

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

uosci-testing-bot (uosci-testing-bot) wrote :

charm_amulet_test #3477 nova-compute-next for james-page mp256902
    AMULET FAIL: amulet-test failed

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

Full amulet test output: http://paste.ubuntu.com/10861004/
Build: http://10.245.162.77:8080/job/charm_amulet_test/3477/

uosci-testing-bot (uosci-testing-bot) wrote :

charm_amulet_test #3485 nova-compute-next for james-page mp256902
    AMULET FAIL: amulet-test failed

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

Full amulet test output: http://paste.ubuntu.com/10862313/
Build: http://10.245.162.77:8080/job/charm_amulet_test/3485/

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'templates/kilo/nova.conf'
2--- templates/kilo/nova.conf 2015-04-13 12:22:05 +0000
3+++ templates/kilo/nova.conf 2015-04-21 10:13:05 +0000
4@@ -27,11 +27,6 @@
5 libvirt_disk_prefix=vd
6 {% endif -%}
7
8-{% if metadata_shared_secret -%}
9-neutron_metadata_proxy_shared_secret = {{ metadata_shared_secret }}
10-service_neutron_metadata_proxy=True
11-{% endif -%}
12-
13 {% if console_vnc_type -%}
14 vnc_enabled = True
15 novnc_enabled = True
16@@ -121,6 +116,10 @@
17 admin_username = {{ network_manager_config.neutron_admin_username }}
18 admin_password = {{ network_manager_config.neutron_admin_password }}
19 admin_auth_url = {{ network_manager_config.auth_protocol }}://{{ network_manager_config.keystone_host }}:{{ network_manager_config.auth_port }}/v2.0
20+{% if metadata_shared_secret -%}
21+metadata_proxy_shared_secret = {{ metadata_shared_secret }}
22+service_metadata_proxy=True
23+{% endif -%}
24 {% endif -%}
25 {% endif -%}
26

Subscribers

People subscribed via source and target branches