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

[James Page]

[Ryan Beisner (1chb1n)]

UOSCI bot says:
charm_lint_check #1006 openstack-dashboard-next for james-page mp241526
    LINT OK: passed

LINT Results (max last 5 lines):
  I: config.yaml: option profile has no default value
  I: config.yaml: option ssl_key has no default value
  I: config.yaml: option vip has no default value
  I: config.yaml: option ssl_cert has no default value
  I: config.yaml: option secret has no default value

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

[Ryan Beisner (1chb1n)]

UOSCI bot says:
charm_amulet_test #386 openstack-dashboard-next for james-page mp241526
    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/8961147/
Build: http://10.98.191.181:8080/job/charm_amulet_test/386/

[Ryan Beisner (1chb1n)]

UOSCI bot says:
charm_unit_test #841 openstack-dashboard-next for james-page mp241526
    UNIT OK: passed

UNIT Results (max last 5 lines):
  hooks/horizon_hooks 87 8 91% 73-74, 122-124, 149-150, 173
  hooks/horizon_utils 73 8 89% 135, 190-202
  TOTAL 222 17 92%
  Ran 40 tests in 1.910s
  OK

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

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

UOSCI bot says:
charm_lint_check #1009 openstack-dashboard-next for james-page mp241526
    LINT OK: passed

LINT Results (max last 5 lines):
  I: config.yaml: option profile has no default value
  I: config.yaml: option ssl_key has no default value
  I: config.yaml: option vip has no default value
  I: config.yaml: option ssl_cert has no default value
  I: config.yaml: option secret has no default value

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

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

UOSCI bot says:
charm_amulet_test #472 openstack-dashboard-next for james-page mp241526
    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/9100982/
Build: http://10.98.191.181:8080/job/charm_amulet_test/472/

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

UOSCI bot says:
charm_unit_test #964 openstack-dashboard-next for james-page mp241526
    UNIT OK: passed

UNIT Results (max last 5 lines):
  hooks/horizon_hooks 87 8 91% 73-74, 122-124, 149-150, 173
  hooks/horizon_utils 73 8 89% 135, 190-202
  TOTAL 222 17 92%
  Ran 40 tests in 1.653s
  OK

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

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

UOSCI bot says:
charm_lint_check #1130 openstack-dashboard-next for james-page mp241526
    LINT OK: passed

LINT Results (max last 5 lines):
  I: config.yaml: option profile has no default value
  I: config.yaml: option ssl_key has no default value
  I: config.yaml: option vip has no default value
  I: config.yaml: option ssl_cert has no default value
  I: config.yaml: option secret has no default value

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

[Liam Young (gnuoy)]

Approve

review: Approve

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

charm_lint_check #731 openstack-dashboard-next for james-page mp241526
    LINT OK: passed

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

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

charm_unit_test #760 openstack-dashboard-next for james-page mp241526
    UNIT OK: passed

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

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

charm_amulet_test #916 openstack-dashboard-next for james-page mp241526
    AMULET FAIL: amulet-test missing

AMULET Results (max last 2 lines):
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/9730901/
Build: http://10.245.162.77:8080/job/charm_amulet_test/916/

[Ryan Beisner (1chb1n)]

FYI, P, T & U deploy tests are happy.

review: Approve

=== modified file 'config.yaml'
--- config.yaml	2014-10-30 03:30:36 +0000
+++ config.yaml	2015-01-13 14:46:35 +0000
@@ -36,6 +36,18 @@
         type: string
         default:
         description: "Virtual IP to use to front openstack dashboard ha configuration"
+    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/horizon_hooks.py'
--- hooks/horizon_hooks.py	2015-01-12 11:48:23 +0000
+++ hooks/horizon_hooks.py	2015-01-13 14:46:35 +0000
@@ -162,7 +162,11 @@
             res_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_horizon_{}_vip'.format(iface)
             resources[vip_key] = res_vip
@@ -171,7 +175,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_horizon_hooks.py'
--- unit_tests/test_horizon_hooks.py	2015-01-09 15:42:47 +0000
+++ unit_tests/test_horizon_hooks.py	2015-01-13 14:46:35 +0000
@@ -125,6 +125,36 @@
         }
         self.relation_set.assert_called_with(**ex_args)
 
+    def test_ha_joined_no_bound_ip(self):
+        conf = {
+            'ha-bindiface': 'eth100',
+            'ha-mcastport': '37373',
+            'vip': '192.168.25.163',
+        }
+        self.test_config.set('vip_iface', 'eth120')
+        self.test_config.set('vip_cidr', '21')
+        self.get_iface_for_address.return_value = None
+        self.get_netmask_for_address.return_value = None
+        self.get_hacluster_config.return_value = conf
+        self._call_hook('ha-relation-joined')
+        ex_args = {
+            'corosync_mcastport': '37373',
+            'init_services': {
+                'res_horizon_haproxy': 'haproxy'},
+            'resource_params': {
+                'res_horizon_eth120_vip':
+                'params ip="192.168.25.163" cidr_netmask="21"'
+                ' nic="eth120"',
+                'res_horizon_haproxy': 'op monitor interval="5s"'},
+            'corosync_bindiface': 'eth100',
+            'clones': {
+                'cl_horizon_haproxy': 'res_horizon_haproxy'},
+            'resources': {
+                'res_horizon_eth120_vip': 'ocf:heartbeat:IPaddr2',
+                'res_horizon_haproxy': 'lsb:haproxy'}
+        }
+        self.relation_set.assert_called_with(**ex_args)
+
     def test_ha_joined_incomplete_config(self):
         self.get_hacluster_config.side_effect = HAIncompleteConfig(1, 'bang')
         self.assertRaises(HAIncompleteConfig, self._call_hook,