Merge lp:~gnuoy/charms/trusty/nova-cloud-controller/lp1500589 into lp:~openstack-charmers-archive/charms/trusty/nova-cloud-controller/next

[Liam Young]

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

charm_lint_check #11384 nova-cloud-controller-next for gnuoy mp273508
    LINT OK: passed

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

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

charm_unit_test #10576 nova-cloud-controller-next for gnuoy mp273508
    UNIT OK: passed

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

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

charm_amulet_test #7130 nova-cloud-controller-next for gnuoy mp273508
    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/12696559/
Build: http://10.245.162.77:8080/job/charm_amulet_test/7130/

[lp:~gnuoy/charms/trusty/nova-cloud-controller/lp1500589]

199. By Liam Young on 2015-10-06

Fix type in length check. If all is well the cmd should return two lines

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

charm_lint_check #11385 nova-cloud-controller-next for gnuoy mp273508
    LINT OK: passed

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

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

charm_unit_test #10577 nova-cloud-controller-next for gnuoy mp273508
    UNIT OK: passed

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

[lp:~gnuoy/charms/trusty/nova-cloud-controller/lp1500589]

200. By Liam Young on 2015-10-06

Kick osci

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

charm_lint_check #11387 nova-cloud-controller-next for gnuoy mp273508
    LINT OK: passed

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

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

charm_unit_test #10579 nova-cloud-controller-next for gnuoy mp273508
    UNIT OK: passed

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

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

charm_amulet_test #7132 nova-cloud-controller-next for gnuoy mp273508
    AMULET OK: passed

Build: http://10.245.162.77:8080/job/charm_amulet_test/7132/

[lp:~gnuoy/charms/trusty/nova-cloud-controller/lp1500589]

201. By Liam Young on 2015-10-06

Updated after mp review from hopem

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

charm_lint_check #11391 nova-cloud-controller-next for gnuoy mp273508
    LINT OK: passed

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

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

charm_unit_test #10583 nova-cloud-controller-next for gnuoy mp273508
    UNIT OK: passed

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

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

charm_amulet_test #7134 nova-cloud-controller-next for gnuoy mp273508
    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/12697897/
Build: http://10.245.162.77:8080/job/charm_amulet_test/7134/

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

charm_amulet_test #7138 nova-cloud-controller-next for gnuoy mp273508
    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/12698646/
Build: http://10.245.162.77:8080/job/charm_amulet_test/7138/

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

charm_amulet_test #7175 nova-cloud-controller-next for gnuoy mp273508
    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/12702675/
Build: http://10.245.162.77:8080/job/charm_amulet_test/7175/

[Edward Hope-Morley (hopem)]

lgtm +1

review: Approve

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

charm_amulet_test #7183 nova-cloud-controller-next for gnuoy mp273508
    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/12705556/
Build: http://10.245.162.77:8080/job/charm_amulet_test/7183/

[Ryan Beisner (1chb1n)]

FYI, unrelated to the changes proposed here...

https://bugs.launchpad.net/charms/+source/nova-cloud-controller/+bug/1503701

While the undercloud has elevated load, there is this race where the amulet test blindly says "create an instance right now," and the overcloud isn't quite ready for that at that moment.

=== modified file 'hooks/nova_cc_utils.py'
--- hooks/nova_cc_utils.py	2015-10-02 12:05:06 +0000
+++ hooks/nova_cc_utils.py	2015-10-06 15:50:49 +0000
@@ -728,10 +728,17 @@
         # The first line of output is like '# Host xx found: line 1 type RSA',
         # which should be excluded.
         output = subprocess.check_output(cmd).strip()
-        return output.split('\n')[1]
     except subprocess.CalledProcessError:
         return None
 
+    if output:
+        # Bug #1500589 cmd has 0 rc on precise if entry not present
+        lines = output.split('\n')
+        if len(lines) > 1:
+            return lines[1]
+
+    return None
+
 
 def remove_known_host(host, unit=None, user=None):
     log('Removing SSH known host entry for compute host at %s' % host)

=== modified file 'unit_tests/test_nova_cc_utils.py'
--- unit_tests/test_nova_cc_utils.py	2015-09-24 16:29:26 +0000
+++ unit_tests/test_nova_cc_utils.py	2015-10-06 15:50:49 +0000
@@ -602,6 +602,16 @@
         _known_hosts.assert_called_with('bar', None)
 
     @patch.object(utils, 'known_hosts')
+    @patch('subprocess.check_output')
+    def test_ssh_known_host_key_bug1500589(self, _check_output, _known_hosts):
+        """On precise ssh-keygen does not error if host not found in file. So
+         check charm processes empty output properly"""
+        _known_hosts.return_value = '/foo/known_hosts'
+        _check_output.return_value = ''
+        key = utils.ssh_known_host_key('test')
+        self.assertEquals(key, None)
+
+    @patch.object(utils, 'known_hosts')
     @patch('subprocess.check_call')
     def test_remove_known_host(self, _check_call, _known_hosts):
         _known_hosts.return_value = '/foo/known_hosts'