1
=== added symlink 'hooks/memcache-relation-broken'
2
=== target is u'nova_cc_hooks.py'
3
=== added symlink 'hooks/memcache-relation-changed'
4
=== target is u'nova_cc_hooks.py'
5
=== added symlink 'hooks/memcache-relation-departed'
6
=== target is u'nova_cc_hooks.py'
7
=== added symlink 'hooks/memcache-relation-joined'
8
=== target is u'nova_cc_hooks.py'
9
=== modified file 'hooks/nova_cc_context.py'
10
--- hooks/nova_cc_context.py	2014-12-03 23:49:34 +0000
11
+++ hooks/nova_cc_context.py	2014-12-16 14:11:00 +0000
12
@@ -6,6 +6,7 @@
13
6
    ERROR,
6
    ERROR,
14
7
    unit_get,
7
    unit_get,
15
8
    related_units,
8
    related_units,
16
9
    relations_for_id,
17
9
    relation_get,
10
    relation_get,
18
10
)
11
)
19
11
from charmhelpers.fetch import (
12
from charmhelpers.fetch import (
20
@@ -299,3 +300,27 @@
21
299
        ctxt = super(NovaIPv6Context, self).__call__()
300
        ctxt = super(NovaIPv6Context, self).__call__()
22
300
        ctxt['use_ipv6'] = config('prefer-ipv6')
301
        ctxt['use_ipv6'] = config('prefer-ipv6')
23
301
        return ctxt
302
        return ctxt
24
303
25
304
26
305
class InstanceConsoleContext(context.OSContextGenerator):
27
306
    interfaces = []
28
307
29
308
    def __call__(self):
30
309
        ctxt = {}
31
310
        servers = []
32
311
        try:
33
312
            for rid in relation_ids('memcache'):
34
313
                for rel in relations_for_id(rid):
35
314
                    priv_addr = rel['private-address']
36
315
                    # format it as IPv6 address if neeeded
37
316
                    priv_addr = format_ipv6_addr(priv_addr) or priv_addr
38
317
                    servers.append({'private-address': priv_addr,
39
318
                                    'port': rel['port']})
40
319
        except Exception as ex:
41
320
            log("Couldn't get memcache servers: {}".format(str(ex)),
42
321
                level='WARNING')
43
322
            servers = []
44
323
45
324
        ctxt['memcached_servers'] = ','.join(
46
325
            ["%s:%s" % (s['private-address'], s['port']) for s in servers])
47
326
        return ctxt
48
302
327
49
=== modified file 'hooks/nova_cc_hooks.py'
50
--- hooks/nova_cc_hooks.py	2014-10-23 07:32:45 +0000
51
+++ hooks/nova_cc_hooks.py	2014-12-16 14:11:00 +0000
52
@@ -849,6 +849,15 @@
53
849
        quantum_joined(rid=rid)
849
        quantum_joined(rid=rid)
54
850
850
55
851
851
56
852
@hooks.hook('memcache-relation-joined',
57
853
            'memcache-relation-departed',
58
854
            'memcache-relation-changed',
59
855
            'memcache-relation-broken')
60
856
@restart_on_change(restart_map())
61
857
def memcached_joined():
62
858
    CONFIGS.write(NOVA_CONF)
63
859
64
860
65
852
def main():
861
def main():
66
853
    try:
862
    try:
67
854
        hooks.execute(sys.argv)
863
        hooks.execute(sys.argv)
68
855
864
69
=== modified file 'hooks/nova_cc_utils.py'
70
--- hooks/nova_cc_utils.py	2014-11-14 09:55:10 +0000
71
+++ hooks/nova_cc_utils.py	2014-12-16 14:11:00 +0000
72
@@ -68,6 +68,7 @@
73
68
    'python-psycopg2',
68
    'python-psycopg2',
74
69
    'python-psutil',
69
    'python-psutil',
75
70
    'uuid',
70
    'uuid',
76
71
    'python-memcache',
77
71
]
72
]
78
72
73
79
73
BASE_SERVICES = [
74
BASE_SERVICES = [
80
@@ -123,7 +124,8 @@
81
123
                     nova_cc_context.VolumeServiceContext(),
124
                     nova_cc_context.VolumeServiceContext(),
82
124
                     nova_cc_context.NovaIPv6Context(),
125
                     nova_cc_context.NovaIPv6Context(),
83
125
                     nova_cc_context.NeutronCCContext(),
126
                     nova_cc_context.NeutronCCContext(),
85
126
                     nova_cc_context.NovaConfigContext()],
127
                     nova_cc_context.NovaConfigContext(),
86
128
                     nova_cc_context.InstanceConsoleContext()],
87
127
    }),
129
    }),
88
128
    (NOVA_API_PASTE, {
130
    (NOVA_API_PASTE, {
89
129
        'services': [s for s in BASE_SERVICES if 'api' in s],
131
        'services': [s for s in BASE_SERVICES if 'api' in s],
90
130
132
91
=== modified file 'metadata.yaml'
92
--- metadata.yaml	2014-07-11 09:14:57 +0000
93
+++ metadata.yaml	2014-12-16 14:11:00 +0000
94
@@ -40,6 +40,8 @@
95
40
  nova-vmware:
40
  nova-vmware:
96
41
    interface: nova-vmware
41
    interface: nova-vmware
97
42
    scope: container
42
    scope: container
98
43
  memcache:
99
44
    interface: memcache
100
43
peers:
45
peers:
101
44
  cluster:
46
  cluster:
102
45
    interface: nova-ha
47
    interface: nova-ha
103
46
48
104
=== modified file 'templates/folsom/nova.conf'
105
--- templates/folsom/nova.conf	2014-04-16 08:25:14 +0000
106
+++ templates/folsom/nova.conf	2014-12-16 14:11:00 +0000
107
@@ -21,6 +21,11 @@
108
21
enabled_apis=ec2,osapi_compute,metadata
21
enabled_apis=ec2,osapi_compute,metadata
109
22
auth_strategy=keystone
22
auth_strategy=keystone
110
23
compute_driver=libvirt.LibvirtDriver
23
compute_driver=libvirt.LibvirtDriver
111
24
112
25
{% if memcached_servers %}
113
26
memcached_servers = {%for s in memcached_servers %}{% if loop.index0 != 0 %},{% endif %}{{s['private-address']}}:{{s['port']}}{% endfor %}
114
27
{% endif %}
115
28
116
24
{% if keystone_ec2_url -%}
29
{% if keystone_ec2_url -%}
117
25
keystone_ec2_url = {{ keystone_ec2_url }}
30
keystone_ec2_url = {{ keystone_ec2_url }}
118
26
{% endif -%}
31
{% endif -%}
119
27
32
120
=== modified file 'templates/grizzly/nova.conf'
121
--- templates/grizzly/nova.conf	2014-03-31 11:56:09 +0000
122
+++ templates/grizzly/nova.conf	2014-12-16 14:11:00 +0000
123
@@ -20,6 +20,11 @@
124
20
enabled_apis=ec2,osapi_compute,metadata
20
enabled_apis=ec2,osapi_compute,metadata
125
21
auth_strategy=keystone
21
auth_strategy=keystone
126
22
compute_driver=libvirt.LibvirtDriver
22
compute_driver=libvirt.LibvirtDriver
127
23
128
24
{% if memcached_servers %}
129
25
memcached_servers = {{ memcached_servers }}
130
26
{% endif %}
131
27
132
23
{% if keystone_ec2_url -%}
28
{% if keystone_ec2_url -%}
133
24
keystone_ec2_url = {{ keystone_ec2_url }}
29
keystone_ec2_url = {{ keystone_ec2_url }}
134
25
{% endif -%}
30
{% endif -%}
135
26
31
136
=== modified file 'templates/havana/nova.conf'
137
--- templates/havana/nova.conf	2014-12-03 23:31:19 +0000
138
+++ templates/havana/nova.conf	2014-12-16 14:11:00 +0000
139
@@ -27,6 +27,10 @@
140
27
use_syslog={{ use_syslog }}
27
use_syslog={{ use_syslog }}
141
28
my_ip = {{ host_ip }}
28
my_ip = {{ host_ip }}
142
29
29
143
30
{% if memcached_servers %}
144
31
memcached_servers = {{ memcached_servers }}
145
32
{% endif %}
146
33
147
30
{% if keystone_ec2_url -%}
34
{% if keystone_ec2_url -%}
148
31
keystone_ec2_url = {{ keystone_ec2_url }}
35
keystone_ec2_url = {{ keystone_ec2_url }}
149
32
{% endif -%}
36
{% endif -%}
150
33
37
151
=== modified file 'templates/icehouse/nova.conf'
152
--- templates/icehouse/nova.conf	2014-12-03 23:31:19 +0000
153
+++ templates/icehouse/nova.conf	2014-12-16 14:11:00 +0000
154
@@ -38,6 +38,10 @@
155
38
use_syslog={{ use_syslog }}
38
use_syslog={{ use_syslog }}
156
39
my_ip = {{ host_ip }}
39
my_ip = {{ host_ip }}
157
40
40
158
41
{% if memcached_servers %}
159
42
memcached_servers = {{ memcached_servers }}
160
43
{% endif %}
161
44
162
41
{% if keystone_ec2_url -%}
45
{% if keystone_ec2_url -%}
163
42
keystone_ec2_url = {{ keystone_ec2_url }}
46
keystone_ec2_url = {{ keystone_ec2_url }}
164
43
{% endif -%}
47
{% endif -%}
165
44
48
166
=== added file 'unit_tests/test_nova_cc_contexts.py'
167
--- unit_tests/test_nova_cc_contexts.py	1970-01-01 00:00:00 +0000
168
+++ unit_tests/test_nova_cc_contexts.py	2014-12-16 14:11:00 +0000
169
@@ -0,0 +1,87 @@
170
1
from __future__ import print_function
171
2
172
3
import mock
173
4
174
5
#####
175
6
# NOTE(freyes): this is a workaround to patch config() function imported by
176
7
# nova_cc_utils before it gets a reference to the actual config() provided by
177
8
# hookenv module.
178
9
from charmhelpers.core import hookenv
179
10
_conf = hookenv.config
180
11
hookenv.config = mock.MagicMock()
181
12
import nova_cc_utils as _utils
182
13
# this assert is a double check + to avoid pep8 warning
183
14
assert _utils.config == hookenv.config
184
15
hookenv.config = _conf
185
16
#####
186
17
187
18
import nova_cc_context as context
188
19
189
20
from charmhelpers.contrib.openstack import utils
190
21
191
22
from test_utils import CharmTestCase
192
23
193
24
194
25
TO_PATCH = [
195
26
    'apt_install',
196
27
    'filter_installed_packages',
197
28
    'relation_ids',
198
29
    'relation_get',
199
30
    'related_units',
200
31
    'config',
201
32
    'log',
202
33
    'unit_get',
203
34
    'relations_for_id',
204
35
]
205
36
206
37
207
38
def fake_log(msg, level=None):
208
39
    level = level or 'INFO'
209
40
    print('[juju test log (%s)] %s' % (level, msg))
210
41
211
42
212
43
class NovaComputeContextTests(CharmTestCase):
213
44
    def setUp(self):
214
45
        super(NovaComputeContextTests, self).setUp(context, TO_PATCH)
215
46
        self.relation_get.side_effect = self.test_relation.get
216
47
        self.config.side_effect = self.test_config.get
217
48
        self.log.side_effect = fake_log
218
49
219
50
    @mock.patch.object(utils, 'os_release')
220
51
    @mock.patch('charmhelpers.contrib.network.ip.log')
221
52
    def test_instance_console_context_without_memcache(self, os_release, log_):
222
53
        self.unit_get.return_value = '127.0.0.1'
223
54
        self.relation_ids.return_value = 'cache:0'
224
55
        self.related_units.return_value = 'memcached/0'
225
56
        instance_console = context.InstanceConsoleContext()
226
57
        os_release.return_value = 'icehouse'
227
58
        self.assertEqual({'memcached_servers': ''},
228
59
                         instance_console())
229
60
230
61
    @mock.patch.object(utils, 'os_release')
231
62
    @mock.patch('charmhelpers.contrib.network.ip.log')
232
63
    def test_instance_console_context_with_memcache(self, os_release, log_):
233
64
        self.check_instance_console_context_with_memcache(os_release,
234
65
                                                          '127.0.1.1',
235
66
                                                          '127.0.1.1')
236
67
237
68
    @mock.patch.object(utils, 'os_release')
238
69
    @mock.patch('charmhelpers.contrib.network.ip.log')
239
70
    def test_instance_console_context_with_memcache_ipv6(self, os_release,
240
71
                                                         log_):
241
72
        self.check_instance_console_context_with_memcache(os_release, '::1',
242
73
                                                          '[::1]')
243
74
244
75
    def check_instance_console_context_with_memcache(self, os_release, ip,
245
76
                                                     formated_ip):
246
77
        memcached_servers = [{'private-address': formated_ip,
247
78
                              'port': '11211'}]
248
79
        self.unit_get.return_value = ip
249
80
        self.relation_ids.return_value = ['cache:0']
250
81
        self.relations_for_id.return_value = memcached_servers
251
82
        self.related_units.return_value = 'memcached/0'
252
83
        instance_console = context.InstanceConsoleContext()
253
84
        os_release.return_value = 'icehouse'
254
85
        self.maxDiff = None
255
86
        self.assertEqual({'memcached_servers': "%s:11211" % (formated_ip, )},
256
87
                         instance_console())
257
0
88
258
=== modified file 'unit_tests/test_nova_cc_hooks.py'
259
--- unit_tests/test_nova_cc_hooks.py	2014-10-21 13:18:47 +0000
260
+++ unit_tests/test_nova_cc_hooks.py	2014-12-16 14:11:00 +0000
261
@@ -1,6 +1,7 @@
262
1
from mock import MagicMock, patch, call
1
from mock import MagicMock, patch, call
263
2
from test_utils import CharmTestCase, patch_open
2
from test_utils import CharmTestCase, patch_open
264
3
import os
3
import os
265
4
266
4
with patch('charmhelpers.core.hookenv.config') as config:
5
with patch('charmhelpers.core.hookenv.config') as config:
267
5
    config.return_value = 'neutron'
6
    config.return_value = 'neutron'
268
6
    import nova_cc_utils as utils
7
    import nova_cc_utils as utils
Reviewer	Date Requested	Status
Jorge Niedbalski (community)	2014-12-16	Approve on 2014-12-17
Edward Hope-Morley	2014-12-16	Pending
James Troup	2014-12-16	Pending
OpenStack Charmers	2014-12-16	Pending
Review via email: mp+244857@code.launchpad.net