d8e6722c45
Resolve_address is used to register an API charm's keystone catalog entry. Resolve_address was checking if the unit was clustered and if not falling back to its private-address. This is incorrect behavior. If a VIP is set it should always register the VIP with the keystone catalog. The fallout from this is manifested in two bugs: Bug#1750915 and Bug#1749280. In first, keystone is creating and passing SSL certificates for the local unit's private-ip and only subsequently for the VIP cause apache to fail to start. In the second, a race condition exists where clients of the API charm relying on catalog entries get disrupted when the catalog entry changes. This fix removes the is_clustered check from resolve_address. The gating on is_clustered should happen elsewhere in the charm not at registration time with keystone. Change-Id: Ieaee4fbcd1b45b95ddca4ec3a9a09d4522b09b03 Partial-Bug: #1750915 Partial-Bug: #1749280
90 lines
3.2 KiB
Python
90 lines
3.2 KiB
Python
# Copyright 2016 Canonical Ltd
|
|
#
|
|
# Licensed under the Apache License, Version 2.0 (the "License");
|
|
# you may not use this file except in compliance with the License.
|
|
# You may obtain a copy of the License at
|
|
#
|
|
# http://www.apache.org/licenses/LICENSE-2.0
|
|
#
|
|
# Unless required by applicable law or agreed to in writing, software
|
|
# distributed under the License is distributed on an "AS IS" BASIS,
|
|
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
# See the License for the specific language governing permissions and
|
|
# limitations under the License.
|
|
|
|
import sys
|
|
import mock
|
|
import os
|
|
|
|
# mock out some charmhelpers libraries as they have apt install side effects
|
|
apt_pkg = mock.MagicMock()
|
|
charmhelpers = mock.MagicMock()
|
|
sys.modules['apt_pkg'] = apt_pkg
|
|
sys.modules['charmhelpers'] = charmhelpers
|
|
sys.modules['charmhelpers.core'] = charmhelpers.core
|
|
sys.modules['charmhelpers.core.decorators'] = charmhelpers.core.decorators
|
|
sys.modules['charmhelpers.core.hookenv'] = charmhelpers.core.hookenv
|
|
sys.modules['charmhelpers.core.host'] = charmhelpers.core.host
|
|
sys.modules['charmhelpers.core.templating'] = charmhelpers.core.templating
|
|
sys.modules['charmhelpers.core.unitdata'] = charmhelpers.core.unitdata
|
|
sys.modules['charmhelpers.contrib'] = charmhelpers.contrib
|
|
sys.modules['charmhelpers.contrib.openstack'] = charmhelpers.contrib.openstack
|
|
sys.modules['charmhelpers.contrib.openstack.ha'] = (
|
|
charmhelpers.contrib.openstack.ha)
|
|
sys.modules['charmhelpers.contrib.openstack.utils'] = (
|
|
charmhelpers.contrib.openstack.utils)
|
|
sys.modules['charmhelpers.contrib.openstack.templating'] = (
|
|
charmhelpers.contrib.openstack.templating)
|
|
sys.modules['charmhelpers.contrib.openstack.context'] = (
|
|
charmhelpers.contrib.openstack.context)
|
|
sys.modules['charmhelpers.contrib.network'] = charmhelpers.contrib.network
|
|
sys.modules['charmhelpers.contrib.network.ip'] = (
|
|
charmhelpers.contrib.network.ip)
|
|
sys.modules['charmhelpers.fetch'] = charmhelpers.fetch
|
|
sys.modules['charmhelpers.cli'] = charmhelpers.cli
|
|
sys.modules['charmhelpers.contrib.hahelpers'] = charmhelpers.contrib.hahelpers
|
|
sys.modules['charmhelpers.contrib.hahelpers.cluster'] = (
|
|
charmhelpers.contrib.hahelpers.cluster)
|
|
|
|
# mock in the openstack releases so that the tests can run
|
|
# Note that these don't need to be maintained UNLESS new functionality is for
|
|
# later OpenStack releases.
|
|
charmhelpers.contrib.openstack.utils.OPENSTACK_RELEASES = (
|
|
'diablo',
|
|
'essex',
|
|
'folsom',
|
|
'grizzly',
|
|
'havana',
|
|
'icehouse',
|
|
'juno',
|
|
'kilo',
|
|
'liberty',
|
|
'mitaka',
|
|
'newton',
|
|
'ocata',
|
|
'pike',
|
|
)
|
|
|
|
# charms.reactive uses hookenv.charm_dir which must return a directory
|
|
charmhelpers.core.hookenv.charm_dir.return_value = os.path.curdir
|
|
|
|
|
|
def _fake_retry(num_retries, base_delay=0, exc_type=Exception):
|
|
def _retry_on_exception_inner_1(f):
|
|
def _retry_on_exception_inner_2(*args, **kwargs):
|
|
return f(*args, **kwargs)
|
|
return _retry_on_exception_inner_2
|
|
return _retry_on_exception_inner_1
|
|
|
|
mock.patch(
|
|
'charmhelpers.core.decorators.retry_on_exception',
|
|
_fake_retry).start()
|
|
|
|
|
|
def _fake_cached(f):
|
|
return f
|
|
|
|
mock.patch(
|
|
'charmhelpers.core.hookenv.cached',
|
|
_fake_cached).start()
|