Merge lp:~james-page/charms/trusty/cinder/bug.1391784 into lp:~openstack-charmers-archive/charms/trusty/cinder/next

[James Page]

[Ryan Beisner (1chb1n)]

UOSCI bot says:
charm_lint_check #1001 cinder-next for james-page mp241514
    LINT OK: passed

LINT Results (max last 5 lines):
  I: config.yaml: option ssl_ca has no default value
  I: config.yaml: option config-flags 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

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

[Ryan Beisner (1chb1n)]

UOSCI bot says:
charm_unit_test #836 cinder-next for james-page mp241514
    UNIT OK: passed

UNIT Results (max last 5 lines):
  hooks/cinder_hooks 195 6 97% 99-100, 115, 122, 288-289
  hooks/cinder_utils 173 14 92% 191, 410-415, 452-464
  TOTAL 420 26 94%
  Ran 87 tests in 6.270s
  OK

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

[Ryan Beisner (1chb1n)]

UOSCI bot says:
charm_amulet_test #381 cinder-next for james-page mp241514
    AMULET FAIL: amulet-test failed

AMULET Results (max last 5 lines):
  juju-test.conductor DEBUG : Calling "juju destroy-environment -y osci-sv07"
  WARNING cannot delete security group "juju-osci-sv07-0". Used by another environment?
  juju-test INFO : Results: 2 passed, 1 failed, 0 errored
  ERROR subprocess encountered error code 1
  make: *** [test] Error 1

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

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

UOSCI bot says:
charm_lint_check #1074 cinder-next for james-page mp241514
    LINT OK: passed

LINT Results (max last 5 lines):
  I: config.yaml: option ssl_ca has no default value
  I: config.yaml: option config-flags 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

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

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

UOSCI bot says:
charm_unit_test #908 cinder-next for james-page mp241514
    UNIT OK: passed

UNIT Results (max last 5 lines):
  hooks/cinder_hooks 195 6 97% 99-100, 115, 122, 288-289
  hooks/cinder_utils 173 14 92% 191, 410-415, 452-464
  TOTAL 420 26 94%
  Ran 87 tests in 5.528s
  OK

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

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

UOSCI bot says:
charm_amulet_test #416 cinder-next for james-page mp241514
    AMULET FAIL: amulet-test failed

AMULET Results (max last 5 lines):
  juju-test.conductor DEBUG : Calling "juju destroy-environment -y osci-sv07"
  WARNING cannot delete security group "juju-osci-sv07-0". Used by another environment?
  juju-test INFO : Results: 1 passed, 2 failed, 0 errored
  ERROR subprocess encountered error code 2
  make: *** [test] Error 2

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

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

UOSCI bot says:
charm_lint_check #1154 cinder-next for james-page mp241514
    LINT OK: passed

LINT Results (max last 5 lines):
  I: config.yaml: option ssl_ca has no default value
  I: config.yaml: option config-flags 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

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

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

UOSCI bot says:
charm_unit_test #988 cinder-next for james-page mp241514
    UNIT OK: passed

UNIT Results (max last 5 lines):
  hooks/cinder_hooks 195 6 97% 99-100, 115, 122, 288-289
  hooks/cinder_utils 173 14 92% 191, 410-415, 452-464
  TOTAL 420 26 94%
  Ran 87 tests in 6.270s
  OK

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

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

UOSCI bot says:
charm_amulet_test #496 cinder-next for james-page mp241514
    AMULET FAIL: amulet-test failed

AMULET Results (max last 5 lines):
  subprocess.CalledProcessError: Command '['juju-deployer', '-W', '-L', '-c', '/tmp/amulet-juju-deployer-H1LWry.json', '-e', 'osci-sv07', '-t', '1000', 'osci-sv07']' returned non-zero exit status 1
  WARNING cannot delete security group "juju-osci-sv07-0". Used by another environment?
  juju-test INFO : Results: 0 passed, 2 failed, 1 errored
  ERROR subprocess encountered error code 2
  make: *** [test] Error 2

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

[Liam Young (gnuoy)]

Approve

review: Approve

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

charm_lint_check #726 cinder-next for james-page mp241514
    LINT OK: passed

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

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

