← Back to branch summary

~ivoks/charms/trusty/contrail-configuration/host-private-address

« back to all changes in this revision

Viewing changes to hooks/contrail_configuration_utils.py

  • Committer: Robert Ayres
  • Date: 2015-11-16 23:50:00 UTC
  • Revision ID: robert.ayres@canonical.com-20151116235000-2wtgtym392e8ivo5
Use supervisord config for ifmap-server, fixes #1516487

Show diffs side-by-side

added added

removed removed

Lines of Context:
hooks/contrail_configuration_utils.py
26
26
    unit_get
27
27
)
28
28
 
29
 
from charmhelpers.core.host import service_restart
 
29
from charmhelpers.core.host import (
 
30
    service_available,
 
31
    service_restart,
 
32
    service_stop
 
33
)
30
34
 
31
35
from charmhelpers.core.templating import render
32
36
 
197
201
def discovery_port():
198
202
    return 5998
199
203
 
 
204
def fix_ifmap_server():
 
205
    # disable ifmap-server upstart service
 
206
    if service_available("ifmap-server"):
 
207
        service_stop("ifmap-server")
 
208
        with open("/etc/init/ifmap-server.override", "w") as conf:
 
209
            conf.write("manual\n")
 
210
 
 
211
    # use supervisord config
 
212
    shutil.copy("files/ifmap.ini", "/etc/contrail/supervisord_config_files")
 
213
    pw = pwd.getpwnam("contrail")
 
214
    os.chown("/etc/contrail/supervisord_config_files/ifmap.ini", pw.pw_uid,
 
215
             pw.pw_gid)
 
216
    shutil.copy("files/ifmap", "/etc/init.d")
 
217
    os.chmod("/etc/init.d/ifmap", 0755)
 
218
 
200
219
def fix_nodemgr():
201
220
    # add files missing from contrail-nodemgr package
202
221
    shutil.copy("files/contrail-nodemgr-config.ini",
206
225
             pw.pw_uid, pw.pw_gid)
207
226
    shutil.copy("files/contrail-config-nodemgr", "/etc/init.d")
208
227
    os.chmod("/etc/init.d/contrail-config-nodemgr", 0755)
209
 
    service_restart("supervisor-config")
210
228
 
211
229
def fix_permissions():
212
230
    os.chmod("/etc/contrail", 0755)
213
231
    os.chown("/etc/contrail", 0, 0)
214
232
 
215
 
def fix_services():
 
233
def fix_scripts():
216
234
    version = dpkg_version("contrail-config")
217
235
    if version_compare(version, "2.01") >= 0:
218
236
        # supervisord and init scripts need correcting on contrail 2.01+
227
245
                        "s/`basename ${0}`$/\"`basename ${0}`:*\"/",
228
246
                        "/etc/init.d/{}".format(service)])
229
247
 
230
 
        service_restart("supervisor-config")
231
 
 
232
 
    # broken java dependency on contrail 2.0+
233
 
    service_restart("ifmap-server")
 
248
def fix_services():
 
249
    fix_permissions()
 
250
    fix_ifmap_server()
 
251
    fix_nodemgr()
 
252
    fix_scripts()
 
253
    service_restart("supervisor-config")
234
254
 
235
255
def identity_admin_ctx():
236
256
    ctxs = [ { "auth_host": gethostbyname(hostname),