1
=== modified file 'config.yaml'
2
--- config.yaml	2016-01-22 13:29:40 +0000
3
+++ config.yaml	2016-02-23 15:58:17 +0000
4
@@ -153,3 +153,15 @@
5
153
    description: |
153
    description: |
6
154
       Connect timeout configuration in ms for haproxy, used in HA
154
       Connect timeout configuration in ms for haproxy, used in HA
7
155
       configurations. If not provided, default value of 5000ms is used.
155
       configurations. If not provided, default value of 5000ms is used.
8
156
  prefer-ipv6:
9
157
    type: boolean
10
158
    default: False
11
159
    description: |
12
160
      If True enables IPv6 support. The charm will expect network interfaces
13
161
      to be configured with an IPv6 address. If set to False (default) IPv4
14
162
      is expected.
15
163
      .
16
164
      NOTE: these charms do not currently support IPv6 privacy extension. In
17
165
      order for this charm to function correctly, the privacy extension must be
18
166
      disabled and a non-temporary address must be configured/available on
19
167
      your network interface.
20
156
168
21
=== modified file 'hooks/ceph_radosgw_context.py'
22
--- hooks/ceph_radosgw_context.py	2016-01-11 12:21:07 +0000
23
+++ hooks/ceph_radosgw_context.py	2016-02-23 15:58:17 +0000
24
@@ -1,3 +1,11 @@
25
1
import os
26
2
import re
27
3
import socket
28
4
import tempfile
29
5
import glob
30
6
import shutil
31
7
import subprocess
32
8
33
1
from charmhelpers.contrib.openstack import context
9
from charmhelpers.contrib.openstack import context
34
2
from charmhelpers.contrib.hahelpers.cluster import (
10
from charmhelpers.contrib.hahelpers.cluster import (
35
3
    determine_api_port,
11
    determine_api_port,
36
@@ -5,17 +13,69 @@
37
5
)
13
)
38
6
from charmhelpers.core.host import cmp_pkgrevno
14
from charmhelpers.core.host import cmp_pkgrevno
39
7
from charmhelpers.core.hookenv import (
15
from charmhelpers.core.hookenv import (
40
16
    DEBUG,
41
8
    WARNING,
17
    WARNING,
42
9
    config,
18
    config,
43
10
    log,
19
    log,
44
11
    relation_ids,
20
    relation_ids,
45
12
    related_units,
21
    related_units,
46
13
    relation_get,
22
    relation_get,
52
14
    unit_get,
23
    status_set,
53
15
)
24
)
54
16
import os
25
from charmhelpers.contrib.network.ip import (
55
17
import socket
26
    format_ipv6_addr,
56
18
import dns.resolver
27
    get_host_ip,
57
28
    get_ipv6_addr,
58
29
)
59
30
60
31
61
32
def is_apache_24():
62
33
    if os.path.exists('/etc/apache2/conf-available'):
63
34
        return True
64
35
    else:
65
36
        return False
66
37
67
38
68
39
class ApacheContext(context.OSContextGenerator):
69
40
    interfaces = ['http']
70
41
    service_namespace = 'ceph-radosgw'
71
42
72
43
    def __call__(self):
73
44
        ctxt = {}
74
45
        if config('use-embedded-webserver'):
75
46
            log("Skipping ApacheContext since we are using the embedded "
76
47
                "webserver")
77
48
            return {}
78
49
79
50
        status_set('maintenance', 'configuring apache')
80
51
81
52
        src = 'files/www/*'
82
53
        dst = '/var/www/'
83
54
        log("Installing www scripts", level=DEBUG)
84
55
        try:
85
56
            for x in glob.glob(src):
86
57
                shutil.copy(x, dst)
87
58
        except IOError as e:
88
59
            log("Error copying files from '%s' to '%s': %s" % (src, dst, e),
89
60
                level=WARNING)
90
61
91
62
        try:
92
63
            subprocess.check_call(['a2enmod', 'fastcgi'])
93
64
            subprocess.check_call(['a2enmod', 'rewrite'])
94
65
        except subprocess.CalledProcessError as e:
95
66
            log("Error enabling apache modules - %s" % e, level=WARNING)
96
67
97
68
        try:
98
69
            if is_apache_24():
99
70
                subprocess.check_call(['a2dissite', '000-default'])
100
71
            else:
101
72
                subprocess.check_call(['a2dissite', 'default'])
102
73
        except subprocess.CalledProcessError as e:
103
74
            log("Error disabling apache sites - %s" % e, level=WARNING)
104
75
105
76
        ctxt['hostname'] = socket.gethostname()
106
77
        ctxt['port'] = determine_api_port(config('port'), singlenode_mode=True)
107
78
        return ctxt
108
19
79
109
20
80
110
21
class HAProxyContext(context.HAProxyContext):
81
class HAProxyContext(context.HAProxyContext):
111
@@ -66,24 +126,60 @@
112
66
        return {}
126
        return {}
113
67
127
114
68
128
115
129
def ensure_host_resolvable_v6(hostname):
116
130
    """Ensure that we can resolve our hostname to an IPv6 address by adding it
117
131
    to /etc/hosts if it is not already resolvable.
118
132
    """
119
133
    try:
120
134
        socket.getaddrinfo(hostname, None, socket.AF_INET6)
121
135
    except socket.gaierror:
122
136
        log("Host '%s' is not ipv6 resolvable - adding to /etc/hosts" %
123
137
            hostname, level=DEBUG)
124
138
    else:
125
139
        log("Host '%s' appears to be ipv6 resolvable" % (hostname),
126
140
            level=DEBUG)
127
141
        return
128
142
129
143
    # This must be the backend address used by haproxy
130
144
    host_addr = get_ipv6_addr(exc_list=[config('vip')])[0]
131
145
    dtmp = tempfile.mkdtemp()
132
146
    try:
133
147
        tmp_hosts = os.path.join(dtmp, 'hosts')
134
148
        shutil.copy('/etc/hosts', tmp_hosts)
135
149
        with open(tmp_hosts, 'a+') as fd:
