← Back to branch summary

~arosales/charms/trusty/mysql/add-default-keys

« back to all changes in this revision

Viewing changes to hooks/ha_relations.py

  • Committer: Edward Hope-Morley
  • Date: 2014-03-04 17:28:10 UTC
  • mfrom: (114 mysql)
  • mto: This revision was merged to the branch mainline in revision 121.
  • Revision ID: edward.hope-morley@canonical.com-20140304172810-sog06gevp0dnb9av
[dosaboy] added support for 'source' and 'key' config options so that
          an alternative archive can be added to get more recent
          packages e.g. Ceph packages from the Ubuntu Cloud Archive.

Show diffs side-by-side

added added

removed removed

Lines of Context:
hooks/ha_relations.py
27
27
        sys.exit(1)
28
28
 
29
29
    # Starting configuring resources.
30
 
    init_services = {
31
 
            'res_mysqld': 'mysql',
32
 
        }
 
30
    init_services = {'res_mysqld': 'mysql'}
33
31
 
34
32
    # If the 'ha' relation has been made *before* the 'ceph' relation,
35
33
    # it doesn't make sense to make it until after the 'ceph' relation is made
48
46
            'res_mysql_rbd': 'ocf:ceph:rbd',
49
47
            'res_mysql_fs': 'ocf:heartbeat:Filesystem',
50
48
            'res_mysql_vip': 'ocf:heartbeat:IPaddr2',
51
 
            'res_mysqld': 'upstart:mysql',
52
 
            }
 
49
            'res_mysqld': 'upstart:mysql'}
53
50
 
54
51
        rbd_name = utils.config_get('rbd-name')
55
52
        resource_params = {
56
53
            'res_mysql_rbd': 'params name="%s" pool="%s" user="%s" '
57
 
                             'secret="%s"' % \
 
54
                             'secret="%s"' %
58
55
                             (rbd_name, POOL_NAME,
59
56
                              SERVICE_NAME, ceph.keyfile_path(SERVICE_NAME)),
60
57
            'res_mysql_fs': 'params device="/dev/rbd/%s/%s" directory="%s" '
61
 
                            'fstype="ext4" op start start-delay="10s"' % \
 
58
                            'fstype="ext4" op start start-delay="10s"' %
62
59
                            (POOL_NAME, rbd_name, DATA_SRC_DST),
63
 
            'res_mysql_vip': 'params ip="%s" cidr_netmask="%s" nic="%s"' % \
 
60
            'res_mysql_vip': 'params ip="%s" cidr_netmask="%s" nic="%s"' %
64
61
                             (vip, vip_cidr, vip_iface),
65
 
            'res_mysqld': 'op start start-delay="5s" op monitor interval="5s"',
66
 
            }
 
62
            'res_mysqld': 'op start start-delay="5s" op monitor interval="5s"'}
67
63
 
68
64
        groups = {
69
 
            'grp_mysql': 'res_mysql_rbd res_mysql_fs res_mysql_vip res_mysqld',
70
 
            }
 
65
            'grp_mysql': 'res_mysql_rbd res_mysql_fs res_mysql_vip res_mysqld'}
71
66
 
72
67
        for rel_id in utils.relation_ids('ha'):
73
68
            utils.relation_set(rid=rel_id,