charm_unit_test #755 cinder-next for james-page mp241514
    UNIT OK: passed

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

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

charm_amulet_test #911 cinder-next for james-page mp241514
    AMULET OK: passed

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

[Ryan Beisner (1chb1n)]

FYI P, T & U deploy tests are good!

review: Approve

=== modified file 'config.yaml'
--- config.yaml	2014-10-30 03:30:35 +0000
+++ config.yaml	2015-01-13 14:36:57 +0000
@@ -118,6 +118,18 @@
       .
       If multiple networks are being used, a VIP should be provided for each
       network, separated by spaces.
+  vip_iface:
+    type: string
+    default: eth0
+    description: |
+      Default network interface to use for HA vip when it cannot be automatically
+      determined.
+  vip_cidr:
+    type: int
+    default: 24
+    description: |
+      Default CIDR netmask to use for HA vip when it cannot be automatically
+      determined.
   ha-bindiface:
     type: string
     default: eth0

=== modified file 'hooks/cinder_hooks.py'
--- hooks/cinder_hooks.py	2015-01-12 12:03:59 +0000
+++ hooks/cinder_hooks.py	2015-01-13 14:36:57 +0000
@@ -343,7 +343,11 @@
             res_cinder_vip = 'ocf:heartbeat:IPaddr2'
             vip_params = 'ip'
 
-        iface = get_iface_for_address(vip)
+        iface = (get_iface_for_address(vip) or
+                 config('vip_iface'))
+        netmask = (get_netmask_for_address(vip) or
+                   config('vip_cidr'))
+
         if iface is not None:
             vip_key = 'res_cinder_{}_vip'.format(iface)
             resources[vip_key] = res_cinder_vip
@@ -352,7 +356,7 @@
                 ' nic="{iface}"'.format(ip=vip_params,
                                         vip=vip,
                                         iface=iface,
-                                        netmask=get_netmask_for_address(vip))
+                                        netmask=netmask)
             )
             vip_group.append(vip_key)
 

=== modified file 'unit_tests/test_cluster_hooks.py'
--- unit_tests/test_cluster_hooks.py	2014-11-07 14:47:00 +0000
+++ unit_tests/test_cluster_hooks.py	2015-01-13 14:36:57 +0000
@@ -181,6 +181,45 @@
         }
         self.relation_set.assert_called_with(**ex_args)
 
+    def test_ha_joined_no_bound_ip(self):
+        '''
+        Ensure fallback configuration options are used if network
+        interface cannot be auto-detected
+        '''
+        conf = {
+            'ha-bindiface': 'eth100',
+            'ha-mcastport': '37373',
+            'vip': '192.168.25.163',
+        }
+
+        self.test_config.set('prefer-ipv6', 'False')
+        self.test_config.set('vip_iface', 'eth120')
+        self.test_config.set('vip_cidr', '21')
+        self.get_hacluster_config.return_value = conf
+        self.get_iface_for_address.return_value = None
+        self.get_netmask_for_address.return_value = None
+        hooks.hooks.execute(['hooks/ha-relation-joined'])
+        ex_args = {
+            'corosync_mcastport': '37373',
+            'init_services': {'res_cinder_haproxy': 'haproxy'},
+            'resource_params': {
+                'res_cinder_eth120_vip':
+                'params ip="192.168.25.163" cidr_netmask="21"'
+                ' nic="eth120"',
+                'res_cinder_haproxy': 'op monitor interval="5s"'
+            },
+            'corosync_bindiface': 'eth100',
+            'clones': {'cl_cinder_haproxy': 'res_cinder_haproxy'},
+            'resources': {
+                'res_cinder_eth120_vip': 'ocf:heartbeat:IPaddr2',
+                'res_cinder_haproxy': 'lsb:haproxy'
+            }
+        }
+        self.relation_set.assert_has_calls([
+            call(groups={'grp_cinder_vips': 'res_cinder_eth120_vip'}),
+            call(**ex_args)
+        ])
+
     @patch.object(hooks, 'identity_joined')
     def test_ha_changed_clustered(self, joined):
         self.relation_get.return_value = True