136
150
            lines = fd.readlines()
137
151
            for line in lines:
138
152
                key = "^%s\s+" % (host_addr)
139
153
                if re.search(key, line):
140
154
                    break
141
155
            else:
142
156
                fd.write("%s\t%s\n" % (host_addr, hostname))
143
157
144
158
            os.rename(tmp_hosts, '/etc/hosts')
145
159
    finally:
146
160
        shutil.rmtree(dtmp)
147
161
148
162
149
69
class MonContext(context.OSContextGenerator):
163
class MonContext(context.OSContextGenerator):
150
70
    interfaces = ['ceph-radosgw']
164
    interfaces = ['ceph-radosgw']
151
71
165
152
72
    def __call__(self):
166
    def __call__(self):
153
73
        if not relation_ids('mon'):
167
        if not relation_ids('mon'):
154
74
            return {}
168
            return {}
156
75
        hosts = []
169
        mon_hosts = []
157
76
        auths = []
170
        auths = []
158
77
        for relid in relation_ids('mon'):
171
        for relid in relation_ids('mon'):
159
78
            for unit in related_units(relid):
172
            for unit in related_units(relid):
160
79
                ceph_public_addr = relation_get('ceph-public-address', unit,
173
                ceph_public_addr = relation_get('ceph-public-address', unit,
161
80
                                                relid)
174
                                                relid)
162
81
                if ceph_public_addr:
175
                if ceph_public_addr:
165
82
                    host_ip = self.get_host_ip(ceph_public_addr)
176
                    host_ip = format_ipv6_addr(ceph_public_addr) or \
166
83
                    hosts.append('{}:6789'.format(host_ip))
177
                        get_host_ip(ceph_public_addr)
167
178
                    mon_hosts.append('{}:6789'.format(host_ip))
168
84
                    _auth = relation_get('auth', unit, relid)
179
                    _auth = relation_get('auth', unit, relid)
169
85
                    if _auth:
180
                    if _auth:
170
86
                        auths.append(_auth)
181
                        auths.append(_auth)
171
182
172
87
        if len(set(auths)) != 1:
183
        if len(set(auths)) != 1:
173
88
            e = ("Inconsistent or absent auth returned by mon units. Setting "
184
            e = ("Inconsistent or absent auth returned by mon units. Setting "
174
89
                 "auth_supported to 'none'")
185
                 "auth_supported to 'none'")
175
@@ -91,17 +187,28 @@
176
91
            auth = 'none'
187
            auth = 'none'
177
92
        else:
188
        else:
178
93
            auth = auths[0]
189
            auth = auths[0]
180
94
        hosts.sort()
190
181
191
        # /etc/init.d/radosgw mandates that a dns name is used for this
182
192
        # parameter so ensure that address is resolvable
183
193
        host = socket.gethostname()
184
194
        if config('prefer-ipv6'):
185
195
            ensure_host_resolvable_v6(host)
186
196
187
197
        port = determine_apache_port(config('port'), singlenode_mode=True)
188
198
        if config('prefer-ipv6'):
189
199
            port = "[::]:%s" % (port)
190
200
191
201
        mon_hosts.sort()
192
95
        ctxt = {
202
        ctxt = {
193
96
            'auth_supported': auth,
203
            'auth_supported': auth,
196
97
            'mon_hosts': ' '.join(hosts),
204
            'mon_hosts': ' '.join(mon_hosts),
197
98
            'hostname': socket.gethostname(),
205
            'hostname': host,
198
99
            'old_auth': cmp_pkgrevno('radosgw', "0.51") < 0,
206
            'old_auth': cmp_pkgrevno('radosgw', "0.51") < 0,
199
100
            'use_syslog': str(config('use-syslog')).lower(),
207
            'use_syslog': str(config('use-syslog')).lower(),
200
101
            'embedded_webserver': config('use-embedded-webserver'),
208
            'embedded_webserver': config('use-embedded-webserver'),
201
102
            'loglevel': config('loglevel'),
209
            'loglevel': config('loglevel'),
204
103
            'port': determine_apache_port(config('port'),
210
            'port': port,
205
104
                                          singlenode_mode=True)
211
            'ipv6': config('prefer-ipv6')
206
105
        }
212
        }
207
106
213
208
107
        certs_path = '/var/lib/ceph/nss'
214
        certs_path = '/var/lib/ceph/nss'
209
@@ -121,17 +228,3 @@
210
121
            return ctxt
228
            return ctxt
211
122
229
212
123
        return {}
230
        return {}
213
124
214
125
    def get_host_ip(self, hostname=None):
215
126
        try:
216
127
            if not hostname:
217
128
                hostname = unit_get('private-address')
218
129
            # Test to see if already an IPv4 address
219
130
            socket.inet_aton(hostname)
220
131
            return hostname
221
132
        except socket.error:
222
133
            # This may throw an NXDOMAIN exception; in which case
223
134
            # things are badly broken so just let it kill the hook
224
135
            answers = dns.resolver.query(hostname, 'A')
225
136
            if answers:
226
137
                return answers[0].address
