Merge "Make sure haproxy runs post-install"

This commit is contained in:
Jenkins 2017-08-22 11:14:37 +00:00 committed by Gerrit Code Review
commit 22242c84ea
2 changed files with 7 additions and 6 deletions

View File

@ -47,6 +47,8 @@ from charmhelpers.core.hookenv import (
from charmhelpers.core.host import (
mkdir,
service_pause,
service_stop,
service_start,
service_restart,
)
@ -168,6 +170,10 @@ def install():
status_set('maintenance', 'Installing apt packages')
apt_update()
apt_install(determine_packages(), fatal=True)
# unconfigured keystone service will prevent start of haproxy in some
# circumstances. make sure haproxy runs. LP #1648396
service_stop('keystone')
service_start('haproxy')
if run_in_apache():
disable_unused_apache_sites()
if not git_install_requested():

View File

@ -49,12 +49,7 @@ class KeystoneBasicDeployment(OpenStackAmuletDeployment):
"""Deploy the entire test environment."""
super(KeystoneBasicDeployment, self).__init__(series, openstack,
source, stable)
if self.is_liberty_or_newer():
self.keystone_num_units = 3
else:
# issues with starting haproxy when clustered on trusty with
# icehouse and kilo. See LP #1648396
self.keystone_num_units = 1
self.keystone_num_units = 3
self.keystone_api_version = 2
self.git = git
self._add_services()