← Back to branch summary

~cf-charmers/charms/trusty/cf-logrouter/trunk

« back to all changes in this revision

Viewing changes to hooks/charmhelpers/contrib/cloudfoundry/common.py

  • Committer: Alex Lomov
  • Date: 2014-05-07 16:31:47 UTC
  • Revision ID: lomov.as@gmail.com-20140507163147-awu43742f8dmcz24
Update charm helpers to revision 172

Show diffs side-by-side

added added

removed removed

Lines of Context:
hooks/charmhelpers/contrib/cloudfoundry/common.py
63
63
 
64
64
 
65
65
def prepare_cloudfoundry_environment(config_data, packages):
66
 
    add_source(config_data['source'], config_data.get('key'))
67
 
    apt_update(fatal=True)
68
 
    apt_install(packages=filter_installed_packages(packages), fatal=True)
 
66
    if 'source' in config_data:
 
67
        add_source(config_data['source'], config_data.get('key'))
 
68
        apt_update(fatal=True)
 
69
    if packages:
 
70
        apt_install(packages=filter_installed_packages(packages), fatal=True)
69
71
    host.adduser('vcap')