227
138
231
228
=== modified file 'hooks/hooks.py'
229
--- hooks/hooks.py	2016-02-17 16:02:22 +0000
230
+++ hooks/hooks.py	2016-02-23 15:58:17 +0000
231
@@ -1,17 +1,16 @@
232
1
#!/usr/bin/python
1
#!/usr/bin/python
233
2
234
3
#
2
#
236
4
# Copyright 2012 Canonical Ltd.
3
# Copyright 2016 Canonical Ltd.
237
5
#
4
#
238
6
# Authors:
5
# Authors:
239
7
#  James Page <james.page@ubuntu.com>
6
#  James Page <james.page@ubuntu.com>
240
7
#  Edward Hope-Morley <edward.hope-morley@canonical.com>
241
8
#
8
#
242
9
9
244
10
import shutil
10
import os
245
11
import subprocess
11
import subprocess
246
12
import sys
12
import sys
249
13
import glob
13
248
14
import os
250
15
import ceph
14
import ceph
251
16
15
252
17
from charmhelpers.core.hookenv import (
16
from charmhelpers.core.hookenv import (
253
@@ -39,27 +38,17 @@
254
39
    lsb_release,
38
    lsb_release,
255
40
    restart_on_change,
39
    restart_on_change,
256
41
)
40
)
257
42
from charmhelpers.contrib.hahelpers.cluster import (
258
43
    determine_apache_port,
259
44
)
260
45
from utils import (
261
46
    render_template,
262
47
    enable_pocket,
263
48
    is_apache_24,
264
49
    CEPHRG_HA_RES,
265
50
    register_configs,
266
51
    REQUIRED_INTERFACES,
267
52
    check_optional_relations,
268
53
)
269
54
from charmhelpers.payload.execd import execd_preinstall
41
from charmhelpers.payload.execd import execd_preinstall
270
55
from charmhelpers.core.host import (
42
from charmhelpers.core.host import (
271
56
    cmp_pkgrevno,
43
    cmp_pkgrevno,
272
57
    mkdir,
44
    mkdir,
273
58
)
45
)
274
59
275
60
from charmhelpers.contrib.network.ip import (
46
from charmhelpers.contrib.network.ip import (
276
47
    format_ipv6_addr,
277
48
    get_ipv6_addr,
278
61
    get_iface_for_address,
49
    get_iface_for_address,
279
62
    get_netmask_for_address,
50
    get_netmask_for_address,
280
51
    is_ipv6,
281
63
)
52
)
282
64
from charmhelpers.contrib.openstack.ip import (
53
from charmhelpers.contrib.openstack.ip import (
283
65
    canonical_url,
54
    canonical_url,
284
@@ -72,18 +61,17 @@
285
72
    send_request_if_needed,
61
    send_request_if_needed,
286
73
    is_request_complete,
62
    is_request_complete,
287
74
)
63
)
290
75
64
from utils import (
291
76
APACHE_PORTS_CONF = '/etc/apache2/ports.conf'
65
    enable_pocket,
292
66
    CEPHRG_HA_RES,
293
67
    register_configs,
294
68
    REQUIRED_INTERFACES,
295
69
    check_optional_relations,
296
70
    setup_ipv6,
297
71
)
298
77
72
299
78
hooks = Hooks()
73
hooks = Hooks()
300
79
CONFIGS = register_configs()
74
CONFIGS = register_configs()
301
80
302
81
303
82
def install_www_scripts():
304
83
    for x in glob.glob('files/www/*'):
305
84
        shutil.copy(x, '/var/www/')
306
85
307
86
308
87
NSS_DIR = '/var/lib/ceph/nss'
75
NSS_DIR = '/var/lib/ceph/nss'
309
88
76
310
89
77
311
@@ -145,43 +133,6 @@
312
145
        os.makedirs('/etc/ceph')
133
        os.makedirs('/etc/ceph')
313
146
134
314
147
135
315
148
def emit_apacheconf():
316
149
    apachecontext = {
317
150
        "hostname": unit_get('private-address'),
318
151
        "port": determine_apache_port(config('port'), singlenode_mode=True)
319
152
    }
320
153
    site_conf = '/etc/apache2/sites-available/rgw'
321
154
    if is_apache_24():
322
155
        site_conf = '/etc/apache2/sites-available/rgw.conf'
323
156
    with open(site_conf, 'w') as apacheconf:
324
157
        apacheconf.write(render_template('rgw', apachecontext))
325
158
326
159
327
160
def apache_sites():
328
161
    if is_apache_24():
329
162
        subprocess.check_call(['a2dissite', '000-default'])
330
163
    else:
331
164
        subprocess.check_call(['a2dissite', 'default'])
332
165
    subprocess.check_call(['a2ensite', 'rgw'])
333
166
334
167
335
168
def apache_modules():
336
169
    subprocess.check_call(['a2enmod', 'fastcgi'])
337
170
    subprocess.check_call(['a2enmod', 'rewrite'])
338
171
339
172
340
173
def apache_reload():
341
174
    subprocess.call(['service', 'apache2', 'reload'])
342
175
343
176
344
177
def apache_ports():
345
178
    portscontext = {
346
179
        "port": determine_apache_port(config('port'), singlenode_mode=True)
347
180
    }
348
181
    with open(APACHE_PORTS_CONF, 'w') as portsconf:
349
182
        portsconf.write(render_template('ports.conf', portscontext))
350
183
351
184
352
185
def setup_keystone_certs(unit=None, rid=None):
136
def setup_keystone_certs(unit=None, rid=None):
353
186
    """
137
    """
354
187
    Get CA and signing certs from Keystone used to decrypt revoked token list.
138
    Get CA and signing certs from Keystone used to decrypt revoked token list.
355
@@ -213,6 +164,9 @@
356
213
    for key in required_keys:
164
    for key in required_keys:
357
214
        settings[key] = rdata.get(key)
165
        settings[key] = rdata.get(key)
358
215
166
359
167
    if is_ipv6(settings.get('auth_host')):
360
168
        settings['auth_host'] = format_ipv6_addr(settings.get('auth_host'))
361
169
362
216
    if not all(settings.values()):
170
    if not all(settings.values()):
363
217
        log("Missing relation settings (%s) - skipping cert setup" %
171
        log("Missing relation settings (%s) - skipping cert setup" %
364
218
            (', '.join([k for k in settings.keys() if not settings[k]])),
172
            (', '.join([k for k in settings.keys() if not settings[k]])),
365
@@ -288,18 +242,28 @@
366
288
                    '/etc/haproxy/haproxy.cfg': ['haproxy']})
242
                    '/etc/haproxy/haproxy.cfg': ['haproxy']})
367
289
def config_changed():
243
def config_changed():
368
290
    install_packages()
244
    install_packages()
369
245
370
246
    if config('prefer-ipv6'):
371
247
        status_set('maintenance', 'configuring ipv6')
372
248
        setup_ipv6()
373
249
374
250
    for r_id in relation_ids('identity-service'):
375
251
        identity_changed(relid=r_id)
376
252
377
253
    for r_id in relation_ids('cluster'):
