openstack/charm-keystone
Code Issues Proposed changes

[gnuoy] Revert previos commit pushed in error

Browse Source
This commit is contained in:
Liam Young 2015-01-21 16:26:50 +00:00
parent 4e4a42657f
commit 66174c78ab
2 changed files with 0 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
hooks/keystone_hooks.py
View File

@ -27,7 +27,6 @@ from charmhelpers.core.hookenv import (
from charmhelpers.core.host import ( from charmhelpers.core.host import (
mkdir, mkdir,
restart_on_change, restart_on_change,
service_reload,
) )
from charmhelpers.fetch import ( from charmhelpers.fetch import (
@ -386,10 +385,6 @@ def configure_https():
@restart_on_change(restart_map(), stopstart=True) @restart_on_change(restart_map(), stopstart=True)
def upgrade_charm(): def upgrade_charm():
apt_install(filter_installed_packages(determine_packages())) apt_install(filter_installed_packages(determine_packages()))
# Migrating to haproxy always-on config needs an early reconfigure to
# fix Bug #1413285
CONFIGS.write_all()
service_reload('keystone')
unison.ssh_authorized_peers(user=SSH_USER, unison.ssh_authorized_peers(user=SSH_USER,
group='keystone', group='keystone',
peer_interface='cluster', peer_interface='cluster',

3
unit_tests/test_keystone_hooks.py
View File

@ -40,7 +40,6 @@ TO_PATCH = [
'apt_install', 'apt_install',
'apt_update', 'apt_update',
'restart_on_change', 'restart_on_change',
'service_reload',
# charmhelpers.contrib.openstack.utils # charmhelpers.contrib.openstack.utils
'configure_installation_source', 'configure_installation_source',
# charmhelpers.contrib.hahelpers.cluster_utils # charmhelpers.contrib.hahelpers.cluster_utils
@ -495,7 +494,6 @@ class KeystoneRelationTests(CharmTestCase):
self.filter_installed_packages.return_value = [] self.filter_installed_packages.return_value = []
hooks.upgrade_charm() hooks.upgrade_charm()
self.assertTrue(self.apt_install.called) self.assertTrue(self.apt_install.called)
self.service_reload.assert_called_with('keystone')
ssh_authorized_peers.assert_called_with( ssh_authorized_peers.assert_called_with(
user=self.ssh_user, group='keystone', user=self.ssh_user, group='keystone',
peer_interface='cluster', ensure_local_user=True) peer_interface='cluster', ensure_local_user=True)
@ -511,7 +509,6 @@ class KeystoneRelationTests(CharmTestCase):
self.filter_installed_packages.return_value = [] self.filter_installed_packages.return_value = []
hooks.upgrade_charm() hooks.upgrade_charm()
self.assertTrue(self.apt_install.called) self.assertTrue(self.apt_install.called)
self.service_reload.assert_called_with('keystone')
ssh_authorized_peers.assert_called_with( ssh_authorized_peers.assert_called_with(
user=self.ssh_user, group='keystone', user=self.ssh_user, group='keystone',
peer_interface='cluster', ensure_local_user=True) peer_interface='cluster', ensure_local_user=True)