1
=== modified file 'config.yaml'
2
--- config.yaml	2014-10-30 03:30:36 +0000
3
+++ config.yaml	2015-01-13 14:45:13 +0000
4
@@ -103,6 +103,18 @@
5
103
      .
103
      .
6
104
      If multiple networks are being used, a VIP should be provided for each
104
      If multiple networks are being used, a VIP should be provided for each
7
105
      network, separated by spaces.
105
      network, separated by spaces.
8
106
  vip_iface:
9
107
    type: string
10
108
    default: eth0
11
109
    description: |
12
110
      Default network interface to use for HA vip when it cannot be automatically
13
111
      determined.
14
112
  vip_cidr:
15
113
    type: int
16
114
    default: 24
17
115
    description: |
18
116
      Default CIDR netmask to use for HA vip when it cannot be automatically
19
117
      determined.
20
106
  ha-bindiface:
118
  ha-bindiface:
21
107
    type: string
119
    type: string
22
108
    default: eth0
120
    default: eth0
23
109
121
24
=== modified file 'hooks/nova_cc_hooks.py'
25
--- hooks/nova_cc_hooks.py	2015-01-12 12:04:00 +0000
26
+++ hooks/nova_cc_hooks.py	2015-01-13 14:45:13 +0000
27
@@ -648,7 +648,11 @@
28
648
            res_nova_vip = 'ocf:heartbeat:IPaddr2'
648
            res_nova_vip = 'ocf:heartbeat:IPaddr2'
29
649
            vip_params = 'ip'
649
            vip_params = 'ip'
30
650
650
32
651
        iface = get_iface_for_address(vip)
651
        iface = (get_iface_for_address(vip) or
33
652
                 config('vip_iface'))
34
653
        netmask = (get_netmask_for_address(vip) or
35
654
                   config('vip_cidr'))
36
655
37
652
        if iface is not None:
656
        if iface is not None:
38
653
            vip_key = 'res_nova_{}_vip'.format(iface)
657
            vip_key = 'res_nova_{}_vip'.format(iface)
39
654
            resources[vip_key] = res_nova_vip
658
            resources[vip_key] = res_nova_vip
40
@@ -657,7 +661,7 @@
41
657
                ' nic="{iface}"'.format(ip=vip_params,
661
                ' nic="{iface}"'.format(ip=vip_params,
42
658
                                        vip=vip,
662
                                        vip=vip,
43
659
                                        iface=iface,
663
                                        iface=iface,
45
660
                                        netmask=get_netmask_for_address(vip))
664
                                        netmask=netmask)
46
661
            )
665
            )
47
662
            vip_group.append(vip_key)
666
            vip_group.append(vip_key)
48
663
667
49
664
668
50
=== modified file 'unit_tests/test_nova_cc_hooks.py'
51
--- unit_tests/test_nova_cc_hooks.py	2015-01-12 14:23:34 +0000
52
+++ unit_tests/test_nova_cc_hooks.py	2015-01-13 14:45:13 +0000
53
@@ -64,6 +64,9 @@
54
64
    'migrate_nova_database',
64
    'migrate_nova_database',
55
65
    'migrate_neutron_database',
65
    'migrate_neutron_database',
56
66
    'uuid',
66
    'uuid',
57
67
    'get_hacluster_config',
58
68
    'get_iface_for_address',
59
69
    'get_netmask_for_address',
60
67
    'update_nrpe_config',
70
    'update_nrpe_config',
61
68
]
71
]
62
69
72
63
@@ -607,3 +610,31 @@
64
607
            'Not running neutron database migration as migrations are handled'
610
            'Not running neutron database migration as migrations are handled'
65
608
            'by the neutron-server process.'
611
            'by the neutron-server process.'
66
609
        )
612
        )
67
613
68
614
    def test_ha_relation_joined_no_bound_ip(self):
69
615
        self.get_hacluster_config.return_value = {
70
616
            'ha-bindiface': 'em0',
71
617
            'ha-mcastport': '8080',
72
618
            'vip': '10.10.10.10',
73
619
        }
74
620
        self.test_config.set('vip_iface', 'eth120')
75
621
        self.test_config.set('vip_cidr', '21')
76
622
        self.get_iface_for_address.return_value = None
77
623
        self.get_netmask_for_address.return_value = None
78
624
        hooks.ha_joined()
79
625
        args = {
80
626
            'corosync_bindiface': 'em0',
81
627
            'corosync_mcastport': '8080',
82
628
            'init_services': {'res_nova_haproxy': 'haproxy'},
83
629
            'resources': {'res_nova_eth120_vip': 'ocf:heartbeat:IPaddr2',
84
630
                          'res_nova_haproxy': 'lsb:haproxy'},
85
631
            'resource_params': {
86
632
                'res_nova_eth120_vip': 'params ip="10.10.10.10"'
87
633
                ' cidr_netmask="21" nic="eth120"',
88
634
                'res_nova_haproxy': 'op monitor interval="5s"'},
89
635
            'clones': {'cl_nova_haproxy': 'res_nova_haproxy'}
90
636
        }
91
637
        self.relation_set.assert_has_calls([
92
638
            call(groups={'grp_nova_vips': 'res_nova_eth120_vip'}),
93
639
            call(**args),
94
640
        ])
Reviewer	Date Requested	Status
Ryan Beisner (community)		Approve on 2015-01-13
Liam Young (community)	2014-11-12	Approve on 2015-01-13
Review via email: mp+241525@code.launchpad.net