378
254
        cluster_joined(rid=r_id)
379
255
380
291
    CONFIGS.write_all()
256
    CONFIGS.write_all()
381
257
382
292
    if not config('use-embedded-webserver'):
258
    if not config('use-embedded-webserver'):
390
293
        status_set('maintenance', 'configuring apache')
259
        try:
391
294
        emit_apacheconf()
260
            subprocess.check_call(['a2ensite', 'rgw'])
392
295
        install_www_scripts()
261
        except subprocess.CalledProcessError as e:
393
296
        apache_sites()
262
            log("Error enabling apache module 'rgw' - %s" % e, level=WARNING)
387
297
        apache_modules()
388
298
        apache_ports()
389
299
        apache_reload()
394
300
263
397
301
    for r_id in relation_ids('identity-service'):
264
        # Ensure started but do a soft reload
398
302
        identity_changed(relid=r_id)
265
        subprocess.call(['service', 'apache2', 'start'])
399
266
        subprocess.call(['service', 'apache2', 'reload'])
400
303
267
401
304
268
402
305
@hooks.hook('mon-relation-departed',
269
@hooks.hook('mon-relation-departed',
403
@@ -373,8 +337,18 @@
404
373
    restart()
337
    restart()
405
374
338
406
375
339
409
376
@hooks.hook('cluster-relation-changed',
340
@hooks.hook('cluster-relation-joined')
410
377
            'cluster-relation-joined')
341
@restart_on_change({'/etc/haproxy/haproxy.cfg': ['haproxy']})
411
342
def cluster_joined(rid=None):
412
343
    settings = {}
413
344
    if config('prefer-ipv6'):
414
345
        private_addr = get_ipv6_addr(exc_list=[config('vip')])[0]
415
346
        settings['private-address'] = private_addr
416
347
417
348
    relation_set(relation_id=rid, **settings)
418
349
419
350
420
351
@hooks.hook('cluster-relation-changed')
421
378
@restart_on_change({'/etc/haproxy/haproxy.cfg': ['haproxy']})
352
@restart_on_change({'/etc/haproxy/haproxy.cfg': ['haproxy']})
422
379
def cluster_changed():
353
def cluster_changed():
423
380
    CONFIGS.write_all()
354
    CONFIGS.write_all()
424
@@ -384,17 +358,12 @@
425
384
358
426
385
@hooks.hook('ha-relation-joined')
359
@hooks.hook('ha-relation-joined')
427
386
def ha_relation_joined():
360
def ha_relation_joined():
428
387
    # Obtain the config values necessary for the cluster config. These
429
388
    # include multicast port and interface to bind to.
430
389
    corosync_bindiface = config('ha-bindiface')
431
390
    corosync_mcastport = config('ha-mcastport')
432
391
    vip = config('vip')
361
    vip = config('vip')
433
392
    if not vip:
362
    if not vip:
436
393
        log('Unable to configure hacluster as vip not provided',
363
        log('Unable to configure hacluster as vip not provided', level=ERROR)
435
394
            level=ERROR)
437
395
        sys.exit(1)
364
        sys.exit(1)
438
365
439
396
    # Obtain resources
366
    # Obtain resources
440
397
    # SWIFT_HA_RES = 'grp_swift_vips'
441
398
    resources = {
367
    resources = {
442
399
        'res_cephrg_haproxy': 'lsb:haproxy'
368
        'res_cephrg_haproxy': 'lsb:haproxy'
443
400
    }
369
    }
444
@@ -404,15 +373,25 @@
445
404
373
446
405
    vip_group = []
374
    vip_group = []
447
406
    for vip in vip.split():
375
    for vip in vip.split():
448
376
        if is_ipv6(vip):
449
377
            res_rgw_vip = 'ocf:heartbeat:IPv6addr'
450
378
            vip_params = 'ipv6addr'
451
379
        else:
452
380
            res_rgw_vip = 'ocf:heartbeat:IPaddr2'
453
381
            vip_params = 'ip'
454
382
455
407
        iface = get_iface_for_address(vip)
383
        iface = get_iface_for_address(vip)
456
384
        netmask = get_netmask_for_address(vip)
457
385
458
408
        if iface is not None:
386
        if iface is not None:
459
409
            vip_key = 'res_cephrg_{}_vip'.format(iface)
387
            vip_key = 'res_cephrg_{}_vip'.format(iface)
461
410
            resources[vip_key] = 'ocf:heartbeat:IPaddr2'
388
            resources[vip_key] = res_rgw_vip
462
411
            resource_params[vip_key] = (
389
            resource_params[vip_key] = (
465
412
                'params ip="{vip}" cidr_netmask="{netmask}"'
390
                'params {ip}="{vip}" cidr_netmask="{netmask}"'
466
413
                ' nic="{iface}"'.format(vip=vip,
391
                ' nic="{iface}"'.format(ip=vip_params,
467
392
                                        vip=vip,
468
414
                                        iface=iface,
393
                                        iface=iface,
470
415
                                        netmask=get_netmask_for_address(vip))
394
                                        netmask=netmask)
471
416
            )
395
            )
472
417
            vip_group.append(vip_key)
396
            vip_group.append(vip_key)
473
418
397
474
@@ -426,6 +405,11 @@
475
426
        'cl_cephrg_haproxy': 'res_cephrg_haproxy'
405
        'cl_cephrg_haproxy': 'res_cephrg_haproxy'
476
427
    }
406
    }
477
428
407
478
408
    # Obtain the config values necessary for the cluster config. These
479
409
    # include multicast port and interface to bind to.
480
410
    corosync_bindiface = config('ha-bindiface')
481
411
    corosync_mcastport = config('ha-mcastport')
