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

[James Page]

[Ryan Beisner (1chb1n)]

UOSCI bot says:
charm_lint_check #1003 keystone-next for james-page mp241517
    LINT OK: passed

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

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

[Ryan Beisner (1chb1n)]

UOSCI bot says:
charm_unit_test #838 keystone-next for james-page mp241517
    UNIT OK: passed

UNIT Results (max last 5 lines):
  hooks/keystone_ssl 158 132 16% 106-128, 132-146, 150-158, 162-172, 176-177, 182-193, 197-206, 210-221, 225-237, 243-256, 259-266, 269-279, 282-296, 299-302
  hooks/keystone_utils 387 202 48% 204, 218, 242-247, 290-299, 306-321, 328-336, 341-351, 358-384, 389-398, 403-417, 422-444, 449-466, 480-503, 512-517, 522, 529-539, 544-552, 557-562, 566-573, 581-586, 597-612, 616-624, 649-650, 729, 732, 781-794, 818-822, 826-838
  TOTAL 809 404 50%
  Ran 38 tests in 3.341s
  OK

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

[Ryan Beisner (1chb1n)]

UOSCI bot says:
charm_amulet_test #383 keystone-next for james-page mp241517
    AMULET OK: passed

AMULET Results (max last 5 lines):
  juju-test.conductor.15-basic-trusty-icehouse RESULT :
  juju-test.conductor DEBUG : Tearing down osci-sv05 juju environment
  juju-test.conductor DEBUG : Calling "juju destroy-environment -y osci-sv05"
  WARNING cannot delete security group "juju-osci-sv05-0". Used by another environment?
  juju-test INFO : Results: 3 passed, 0 failed, 0 errored

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

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

UOSCI bot says:
charm_lint_check #1077 keystone-next for james-page mp241517
    LINT OK: passed

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

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

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

UOSCI bot says:
charm_unit_test #911 keystone-next for james-page mp241517
    UNIT OK: passed

UNIT Results (max last 5 lines):
  hooks/keystone_ssl 158 132 16% 106-128, 132-146, 150-158, 162-172, 176-177, 182-193, 197-206, 210-221, 225-237, 243-256, 259-266, 269-279, 282-296, 299-302
  hooks/keystone_utils 387 202 48% 204, 218, 242-247, 290-299, 306-321, 328-336, 341-351, 358-384, 389-398, 403-417, 422-444, 449-466, 480-503, 512-517, 522, 529-539, 544-552, 557-562, 566-573, 581-586, 597-612, 616-624, 649-650, 729, 732, 781-794, 818-822, 826-838
  TOTAL 809 404 50%
  Ran 38 tests in 3.256s
  OK

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

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

UOSCI bot says:
charm_amulet_test #419 keystone-next for james-page mp241517
    AMULET OK: passed

AMULET Results (max last 5 lines):
  juju-test.conductor.15-basic-trusty-icehouse RESULT :
  juju-test.conductor DEBUG : Tearing down osci-sv05 juju environment
  juju-test.conductor DEBUG : Calling "juju destroy-environment -y osci-sv05"
  WARNING cannot delete security group "juju-osci-sv05-0". Used by another environment?
  juju-test INFO : Results: 3 passed, 0 failed, 0 errored

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

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

UOSCI bot says:
charm_lint_check #1156 keystone-next for james-page mp241517
    LINT OK: passed

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

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

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

UOSCI bot says:
charm_unit_test #990 keystone-next for james-page mp241517
    UNIT OK: passed

UNIT Results (max last 5 lines):
  hooks/keystone_ssl 158 132 16% 106-128, 132-146, 150-158, 162-172, 176-177, 182-193, 197-206, 210-221, 225-237, 243-256, 259-266, 269-279, 282-296, 299-302
  hooks/keystone_utils 387 202 48% 204, 218, 242-247, 290-299, 306-321, 328-336, 341-351, 358-384, 389-398, 403-417, 422-444, 449-466, 480-503, 512-517, 522, 529-539, 544-552, 557-562, 566-573, 581-586, 597-612, 616-624, 649-650, 729, 732, 781-794, 818-822, 826-838
  TOTAL 809 404 50%
  Ran 38 tests in 3.106s
  OK

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

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

UOSCI bot says:
charm_amulet_test #498 keystone-next for james-page mp241517
    AMULET OK: passed

AMULET Results (max last 5 lines):
  juju-test.conductor.15-basic-trusty-icehouse RESULT :
  juju-test.conductor DEBUG : Tearing down osci-sv11 juju environment
  juju-test.conductor DEBUG : Calling "juju destroy-environment -y osci-sv11"
  WARNING cannot delete security group "juju-osci-sv11-0". Used by another environment?
  juju-test INFO : Results: 3 passed, 0 failed, 0 errored

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

[lp:~james-page/charms/trusty/keystone/bug.1391784]

93. By James Page on 2015-01-13

Tweak tests

[Liam Young (gnuoy)]

Approve

review: Approve

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

charm_lint_check #728 keystone-next for james-page mp241517
    LINT OK: passed

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

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

charm_unit_test #757 keystone-next for james-page mp241517
    UNIT OK: passed

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

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

charm_amulet_test #913 keystone-next for james-page mp241517
    AMULET OK: passed

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

[Ryan Beisner (1chb1n)]

FYI P, T & U deploy tests are good!

review: Approve

=== modified file 'config.yaml'
--- config.yaml	2015-01-09 15:54:17 +0000
+++ config.yaml	2015-01-13 14:42:12 +0000
@@ -138,6 +138,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/keystone_hooks.py'
--- hooks/keystone_hooks.py	2015-01-12 12:04:00 +0000
+++ hooks/keystone_hooks.py	2015-01-13 14:42:12 +0000
@@ -294,7 +294,11 @@
             res_ks_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_ks_{}_vip'.format(iface)
             resources[vip_key] = res_ks_vip
@@ -303,7 +307,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_keystone_hooks.py'
--- unit_tests/test_keystone_hooks.py	2015-01-09 15:58:43 +0000
+++ unit_tests/test_keystone_hooks.py	2015-01-13 14:42:12 +0000
@@ -385,6 +385,31 @@
         }
         self.relation_set.assert_called_with(**args)
 
+    def test_ha_joined_no_bound_ip(self):
+        self.get_hacluster_config.return_value = {
+            'vip': '10.10.10.10',
+            'ha-bindiface': 'em0',
+            'ha-mcastport': '8080'
+        }
+        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
+        hooks.ha_joined()
+        args = {
+            'corosync_bindiface': 'em0',
+            'corosync_mcastport': '8080',
+            'init_services': {'res_ks_haproxy': 'haproxy'},
+            'resources': {'res_ks_eth120_vip': 'ocf:heartbeat:IPaddr2',
+                          'res_ks_haproxy': 'lsb:haproxy'},
+            'resource_params': {
+                'res_ks_eth120_vip': 'params ip="10.10.10.10"'
+                                     ' cidr_netmask="21" nic="eth120"',
+                'res_ks_haproxy': 'op monitor interval="5s"'},
+            'clones': {'cl_ks_haproxy': 'res_ks_haproxy'}
+        }
+        self.relation_set.assert_called_with(**args)
+
     def test_ha_joined_with_ipv6(self):
         self.test_config.set('prefer-ipv6', True)
         self.get_hacluster_config.return_value = {