← Back to branch summary

~openstack-charmers-next/charms/wily/keystone/trunk

« back to all changes in this revision

Viewing changes to hooks/keystone_hooks.py

  • Committer: Gerrit Code Review
  • Author(s): Jenkins
  • Date: 2016-06-10 10:52:14 UTC
  • mfrom: (243.1.1 trunk)
  • Revision ID: review@openstack.org-20160610105214-0fdnvj757xxead7z
Merge "Ensure package provided apache conf is disabled"

Show diffs side-by-side

added added

removed removed

Lines of Context:
hooks/keystone_hooks.py
95
95
    restart_function_map,
96
96
    WSGI_KEYSTONE_CONF,
97
97
    restart_pid_check,
 
98
    PACKAGE_KEYSTONE_CONF,
98
99
)
99
100
 
100
101
from charmhelpers.contrib.hahelpers.cluster import (
140
141
    apt_update()
141
142
    apt_install(determine_packages(), fatal=True)
142
143
    if run_in_apache():
 
144
        # NOTE: ensure that packaging provided
 
145
        #       apache configuration is disabled
 
146
        #       as it will conflict with the charm
 
147
        #       provided version
 
148
        if os.path.exists(PACKAGE_KEYSTONE_CONF):
 
149
            check_call(['a2dissite', 'keystone'])
143
150
        service_pause('keystone')
144
151
 
145
152
    status_set('maintenance', 'Git install')