← Back to branch summary

~corey.bryant/charms/trusty/cinder/git

« back to all changes in this revision

Viewing changes to hooks/charmhelpers/contrib/openstack/neutron.py

  • Committer: james.page at ubuntu
  • Date: 2015-01-13 14:36:44 UTC
  • mfrom: (68 cinder)
  • mto: This revision was merged to the branch mainline in revision 69.
  • Revision ID: james.page@ubuntu.com-20150113143644-docfl0wwq5gf4svy
Rebase on next

Show diffs side-by-side

added added

removed removed

Lines of Context:
hooks/charmhelpers/contrib/openstack/neutron.py
14
14
def headers_package():
15
15
    """Ensures correct linux-headers for running kernel are installed,
16
16
    for building DKMS package"""
17
 
    kver = check_output(['uname', '-r']).strip()
 
17
    kver = check_output(['uname', '-r']).decode('UTF-8').strip()
18
18
    return 'linux-headers-%s' % kver
19
19
 
20
20
QUANTUM_CONF_DIR = '/etc/quantum'
22
22
 
23
23
def kernel_version():
24
24
    """ Retrieve the current major kernel version as a tuple e.g. (3, 13) """
25
 
    kver = check_output(['uname', '-r']).strip()
 
25
    kver = check_output(['uname', '-r']).decode('UTF-8').strip()
26
26
    kver = kver.split('.')
27
27
    return (int(kver[0]), int(kver[1]))
28
28
 
152
152
                                        database=config('neutron-database'),
153
153
                                        relation_prefix='neutron',
154
154
                                        ssl_dir=NEUTRON_CONF_DIR)],
155
 
            'services': ['calico-compute', 'bird', 'neutron-dhcp-agent'],
 
155
            'services': ['calico-felix',
 
156
                         'bird',
 
157
                         'neutron-dhcp-agent',
 
158
                         'nova-api-metadata'],
156
159
            'packages': [[headers_package()] + determine_dkms_package(),
157
 
                         ['calico-compute', 'bird', 'neutron-dhcp-agent']],
 
160
                         ['calico-compute',
 
161
                          'bird',
 
162
                          'neutron-dhcp-agent',
 
163
                          'nova-api-metadata']],
158
164
            'server_packages': ['neutron-server', 'calico-control'],
159
165
            'server_services': ['neutron-server']
160
166
        }
177
183
    elif manager == 'neutron':
178
184
        plugins = neutron_plugins()
179
185
    else:
180
 
        log('Error: Network manager does not support plugins.')
 
186
        log("Network manager '%s' does not support plugins." % (manager),
 
187
            level=ERROR)
181
188
        raise Exception
182
189
 
183
190
    try: