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