482
412
483
429
    relation_set(init_services=init_services,
413
    relation_set(init_services=init_services,
484
430
                 corosync_bindiface=corosync_bindiface,
414
                 corosync_bindiface=corosync_bindiface,
485
431
                 corosync_mcastport=corosync_mcastport,
415
                 corosync_mcastport=corosync_mcastport,
486
432
416
487
=== modified file 'hooks/utils.py'
488
--- hooks/utils.py	2015-10-12 10:56:01 +0000
489
+++ hooks/utils.py	2016-02-23 15:58:17 +0000
490
@@ -1,26 +1,43 @@
491
1
#
1
#
493
2
# Copyright 2012 Canonical Ltd.
2
# Copyright 2016 Canonical Ltd.
494
3
#
3
#
495
4
# Authors:
4
# Authors:
496
5
#  James Page <james.page@ubuntu.com>
5
#  James Page <james.page@ubuntu.com>
497
6
#  Paul Collins <paul.collins@canonical.com>
6
#  Paul Collins <paul.collins@canonical.com>
498
7
#  Edward Hope-Morley <edward.hope-morley@canonical.com>
499
7
#
8
#
500
8
9
501
9
import socket
502
10
import re
10
import re
503
11
import os
504
12
import dns.resolver
505
13
import jinja2
11
import jinja2
506
12
507
14
from copy import deepcopy
13
from copy import deepcopy
508
15
from collections import OrderedDict
14
from collections import OrderedDict
512
16
from charmhelpers.core.hookenv import unit_get, relation_ids, status_get
15
513
17
from charmhelpers.contrib.openstack import context, templating
16
import ceph_radosgw_context
514
18
from charmhelpers.contrib.openstack.utils import set_os_workload_status
17
515
18
from charmhelpers.core.hookenv import (
516
19
    relation_ids,
517
20
    status_get,
518
21
)
519
22
from charmhelpers.contrib.openstack import (
520
23
    context,
521
24
    templating,
522
25
)
523
26
from charmhelpers.contrib.openstack.utils import (
524
27
    os_release,
525
28
    set_os_workload_status,
526
29
)
527
19
from charmhelpers.contrib.hahelpers.cluster import get_hacluster_config
30
from charmhelpers.contrib.hahelpers.cluster import get_hacluster_config
532
20
from charmhelpers.core.host import cmp_pkgrevno
31
from charmhelpers.core.host import (
533
21
from charmhelpers.fetch import filter_installed_packages
32
    cmp_pkgrevno,
534
22
33
    lsb_release,
535
23
import ceph_radosgw_context
34
)
536
35
from charmhelpers.fetch import (
537
36
    apt_install,
538
37
    apt_update,
539
38
    add_source,
540
39
    filter_installed_packages,
541
40
)
542
24
41
543
25
# The interface is said to be satisfied if anyone of the interfaces in the
42
# The interface is said to be satisfied if anyone of the interfaces in the
544
26
# list has a complete context.
43
# list has a complete context.
545
@@ -32,6 +49,9 @@
546
32
TEMPLATES = 'templates/'
49
TEMPLATES = 'templates/'
547
33
HAPROXY_CONF = '/etc/haproxy/haproxy.cfg'
50
HAPROXY_CONF = '/etc/haproxy/haproxy.cfg'
548
34
CEPH_CONF = '/etc/ceph/ceph.conf'
51
CEPH_CONF = '/etc/ceph/ceph.conf'
549
52
APACHE_CONF = '/etc/apache2/sites-available/rgw'
550
53
APACHE_24_CONF = '/etc/apache2/sites-available/rgw.conf'
551
54
APACHE_PORTS_CONF = '/etc/apache2/ports.conf'
552
35
55
553
36
BASE_RESOURCE_MAP = OrderedDict([
56
BASE_RESOURCE_MAP = OrderedDict([
554
37
    (HAPROXY_CONF, {
57
    (HAPROXY_CONF, {
555
@@ -39,6 +59,18 @@
556
39
                     ceph_radosgw_context.HAProxyContext()],
59
                     ceph_radosgw_context.HAProxyContext()],
557
40
        'services': ['haproxy'],
60
        'services': ['haproxy'],
558
41
    }),
61
    }),
559
62
    (APACHE_CONF, {
560
63
        'contexts': [ceph_radosgw_context.ApacheContext()],
561
64
        'services': ['apache2'],
562
65
    }),
563
66
    (APACHE_24_CONF, {
564
67
        'contexts': [ceph_radosgw_context.ApacheContext()],
565
68
        'services': ['apache2'],
566
69
    }),
567
70
    (APACHE_PORTS_CONF, {
568
71
        'contexts': [ceph_radosgw_context.ApacheContext()],
569
72
        'services': ['apache2'],
570
73
    }),
571
42
    (CEPH_CONF, {
74
    (CEPH_CONF, {
572
43
        'contexts': [ceph_radosgw_context.MonContext()],
75
        'contexts': [ceph_radosgw_context.MonContext()],
573
44
        'services': ['radosgw'],
76
        'services': ['radosgw'],
574
@@ -92,28 +124,6 @@
575
92
                sources.write(line)
124
                sources.write(line)
576
93
125
577
94
126
578
95
def get_host_ip(hostname=None):
579
96
    try:
580
97
        if not hostname:
581
98
            hostname = unit_get('private-address')
582
99
        # Test to see if already an IPv4 address
583
100
        socket.inet_aton(hostname)
584
101
        return hostname
585
102
    except socket.error:
586
103
        # This may throw an NXDOMAIN exception; in which case
587
104
        # things are badly broken so just let it kill the hook
588
105
        answers = dns.resolver.query(hostname, 'A')
589
106
        if answers:
590
107
            return answers[0].address
591
108
592
109
593
110
def is_apache_24():
594
111
    if os.path.exists('/etc/apache2/conf-available'):
595
112
        return True
596
113
    else:
597
114
        return False
598
115
599
116
600
117
def check_optional_relations(configs):
127
def check_optional_relations(configs):
601
118
    required_interfaces = {}
128
    required_interfaces = {}
602
119
    if relation_ids('ha'):
129
    if relation_ids('ha'):
603
@@ -132,3 +142,18 @@
604
132
        return status_get()
142
        return status_get()
605
133
    else:
143
    else:
606
134
        return 'unknown', 'No optional relations'
144
        return 'unknown', 'No optional relations'
607
145
608
146
609
147
def setup_ipv6():
610
148
    ubuntu_rel = lsb_release()['DISTRIB_CODENAME'].lower()
611
149
    if ubuntu_rel < "trusty":
612
150
        raise Exception("IPv6 is not supported in the charms for Ubuntu "
613
151
                        "versions less than Trusty 14.04")
614
152
615
153
    # Need haproxy >= 1.5.3 for ipv6 so for Trusty if we are <= Kilo we need to
616
154
    # use trusty-backports otherwise we can use the UCA.
617
155
    if ubuntu_rel == 'trusty' and os_release('ceph-common') < 'liberty':
618
156
        add_source('deb http://archive.ubuntu.com/ubuntu trusty-backports '
619
157
                   'main')
620
158
        apt_update()
621
159
        apt_install('haproxy/trusty-backports', fatal=True)
622
135
160
623
=== modified file 'templates/ceph.conf'
624
--- templates/ceph.conf	2016-01-11 12:21:07 +0000
625
+++ templates/ceph.conf	2016-02-23 15:58:17 +0000
626
@@ -11,6 +11,9 @@
627
11
err to syslog = {{ use_syslog }}
11
err to syslog = {{ use_syslog }}
628
12
clog to syslog = {{ use_syslog }}
12
clog to syslog = {{ use_syslog }}
629
13
debug rgw = {{ loglevel }}/5
13
debug rgw = {{ loglevel }}/5
630
14
{% if ipv6 -%}
631
15
ms bind ipv6 = true
632
16
{% endif %}
633
14
17
634
15
[client.radosgw.gateway]
18
[client.radosgw.gateway]
635
16
host = {{ hostname }}
19
host = {{ hostname }}
636
17
20
637
=== added file 'templates/rgw.conf'
638
--- templates/rgw.conf	1970-01-01 00:00:00 +0000
639
+++ templates/rgw.conf	2016-02-23 15:58:17 +0000
640
@@ -0,0 +1,25 @@
641
1
<IfModule mod_fastcgi.c>
642
2
	FastCgiExternalServer /var/www/s3gw.fcgi -socket /tmp/radosgw.sock
643
3
</IfModule>
644
4
645
5
<VirtualHost *:{{ port }}>
646
6
	ServerName {{ hostname }}
647
7
	ServerAdmin ceph@ubuntu.com
648
8
	DocumentRoot /var/www
649
9
	RewriteEngine On
650
10
	RewriteRule ^/([a-zA-Z0-9-_.]*)([/]?.*) /s3gw.fcgi?page=$1&params=$2&%{QUERY_STRING} [E=HTTP_AUTHORIZATION:%{HTTP:Authorization},L]
651
11
	<IfModule mod_fastcgi.c>
652
12
		<Directory /var/www>
653
13
			Options +ExecCGI
654
14
			AllowOverride All
655
15
			SetHandler fastcgi-script
656
16
			Order allow,deny
657
17
			Allow from all
658
18
			AuthBasicAuthoritative Off
659
19
		</Directory>
660
20
	</IfModule>
661
21
	AllowEncodedSlashes On
662
22
	ErrorLog /var/log/apache2/error.log
663
23
	CustomLog /var/log/apache2/access.log combined
664
24
	ServerSignature Off
665
25
</VirtualHost>
666
0
26
667
=== modified file 'unit_tests/test_ceph_radosgw_context.py'
668
--- unit_tests/test_ceph_radosgw_context.py	2016-02-17 22:46:07 +0000
669
+++ unit_tests/test_ceph_radosgw_context.py	2016-02-23 15:58:17 +0000
670
@@ -13,6 +13,7 @@
671
13
    'related_units',
13
    'related_units',
672
14
    'cmp_pkgrevno',
14
    'cmp_pkgrevno',
673
15
    'socket',
15
    'socket',
674
16
    'is_apache_24',
675
16
]
17
]
676
17
18
677
18
19
678
@@ -147,8 +148,9 @@
679
147
        super(MonContextTest, self).setUp(context, TO_PATCH)
148
        super(MonContextTest, self).setUp(context, TO_PATCH)
680
148
        self.config.side_effect = self.test_config.get
149
        self.config.side_effect = self.test_config.get
681
149
150
684
150
    def test_ctxt(self):
151
    @patch.object(context, 'ensure_host_resolvable_v6')
685
151
        self.socket.gethostname.return_value = '10.0.0.10'
152
    def test_ctxt(self, mock_ensure_rsv_v6):
686
153
        self.socket.gethostname.return_value = 'testhost'
687
152
        mon_ctxt = context.MonContext()
154
        mon_ctxt = context.MonContext()
688
153
        addresses = ['10.5.4.1', '10.5.4.2', '10.5.4.3']
155
        addresses = ['10.5.4.1', '10.5.4.2', '10.5.4.3']
689
154
156
690
@@ -157,6 +159,7 @@
691
157
                return addresses.pop()
159
                return addresses.pop()
692
158
            elif attr == 'auth':
160
            elif attr == 'auth':
693
159
                return 'cephx'
161
                return 'cephx'
694
162
695
160
        self.relation_get.side_effect = _relation_get
163
        self.relation_get.side_effect = _relation_get
696
161
        self.relation_ids.return_value = ['mon:6']
164
        self.relation_ids.return_value = ['mon:6']
697
162
        self.related_units.return_value = ['ceph/0', 'ceph/1', 'ceph/2']
165
        self.related_units.return_value = ['ceph/0', 'ceph/1', 'ceph/2']
698
@@ -164,17 +167,26 @@
699
164
            'auth_supported': 'cephx',
167
            'auth_supported': 'cephx',
700
165
            'embedded_webserver': False,
168
            'embedded_webserver': False,
701
166
            'disable_100_continue': True,
169
            'disable_100_continue': True,
703
167
            'hostname': '10.0.0.10',
170
            'hostname': 'testhost',
704
168
            'mon_hosts': '10.5.4.1:6789 10.5.4.2:6789 10.5.4.3:6789',
171
            'mon_hosts': '10.5.4.1:6789 10.5.4.2:6789 10.5.4.3:6789',
705
169
            'old_auth': False,
172
            'old_auth': False,
706
170
            'use_syslog': 'false',
173
            'use_syslog': 'false',
707
171
            'loglevel': 1,
174
            'loglevel': 1,
709
172
            'port': 70
175
            'port': 70,
710
176
            'ipv6': False
711
173
        }
177
        }
712
174
        self.assertEqual(expect, mon_ctxt())
178
        self.assertEqual(expect, mon_ctxt())
713
179
        self.assertFalse(mock_ensure_rsv_v6.called)
714
180
715
181
        self.test_config.set('prefer-ipv6', True)
716
182
        addresses = ['10.5.4.1', '10.5.4.2', '10.5.4.3']
717
183
        expect['ipv6'] = True
718
184
        expect['port'] = "[::]:%s" % (70)
719
185
        self.assertEqual(expect, mon_ctxt())
720
186
        self.assertTrue(mock_ensure_rsv_v6.called)
721
175
187
722
176
    def test_ctxt_missing_data(self):
188
    def test_ctxt_missing_data(self):
724
177
        self.socket.gethostname.return_value = '10.0.0.10'
189
        self.socket.gethostname.return_value = 'testhost'
725
178
        mon_ctxt = context.MonContext()
190
        mon_ctxt = context.MonContext()
726
179
        self.relation_get.return_value = None
191
        self.relation_get.return_value = None
727
180
        self.relation_ids.return_value = ['mon:6']
192
        self.relation_ids.return_value = ['mon:6']
728
@@ -182,7 +194,7 @@
729
182
        self.assertEqual({}, mon_ctxt())
194
        self.assertEqual({}, mon_ctxt())
730
183
195
731
184
    def test_ctxt_inconsistent_auths(self):
196
    def test_ctxt_inconsistent_auths(self):
733
185
        self.socket.gethostname.return_value = '10.0.0.10'
197
        self.socket.gethostname.return_value = 'testhost'
734
186
        mon_ctxt = context.MonContext()
198
        mon_ctxt = context.MonContext()
735
187
        addresses = ['10.5.4.1', '10.5.4.2', '10.5.4.3']
199
        addresses = ['10.5.4.1', '10.5.4.2', '10.5.4.3']
736
188
        auths = ['cephx', 'cephy', 'cephz']
200
        auths = ['cephx', 'cephy', 'cephz']
737
@@ -199,17 +211,18 @@
738
199
            'auth_supported': 'none',
211
            'auth_supported': 'none',
739
200
            'embedded_webserver': False,
212
            'embedded_webserver': False,
740
201
            'disable_100_continue': True,
213
            'disable_100_continue': True,
742
202
            'hostname': '10.0.0.10',
214
            'hostname': 'testhost',
743
203
            'mon_hosts': '10.5.4.1:6789 10.5.4.2:6789 10.5.4.3:6789',
215
            'mon_hosts': '10.5.4.1:6789 10.5.4.2:6789 10.5.4.3:6789',
744
204
            'old_auth': False,
216
            'old_auth': False,
745
205
            'use_syslog': 'false',
217
            'use_syslog': 'false',
746
206
            'loglevel': 1,
218
            'loglevel': 1,
748
207
            'port': 70
219
            'port': 70,
749
220
            'ipv6': False
750
208
        }
221
        }
751
209
        self.assertEqual(expect, mon_ctxt())
222
        self.assertEqual(expect, mon_ctxt())
752
210
223
753
211
    def test_ctxt_consistent_auths(self):
224
    def test_ctxt_consistent_auths(self):
755
212
        self.socket.gethostname.return_value = '10.0.0.10'
225
        self.socket.gethostname.return_value = 'testhost'
756
213
        mon_ctxt = context.MonContext()
226
        mon_ctxt = context.MonContext()
757
214
        addresses = ['10.5.4.1', '10.5.4.2', '10.5.4.3']
227
        addresses = ['10.5.4.1', '10.5.4.2', '10.5.4.3']
758
215
        auths = ['cephx', 'cephx', 'cephx']
228
        auths = ['cephx', 'cephx', 'cephx']
759
@@ -226,11 +239,19 @@
760
226
            'auth_supported': 'cephx',
239
            'auth_supported': 'cephx',
761
227
            'embedded_webserver': False,
240
            'embedded_webserver': False,
762
228
            'disable_100_continue': True,
241
            'disable_100_continue': True,
764
229
            'hostname': '10.0.0.10',
242
            'hostname': 'testhost',
765
230
            'mon_hosts': '10.5.4.1:6789 10.5.4.2:6789 10.5.4.3:6789',
243
            'mon_hosts': '10.5.4.1:6789 10.5.4.2:6789 10.5.4.3:6789',
766
231
            'old_auth': False,
244
            'old_auth': False,
767
232
            'use_syslog': 'false',
245
            'use_syslog': 'false',
768
233
            'loglevel': 1,
246
            'loglevel': 1,
770
234
            'port': 70
247
            'port': 70,
771
248
            'ipv6': False
772
235
        }
249
        }
