Juju Charms Collection
neutron-api package

Merge lp://qastaging/~jasper-aikema/charms/trusty/neutron-api/fix-connection-with-postgresql-in-neutron_plugin_attribute into lp://qastaging/~openstack-charmers-archive/charms/trusty/neutron-api/trunk

Trusty Tahr (14.04)
fix-connection-with-postgresql-in-neutron_plugin_attribute
Merge into trunk

Proposed by Jasper Aikema on 2014-12-02

Status:

Merged

Merged at revision:

Proposed branch:

lp://qastaging/~jasper-aikema/charms/trusty/neutron-api/fix-connection-with-postgresql-in-neutron_plugin_attribute

Merge into:

lp://qastaging/~openstack-charmers-archive/charms/trusty/neutron-api/trunk

Diff against target:

14 lines (+2/-2)

1 file modified

hooks/neutron_api_hooks.py (+2/-2)

To merge this branch:

bzr merge lp://qastaging/~jasper-aikema/charms/trusty/neutron-api/fix-connection-with-postgresql-in-neutron_plugin_attribute

High

Fix Released

Link a bug report

Reviewer	Date Requested	Status
Liam Young (community)	2014-12-02	Approve on 2015-02-13
Jasper Aikema (community)		Needs Resubmitting on 2014-12-10
Review via email: mp+243462@code.qastaging.launchpad.net

Description of the change

The 'pgsql-db-relation-changed' hook returns an error on first (and every) time it runs.

This is because of this line :
CONFIGS.write(neutron_plugin_attribute(plugin, 'config'))

The script will run the 'neutron_plugin_attribute' command in 'hooks/charmhelpers/contrib/openstack/neutron.py'. This will run the command 'network_manager'. And that will run the command config('network-manager').lower().
This will break because there is no config option network-manager.

This is fixed in neutron_api_utils with an extra option 'neutron'.
I will add a merge request for this bug.

Revision history for this message

uosci-testing-bot (uosci-testing-bot) wrote on 2014-12-03:

UOSCI bot says:
charm_lint_check #1308 trusty-neutron-api for jasper-aikema mp243462
LINT OK: passed

LINT Results (max last 5 lines):
  I: config.yaml: option ssl_ca has no default value
  I: config.yaml: option ssl_cert has no default value
  I: config.yaml: option os-internal-network has no default value
  I: config.yaml: option os-public-network has no default value
  I: config.yaml: option nsx-tz-uuid has no default value

Full lint test output: http://paste.ubuntu.com/9351209/
Build: http://10.98.191.181:8080/job/charm_lint_check/1308/

Revision history for this message

uosci-testing-bot (uosci-testing-bot) wrote on 2014-12-03:

UOSCI bot says:
charm_unit_test #1142 trusty-neutron-api for jasper-aikema mp243462
UNIT OK: passed

UNIT Results (max last 5 lines):
  hooks/neutron_api_hooks 174 14 92% 115-116, 161, 224, 268, 287-298, 373-374
  hooks/neutron_api_utils 90 7 92% 215-227
  TOTAL 344 27 92%
  Ran 49 tests in 2.917s
  OK

Full unit test output: http://paste.ubuntu.com/9351210/
Build: http://10.98.191.181:8080/job/charm_unit_test/1142/

Revision history for this message

uosci-testing-bot (uosci-testing-bot) wrote on 2014-12-03:

UOSCI bot says:
charm_amulet_test #574 trusty-neutron-api for jasper-aikema mp243462
AMULET FAIL: amulet-test missing

AMULET Results (max last 5 lines):
INFO:root:Workspace dir: /var/lib/jenkins/workspace/charm_amulet_test
INFO:root:Reading file: Makefile
INFO:root:Searching for: ['@juju test']
INFO:root:Search string not found in makefile target commands.
ERROR:root:No make target was executed.

Full amulet test output: http://paste.ubuntu.com/9351278/
Build: http://10.98.191.181:8080/job/charm_amulet_test/574/