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

[James Page]

python2 detection and install wrapper for wily onwards, where py2 is not installed by default.

This is really a placeholder to switch between py2 and py3 dynamically, but we need to test and update the codebase first before we can make that type of switch.

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

charm_lint_check #10429 neutron-api-next for james-page mp271917
    LINT OK: passed

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

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

charm_unit_test #9620 neutron-api-next for james-page mp271917
    UNIT OK: passed

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

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

charm_amulet_test #6572 neutron-api-next for james-page mp271917
    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/12519969/
Build: http://10.245.162.77:8080/job/charm_amulet_test/6572/

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

144. By James Page on 2015-09-22

Split out install hook instead

145. By James Page on 2015-09-22

Fixup install hook execution

146. By James Page on 2015-09-22

Exec install.real

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

charm_lint_check #10432 neutron-api-next for james-page mp271917
    LINT OK: passed

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

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

charm_unit_test #9624 neutron-api-next for james-page mp271917
    UNIT OK: passed

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

[Liam Young (gnuoy)]

Approve

review: Approve

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

charm_unit_test #9627 neutron-api-next for james-page mp271917
    UNIT OK: passed

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

[Ryan Beisner (1chb1n)]

On that ^ n-api amulet test fail, precise-icehouse timed out (45 minutes), stuck @: neutron-openvswitch/0 maintenance executing (config-changed) installing charm software;

I'm not sure if that was an infra hiccup or indicative of a real issue.

I re-triggered the test, and that run is also stuck at the same place:

00:12:56.675 2015-09-22 13:19:34 Adding relation neutron-api:neutron-plugin-api <-> neutron-openvswitch:neutron-plugin-api

http://paste.ubuntu.com/12521217/

Further testing and confirmation is recommended before landing.

review: Needs Information

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

charm_amulet_test #6575 neutron-api-next for james-page mp271917
    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/12521240/
Build: http://10.245.162.77:8080/job/charm_amulet_test/6575/

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

charm_amulet_test #6581 neutron-api-next for james-page mp271917
    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/12521600/
Build: http://10.245.162.77:8080/job/charm_amulet_test/6581/

=== modified symlink 'hooks/install' (properties changed: -x to +x)
=== target was u'neutron_api_hooks.py'
--- hooks/install	1970-01-01 00:00:00 +0000
+++ hooks/install	2015-09-22 13:00:52 +0000
@@ -0,0 +1,20 @@
+#!/bin/bash
+# Wrapper to deal with newer Ubuntu versions that don't have py2 installed
+# by default.
+
+declare -a DEPS=('apt' 'netaddr' 'netifaces' 'pip' 'yaml')
+
+check_and_install() {
+    pkg="${1}-${2}"
+    if ! dpkg -s ${pkg} 2>&1 > /dev/null; then
+        apt-get -y install ${pkg}
+    fi
+}
+
+PYTHON="python"
+
+for dep in ${DEPS[@]}; do
+    check_and_install ${PYTHON} ${dep}
+done
+
+exec ./hooks/install.real

=== added symlink 'hooks/install.real'
=== target is u'neutron_api_hooks.py'
=== modified file 'hooks/neutron_api_hooks.py'
--- hooks/neutron_api_hooks.py	2015-09-04 11:03:14 +0000
+++ hooks/neutron_api_hooks.py	2015-09-22 13:00:52 +0000
@@ -142,7 +142,7 @@
         identity_joined(rid=rid)
 
 
[e-mail]()
[e-mail]('install.real')
 def install():
     execd_preinstall()
     configure_installation_source(config('openstack-origin'))