773
236
        self.assertEqual(expect, mon_ctxt())
250
        self.assertEqual(expect, mon_ctxt())
774
251
775
252
776
253
class ApacheContextTest(CharmTestCase):
777
254
778
255
    def setUp(self):
779
256
        super(ApacheContextTest, self).setUp(context, TO_PATCH)
780
257
        self.config.side_effect = self.test_config.get
781
237
258
782
=== modified file 'unit_tests/test_hooks.py'
783
--- unit_tests/test_hooks.py	2016-01-22 13:29:40 +0000
784
+++ unit_tests/test_hooks.py	2016-02-23 15:58:17 +0000
785
@@ -6,7 +6,6 @@
786
6
6
787
7
from test_utils import (
7
from test_utils import (
788
8
    CharmTestCase,
8
    CharmTestCase,
789
9
    patch_open
790
10
)
9
)
791
11
from charmhelpers.contrib.openstack.ip import PUBLIC
10
from charmhelpers.contrib.openstack.ip import PUBLIC
792
12
11
793
@@ -34,8 +33,6 @@
794
34
    'enable_pocket',
33
    'enable_pocket',
795
35
    'get_iface_for_address',
34
    'get_iface_for_address',
796
36
    'get_netmask_for_address',
35
    'get_netmask_for_address',
797
37
    'glob',
798
38
    'is_apache_24',
799
39
    'log',
36
    'log',
800
40
    'lsb_release',
37
    'lsb_release',
801
41
    'open_port',
38
    'open_port',
802
@@ -44,8 +41,6 @@
803
44
    'relation_set',
41
    'relation_set',
804
45
    'relation_get',
42
    'relation_get',
805
46
    'related_units',
43
    'related_units',
806
47
    'render_template',
807
48
    'shutil',
808
49
    'status_set',
44
    'status_set',
809
50
    'subprocess',
45
    'subprocess',
810
51
    'sys',
46
    'sys',
811
@@ -62,11 +57,6 @@
812
62
        self.test_config.set('key', 'secretkey')
57
        self.test_config.set('key', 'secretkey')
813
63
        self.test_config.set('use-syslog', False)
58
        self.test_config.set('use-syslog', False)
814
64
59
815
65
    def test_install_www_scripts(self):
816
66
        self.glob.glob.return_value = ['files/www/bob']
817
67
        ceph_hooks.install_www_scripts()
818
68
        self.shutil.copy.assert_called_with('files/www/bob', '/var/www/')
819
69
820
70
    def test_install_ceph_optimised_packages(self):
60
    def test_install_ceph_optimised_packages(self):
821
71
        self.lsb_release.return_value = {'DISTRIB_CODENAME': 'vivid'}
61
        self.lsb_release.return_value = {'DISTRIB_CODENAME': 'vivid'}
822
72
        fastcgi_source = (
62
        fastcgi_source = (
823
@@ -122,69 +112,12 @@
824
122
        self.enable_pocket.assert_called_with('multiverse')
112
        self.enable_pocket.assert_called_with('multiverse')
825
123
        self.os.makedirs.called_with('/var/lib/ceph/nss')
113
        self.os.makedirs.called_with('/var/lib/ceph/nss')
826
124
114
827
125
    def test_emit_apacheconf(self):
828
126
        self.is_apache_24.return_value = True
829
127
        self.unit_get.return_value = '10.0.0.1'
830
128
        apachecontext = {
831
129
            "hostname": '10.0.0.1',
832
130
            "port": 70,
833
131
        }
834
132
        vhost_file = '/etc/apache2/sites-available/rgw.conf'
835
133
        with patch_open() as (_open, _file):
836
134
            ceph_hooks.emit_apacheconf()
837
135
            _open.assert_called_with(vhost_file, 'w')
838
136
            self.render_template.assert_called_with('rgw', apachecontext)
839
137
840
138
    def test_apache_sites24(self):
841
139
        self.is_apache_24.return_value = True
842
140
        ceph_hooks.apache_sites()
843
141
        calls = [
844
142
            call(['a2dissite', '000-default']),
845
143
            call(['a2ensite', 'rgw']),
846
144
        ]
847
145
        self.subprocess.check_call.assert_has_calls(calls)
848
146
849
147
    def test_apache_sites22(self):
850
148
        self.is_apache_24.return_value = False
851
149
        ceph_hooks.apache_sites()
852
150
        calls = [
853
151
            call(['a2dissite', 'default']),
854
152
            call(['a2ensite', 'rgw']),
855
153
        ]
856
154
        self.subprocess.check_call.assert_has_calls(calls)
857
155
858
156
    def test_apache_modules(self):
859
157
        ceph_hooks.apache_modules()
860
158
        calls = [
861
159
            call(['a2enmod', 'fastcgi']),
862
160
            call(['a2enmod', 'rewrite']),
863
161
        ]
864
162
        self.subprocess.check_call.assert_has_calls(calls)
865
163
866
164
    def test_apache_reload(self):
867
165
        ceph_hooks.apache_reload()
868
166
        calls = [
869
167
            call(['service', 'apache2', 'reload']),
870
168
        ]
871
169
        self.subprocess.call.assert_has_calls(calls)
872
170
873
171
    @patch.object(ceph_hooks, 'apache_ports', lambda *args: True)
874
172
    @patch.object(ceph_hooks, 'mkdir', lambda *args: None)
115
    @patch.object(ceph_hooks, 'mkdir', lambda *args: None)
875
173
    def test_config_changed(self):
116
    def test_config_changed(self):
876
174
        _install_packages = self.patch('install_packages')
117
        _install_packages = self.patch('install_packages')
877
175
        _emit_apacheconf = self.patch('emit_apacheconf')
878
176
        _install_www_scripts = self.patch('install_www_scripts')
879
177
        _apache_sites = self.patch('apache_sites')
880
178
        _apache_modules = self.patch('apache_modules')
881
179
        _apache_reload = self.patch('apache_reload')
882
180
        ceph_hooks.config_changed()
118
        ceph_hooks.config_changed()
883
181
        self.assertTrue(_install_packages.called)
119
        self.assertTrue(_install_packages.called)
884
182
        self.CONFIGS.write_all.assert_called_with()
120
        self.CONFIGS.write_all.assert_called_with()
885
183
        self.assertTrue(_emit_apacheconf.called)
886
184
        self.assertTrue(_install_www_scripts.called)
887
185
        self.assertTrue(_apache_sites.called)
888
186
        self.assertTrue(_apache_modules.called)
889
187
        self.assertTrue(_apache_reload.called)
890
188
121
891
189
    @patch.object(ceph_hooks, 'is_request_complete',
122
    @patch.object(ceph_hooks, 'is_request_complete',
892
190
                  lambda *args, **kwargs: True)
123
                  lambda *args, **kwargs: True)
Reviewer	Date Requested	Status
Liam Young (community)	2016-02-18	Needs Fixing on 2016-02-22
OpenStack Charmers	2016-02-22	Pending
Chris Holcombe	2016-02-18	Pending
Review via email: mp+286474@code.launchpad.net