diff --git a/actions.yaml b/actions.yaml index 8afcb350..4d260896 100644 --- a/actions.yaml +++ b/actions.yaml @@ -1,15 +1,13 @@ -git-reinstall: - description: Reinstall neutron-api from the openstack-origin-git repositories. openstack-upgrade: description: Perform openstack upgrades. Config option action-managed-upgrade must be set to True. -pause: - description: | - Pause keystone services. - If the keystone deployment is clustered using the hacluster charm, the - corresponding hacluster unit on the node must first be paused as well. - Not doing so may lead to an interruption of service. -resume: - description: | - Resume keystone services. - If the keystone deployment is clustered using the hacluster charm, the - corresponding hacluster unit on the node must be resumed as well. +pause: + description: | + Pause keystone services. + If the keystone deployment is clustered using the hacluster charm, the + corresponding hacluster unit on the node must first be paused as well. + Not doing so may lead to an interruption of service. +resume: + description: | + Resume keystone services. + If the keystone deployment is clustered using the hacluster charm, the + corresponding hacluster unit on the node must be resumed as well. diff --git a/actions/git_reinstall.py b/actions/git_reinstall.py deleted file mode 100755 index 5b6b8415..00000000 --- a/actions/git_reinstall.py +++ /dev/null @@ -1,60 +0,0 @@ -#!/usr/bin/env python3 -# -# 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 traceback - -sys.path.append('hooks/') - -from charmhelpers.contrib.openstack.utils import ( - git_install_requested, -) - -from charmhelpers.core.hookenv import ( - action_set, - action_fail, - config, -) - -from neutron_api_utils import ( - git_install, -) - -from neutron_api_hooks import ( - config_changed, -) - - -def git_reinstall(): - """Reinstall from source and restart services. - - If the openstack-origin-git config option was used to install openstack - from source git repositories, then this action can be used to reinstall - from updated git repositories, followed by a restart of services.""" - if not git_install_requested(): - action_fail('openstack-origin-git is not configured') - return - - try: - git_install(config('openstack-origin-git')) - config_changed() - except: - action_set({'traceback': traceback.format_exc()}) - action_fail('git-reinstall resulted in an unexpected error') - - -if __name__ == '__main__': - git_reinstall() diff --git a/config.yaml b/config.yaml index 87f6f33b..b3bf50da 100755 --- a/config.yaml +++ b/config.yaml @@ -31,42 +31,6 @@ options: NOTE: updating this setting to a source that is known to provide a later version of OpenStack will trigger a software upgrade unless action-managed-upgrade is set to True. - openstack-origin-git: - type: string - default: - description: | - Specifies a default OpenStack release name, or a YAML dictionary - listing the git repositories to install from. - . - The default Openstack release name may be one of the following, where - the corresponding OpenStack github branch will be used: - * liberty - * mitaka - * newton - * master - . - The YAML must minimally include the following repositories, and may - also include repositories for other dependencies: - repositories: - - {name: requirements, - repository: 'git://github.com/openstack/requirements', - branch: master} - - {name: networking-hyperv, - repository: 'git://github.com/openstack/networking-hyperv', - branch: master} - - {name: neutron-fwaas, - repository: 'git://github.com/openstack/neutron-fwaas', - branch: master} - - {name: neutron-lbaas, - repository: 'git://github.com/openstack/neutron-lbaas', - branch: master} - - {name: neutron-vpnaas, - repository: 'git://github.com/openstack/neutron-vpnaas', - branch: master} - - {name: neutron, - repository: 'git://github.com/openstack/neutron', - branch: master} - release: master extra-key: type: string default: @@ -296,7 +260,7 @@ options: NOTE: This options is available starting from Mitaka release. path-mtu: type: int - default: + default: description: | Maximum size of an IP packet (MTU) that can traverse the underlying physical network infrastructure without fragmentation diff --git a/hooks/charmhelpers/contrib/openstack/context.py b/hooks/charmhelpers/contrib/openstack/context.py index 70850c1b..161be128 100644 --- a/hooks/charmhelpers/contrib/openstack/context.py +++ b/hooks/charmhelpers/contrib/openstack/context.py @@ -97,8 +97,6 @@ from charmhelpers.contrib.network.ip import ( from charmhelpers.contrib.openstack.utils import ( config_flags_parser, get_host_ip, - git_determine_usr_bin, - git_determine_python_path, enable_memcache, snap_install_requested, CompareOpenStackReleases, @@ -334,10 +332,7 @@ class IdentityServiceContext(OSContextGenerator): self.rel_name = rel_name self.interfaces = [self.rel_name] - def __call__(self): - log('Generating template context for ' + self.rel_name, level=DEBUG) - ctxt = {} - + def _setup_pki_cache(self): if self.service and self.service_user: # This is required for pki token signing if we don't want /tmp to # be used. @@ -347,6 +342,15 @@ class IdentityServiceContext(OSContextGenerator): mkdir(path=cachedir, owner=self.service_user, group=self.service_user, perms=0o700) + return cachedir + return None + + def __call__(self): + log('Generating template context for ' + self.rel_name, level=DEBUG) + ctxt = {} + + cachedir = self._setup_pki_cache() + if cachedir: ctxt['signing_dir'] = cachedir for rid in relation_ids(self.rel_name): @@ -385,6 +389,62 @@ class IdentityServiceContext(OSContextGenerator): return {} +class IdentityCredentialsContext(IdentityServiceContext): + '''Context for identity-credentials interface type''' + + def __init__(self, + service=None, + service_user=None, + rel_name='identity-credentials'): + super(IdentityCredentialsContext, self).__init__(service, + service_user, + rel_name) + + def __call__(self): + log('Generating template context for ' + self.rel_name, level=DEBUG) + ctxt = {} + + cachedir = self._setup_pki_cache() + if cachedir: + ctxt['signing_dir'] = cachedir + + for rid in relation_ids(self.rel_name): + self.related = True + for unit in related_units(rid): + rdata = relation_get(rid=rid, unit=unit) + credentials_host = rdata.get('credentials_host') + credentials_host = ( + format_ipv6_addr(credentials_host) or credentials_host + ) + auth_host = rdata.get('auth_host') + auth_host = format_ipv6_addr(auth_host) or auth_host + svc_protocol = rdata.get('credentials_protocol') or 'http' + auth_protocol = rdata.get('auth_protocol') or 'http' + api_version = rdata.get('api_version') or '2.0' + ctxt.update({ + 'service_port': rdata.get('credentials_port'), + 'service_host': credentials_host, + 'auth_host': auth_host, + 'auth_port': rdata.get('auth_port'), + 'admin_tenant_name': rdata.get('credentials_project'), + 'admin_tenant_id': rdata.get('credentials_project_id'), + 'admin_user': rdata.get('credentials_username'), + 'admin_password': rdata.get('credentials_password'), + 'service_protocol': svc_protocol, + 'auth_protocol': auth_protocol, + 'api_version': api_version + }) + + if float(api_version) > 2: + ctxt.update({'admin_domain_name': + rdata.get('domain')}) + + if self.context_complete(ctxt): + return ctxt + + return {} + + class AMQPContext(OSContextGenerator): def __init__(self, ssl_dir=None, rel_name='amqp', relation_prefix=None): @@ -1323,8 +1383,6 @@ class WSGIWorkerConfigContext(WorkerConfigContext): "public_processes": int(math.ceil(self.public_process_weight * total_processes)), "threads": 1, - "usr_bin": git_determine_usr_bin(), - "python_path": git_determine_python_path(), } return ctxt diff --git a/hooks/charmhelpers/contrib/openstack/utils.py b/hooks/charmhelpers/contrib/openstack/utils.py index 9e5af342..0e867310 100644 --- a/hooks/charmhelpers/contrib/openstack/utils.py +++ b/hooks/charmhelpers/contrib/openstack/utils.py @@ -23,7 +23,6 @@ import sys import re import itertools import functools -import shutil import six import traceback @@ -47,7 +46,6 @@ from charmhelpers.core.hookenv import ( related_units, relation_ids, relation_set, - service_name, status_set, hook_name, application_version_set, @@ -68,11 +66,6 @@ from charmhelpers.contrib.network.ip import ( port_has_listener, ) -from charmhelpers.contrib.python.packages import ( - pip_create_virtualenv, - pip_install, -) - from charmhelpers.core.host import ( lsb_release, mounts, @@ -84,7 +77,6 @@ from charmhelpers.core.host import ( ) from charmhelpers.fetch import ( apt_cache, - install_remote, import_key as fetch_import_key, add_source as fetch_add_source, SourceConfigError, @@ -278,27 +270,6 @@ PACKAGE_CODENAMES = { ]), } -GIT_DEFAULT_REPOS = { - 'requirements': 'git://github.com/openstack/requirements', - 'cinder': 'git://github.com/openstack/cinder', - 'glance': 'git://github.com/openstack/glance', - 'horizon': 'git://github.com/openstack/horizon', - 'keystone': 'git://github.com/openstack/keystone', - 'networking-hyperv': 'git://github.com/openstack/networking-hyperv', - 'neutron': 'git://github.com/openstack/neutron', - 'neutron-fwaas': 'git://github.com/openstack/neutron-fwaas', - 'neutron-lbaas': 'git://github.com/openstack/neutron-lbaas', - 'neutron-vpnaas': 'git://github.com/openstack/neutron-vpnaas', - 'nova': 'git://github.com/openstack/nova', -} - -GIT_DEFAULT_BRANCHES = { - 'liberty': 'stable/liberty', - 'mitaka': 'stable/mitaka', - 'newton': 'stable/newton', - 'master': 'master', -} - DEFAULT_LOOPBACK_SIZE = '5G' @@ -530,7 +501,6 @@ def os_release(package, base='essex', reset_cache=False): if _os_rel: return _os_rel _os_rel = ( - git_os_codename_install_source(config('openstack-origin-git')) or get_os_codename_package(package, fatal=False) or get_os_codename_install_source(config('openstack-origin')) or base) @@ -771,417 +741,6 @@ def os_requires_version(ostack_release, pkg): return wrap -def git_install_requested(): - """ - Returns true if openstack-origin-git is specified. - """ - return config('openstack-origin-git') is not None - - -def git_os_codename_install_source(projects_yaml): - """ - Returns OpenStack codename of release being installed from source. - """ - if git_install_requested(): - projects = _git_yaml_load(projects_yaml) - - if projects in GIT_DEFAULT_BRANCHES.keys(): - if projects == 'master': - return 'ocata' - return projects - - if 'release' in projects: - if projects['release'] == 'master': - return 'ocata' - return projects['release'] - - return None - - -def git_default_repos(projects_yaml): - """ - Returns default repos if a default openstack-origin-git value is specified. - """ - service = service_name() - core_project = service - - for default, branch in six.iteritems(GIT_DEFAULT_BRANCHES): - if projects_yaml == default: - - # add the requirements repo first - repo = { - 'name': 'requirements', - 'repository': GIT_DEFAULT_REPOS['requirements'], - 'branch': branch, - } - repos = [repo] - - # neutron-* and nova-* charms require some additional repos - if service in ['neutron-api', 'neutron-gateway', - 'neutron-openvswitch']: - core_project = 'neutron' - if service == 'neutron-api': - repo = { - 'name': 'networking-hyperv', - 'repository': GIT_DEFAULT_REPOS['networking-hyperv'], - 'branch': branch, - } - repos.append(repo) - for project in ['neutron-fwaas', 'neutron-lbaas', - 'neutron-vpnaas', 'nova']: - repo = { - 'name': project, - 'repository': GIT_DEFAULT_REPOS[project], - 'branch': branch, - } - repos.append(repo) - - elif service in ['nova-cloud-controller', 'nova-compute']: - core_project = 'nova' - repo = { - 'name': 'neutron', - 'repository': GIT_DEFAULT_REPOS['neutron'], - 'branch': branch, - } - repos.append(repo) - elif service == 'openstack-dashboard': - core_project = 'horizon' - - # finally add the current service's core project repo - repo = { - 'name': core_project, - 'repository': GIT_DEFAULT_REPOS[core_project], - 'branch': branch, - } - repos.append(repo) - - return yaml.dump(dict(repositories=repos, release=default)) - - return projects_yaml - - -def _git_yaml_load(projects_yaml): - """ - Load the specified yaml into a dictionary. - """ - if not projects_yaml: - return None - - return yaml.load(projects_yaml) - - -requirements_dir = None - - -def git_clone_and_install(projects_yaml, core_project): - """ - Clone/install all specified OpenStack repositories. - - The expected format of projects_yaml is: - - repositories: - - {name: keystone, - repository: 'git://git.openstack.org/openstack/keystone.git', - branch: 'stable/icehouse'} - - {name: requirements, - repository: 'git://git.openstack.org/openstack/requirements.git', - branch: 'stable/icehouse'} - - directory: /mnt/openstack-git - http_proxy: squid-proxy-url - https_proxy: squid-proxy-url - - The directory, http_proxy, and https_proxy keys are optional. - - """ - global requirements_dir - parent_dir = '/mnt/openstack-git' - http_proxy = None - - projects = _git_yaml_load(projects_yaml) - _git_validate_projects_yaml(projects, core_project) - - old_environ = dict(os.environ) - - if 'http_proxy' in projects.keys(): - http_proxy = projects['http_proxy'] - os.environ['http_proxy'] = projects['http_proxy'] - if 'https_proxy' in projects.keys(): - os.environ['https_proxy'] = projects['https_proxy'] - - if 'directory' in projects.keys(): - parent_dir = projects['directory'] - - pip_create_virtualenv(os.path.join(parent_dir, 'venv')) - - # Upgrade setuptools and pip from default virtualenv versions. The default - # versions in trusty break master OpenStack branch deployments. - for p in ['pip', 'setuptools']: - pip_install(p, upgrade=True, proxy=http_proxy, - venv=os.path.join(parent_dir, 'venv')) - - constraints = None - for p in projects['repositories']: - repo = p['repository'] - branch = p['branch'] - depth = '1' - if 'depth' in p.keys(): - depth = p['depth'] - if p['name'] == 'requirements': - repo_dir = _git_clone_and_install_single(repo, branch, depth, - parent_dir, http_proxy, - update_requirements=False) - requirements_dir = repo_dir - constraints = os.path.join(repo_dir, "upper-constraints.txt") - # upper-constraints didn't exist until after icehouse - if not os.path.isfile(constraints): - constraints = None - # use constraints unless project yaml sets use_constraints to false - if 'use_constraints' in projects.keys(): - if not projects['use_constraints']: - constraints = None - else: - repo_dir = _git_clone_and_install_single(repo, branch, depth, - parent_dir, http_proxy, - update_requirements=True, - constraints=constraints) - - os.environ = old_environ - - -def _git_validate_projects_yaml(projects, core_project): - """ - Validate the projects yaml. - """ - _git_ensure_key_exists('repositories', projects) - - for project in projects['repositories']: - _git_ensure_key_exists('name', project.keys()) - _git_ensure_key_exists('repository', project.keys()) - _git_ensure_key_exists('branch', project.keys()) - - if projects['repositories'][0]['name'] != 'requirements': - error_out('{} git repo must be specified first'.format('requirements')) - - if projects['repositories'][-1]['name'] != core_project: - error_out('{} git repo must be specified last'.format(core_project)) - - _git_ensure_key_exists('release', projects) - - -def _git_ensure_key_exists(key, keys): - """ - Ensure that key exists in keys. - """ - if key not in keys: - error_out('openstack-origin-git key \'{}\' is missing'.format(key)) - - -def _git_clone_and_install_single(repo, branch, depth, parent_dir, http_proxy, - update_requirements, constraints=None): - """ - Clone and install a single git repository. - """ - if not os.path.exists(parent_dir): - juju_log('Directory already exists at {}. ' - 'No need to create directory.'.format(parent_dir)) - os.mkdir(parent_dir) - - juju_log('Cloning git repo: {}, branch: {}'.format(repo, branch)) - repo_dir = install_remote( - repo, dest=parent_dir, branch=branch, depth=depth) - - venv = os.path.join(parent_dir, 'venv') - - if update_requirements: - if not requirements_dir: - error_out('requirements repo must be cloned before ' - 'updating from global requirements.') - _git_update_requirements(venv, repo_dir, requirements_dir) - - juju_log('Installing git repo from dir: {}'.format(repo_dir)) - if http_proxy: - pip_install(repo_dir, proxy=http_proxy, venv=venv, - constraints=constraints) - else: - pip_install(repo_dir, venv=venv, constraints=constraints) - - return repo_dir - - -def _git_update_requirements(venv, package_dir, reqs_dir): - """ - Update from global requirements. - - Update an OpenStack git directory's requirements.txt and - test-requirements.txt from global-requirements.txt. - """ - orig_dir = os.getcwd() - os.chdir(reqs_dir) - python = os.path.join(venv, 'bin/python') - cmd = [python, 'update.py', package_dir] - try: - subprocess.check_call(cmd) - except subprocess.CalledProcessError: - package = os.path.basename(package_dir) - error_out("Error updating {} from " - "global-requirements.txt".format(package)) - os.chdir(orig_dir) - - -def git_pip_venv_dir(projects_yaml): - """ - Return the pip virtualenv path. - """ - parent_dir = '/mnt/openstack-git' - - projects = _git_yaml_load(projects_yaml) - - if 'directory' in projects.keys(): - parent_dir = projects['directory'] - - return os.path.join(parent_dir, 'venv') - - -def git_src_dir(projects_yaml, project): - """ - Return the directory where the specified project's source is located. - """ - parent_dir = '/mnt/openstack-git' - - projects = _git_yaml_load(projects_yaml) - - if 'directory' in projects.keys(): - parent_dir = projects['directory'] - - for p in projects['repositories']: - if p['name'] == project: - return os.path.join(parent_dir, os.path.basename(p['repository'])) - - return None - - -def git_yaml_value(projects_yaml, key): - """ - Return the value in projects_yaml for the specified key. - """ - projects = _git_yaml_load(projects_yaml) - - if key in projects.keys(): - return projects[key] - - return None - - -def git_generate_systemd_init_files(templates_dir): - """ - Generate systemd init files. - - Generates and installs systemd init units and script files based on the - *.init.in files contained in the templates_dir directory. - - This code is based on the openstack-pkg-tools package and its init - script generation, which is used by the OpenStack packages. - """ - for f in os.listdir(templates_dir): - # Create the init script and systemd unit file from the template - if f.endswith(".init.in"): - init_in_file = f - init_file = f[:-8] - service_file = "{}.service".format(init_file) - - init_in_source = os.path.join(templates_dir, init_in_file) - init_source = os.path.join(templates_dir, init_file) - service_source = os.path.join(templates_dir, service_file) - - init_dest = os.path.join('/etc/init.d', init_file) - service_dest = os.path.join('/lib/systemd/system', service_file) - - shutil.copyfile(init_in_source, init_source) - with open(init_source, 'a') as outfile: - template = ('/usr/share/openstack-pkg-tools/' - 'init-script-template') - with open(template) as infile: - outfile.write('\n\n{}'.format(infile.read())) - - cmd = ['pkgos-gen-systemd-unit', init_in_source] - subprocess.check_call(cmd) - - if os.path.exists(init_dest): - os.remove(init_dest) - if os.path.exists(service_dest): - os.remove(service_dest) - shutil.copyfile(init_source, init_dest) - shutil.copyfile(service_source, service_dest) - os.chmod(init_dest, 0o755) - - for f in os.listdir(templates_dir): - # If there's a service.in file, use it instead of the generated one - if f.endswith(".service.in"): - service_in_file = f - service_file = f[:-3] - - service_in_source = os.path.join(templates_dir, service_in_file) - service_source = os.path.join(templates_dir, service_file) - service_dest = os.path.join('/lib/systemd/system', service_file) - - shutil.copyfile(service_in_source, service_source) - - if os.path.exists(service_dest): - os.remove(service_dest) - shutil.copyfile(service_source, service_dest) - - for f in os.listdir(templates_dir): - # Generate the systemd unit if there's no existing .service.in - if f.endswith(".init.in"): - init_in_file = f - init_file = f[:-8] - service_in_file = "{}.service.in".format(init_file) - service_file = "{}.service".format(init_file) - - init_in_source = os.path.join(templates_dir, init_in_file) - service_in_source = os.path.join(templates_dir, service_in_file) - service_source = os.path.join(templates_dir, service_file) - service_dest = os.path.join('/lib/systemd/system', service_file) - - if not os.path.exists(service_in_source): - cmd = ['pkgos-gen-systemd-unit', init_in_source] - subprocess.check_call(cmd) - - if os.path.exists(service_dest): - os.remove(service_dest) - shutil.copyfile(service_source, service_dest) - - -def git_determine_usr_bin(): - """Return the /usr/bin path for Apache2 config. - - The /usr/bin path will be located in the virtualenv if the charm - is configured to deploy from source. - """ - if git_install_requested(): - projects_yaml = config('openstack-origin-git') - projects_yaml = git_default_repos(projects_yaml) - return os.path.join(git_pip_venv_dir(projects_yaml), 'bin') - else: - return '/usr/bin' - - -def git_determine_python_path(): - """Return the python-path for Apache2 config. - - Returns 'None' unless the charm is configured to deploy from source, - in which case the path of the virtualenv's site-packages is returned. - """ - if git_install_requested(): - projects_yaml = config('openstack-origin-git') - projects_yaml = git_default_repos(projects_yaml) - return os.path.join(git_pip_venv_dir(projects_yaml), - 'lib/python2.7/site-packages') - else: - return None - - def os_workload_status(configs, required_interfaces, charm_func=None): """ Decorator to set workload status based on complete contexts @@ -1615,27 +1174,24 @@ def do_action_openstack_upgrade(package, upgrade_callback, configs): """ ret = False - if git_install_requested(): - action_set({'outcome': 'installed from source, skipped upgrade.'}) - else: - if openstack_upgrade_available(package): - if config('action-managed-upgrade'): - juju_log('Upgrading OpenStack release') + if openstack_upgrade_available(package): + if config('action-managed-upgrade'): + juju_log('Upgrading OpenStack release') - try: - upgrade_callback(configs=configs) - action_set({'outcome': 'success, upgrade completed.'}) - ret = True - except Exception: - action_set({'outcome': 'upgrade failed, see traceback.'}) - action_set({'traceback': traceback.format_exc()}) - action_fail('do_openstack_upgrade resulted in an ' - 'unexpected error') - else: - action_set({'outcome': 'action-managed-upgrade config is ' - 'False, skipped upgrade.'}) + try: + upgrade_callback(configs=configs) + action_set({'outcome': 'success, upgrade completed.'}) + ret = True + except Exception: + action_set({'outcome': 'upgrade failed, see traceback.'}) + action_set({'traceback': traceback.format_exc()}) + action_fail('do_openstack_upgrade resulted in an ' + 'unexpected error') else: - action_set({'outcome': 'no upgrade available.'}) + action_set({'outcome': 'action-managed-upgrade config is ' + 'False, skipped upgrade.'}) + else: + action_set({'outcome': 'no upgrade available.'}) return ret @@ -2045,14 +1601,25 @@ def token_cache_pkgs(source=None, release=None): def update_json_file(filename, items): """Updates the json `filename` with a given dict. - :param filename: json filename (i.e.: /etc/glance/policy.json) + :param filename: path to json file (e.g. /etc/glance/policy.json) :param items: dict of items to update """ + if not items: + return + with open(filename) as fd: policy = json.load(fd) + + # Compare before and after and if nothing has changed don't write the file + # since that could cause unnecessary service restarts. + before = json.dumps(policy, indent=4, sort_keys=True) policy.update(items) + after = json.dumps(policy, indent=4, sort_keys=True) + if before == after: + return + with open(filename, "w") as fd: - fd.write(json.dumps(policy, indent=4)) + fd.write(after) @cached diff --git a/hooks/charmhelpers/contrib/storage/linux/ceph.py b/hooks/charmhelpers/contrib/storage/linux/ceph.py index 0d9bacfd..e13e60a6 100644 --- a/hooks/charmhelpers/contrib/storage/linux/ceph.py +++ b/hooks/charmhelpers/contrib/storage/linux/ceph.py @@ -113,7 +113,7 @@ def validator(value, valid_type, valid_range=None): assert isinstance(valid_range, list), \ "valid_range must be a list, was given {}".format(valid_range) # If we're dealing with strings - if valid_type is six.string_types: + if isinstance(value, six.string_types): assert value in valid_range, \ "{} is not in the list {}".format(value, valid_range) # Integer, float should have a min and max @@ -517,7 +517,8 @@ def pool_set(service, pool_name, key, value): :param value: :return: None. Can raise CalledProcessError """ - cmd = ['ceph', '--id', service, 'osd', 'pool', 'set', pool_name, key, value] + cmd = ['ceph', '--id', service, 'osd', 'pool', 'set', pool_name, key, + str(value).lower()] try: check_call(cmd) except CalledProcessError: @@ -621,16 +622,24 @@ def create_erasure_profile(service, profile_name, erasure_plugin_name='jerasure' :param durability_estimator: int :return: None. Can raise CalledProcessError """ + version = ceph_version() + # Ensure this failure_domain is allowed by Ceph validator(failure_domain, six.string_types, ['chassis', 'datacenter', 'host', 'osd', 'pdu', 'pod', 'rack', 'region', 'room', 'root', 'row']) cmd = ['ceph', '--id', service, 'osd', 'erasure-code-profile', 'set', profile_name, - 'plugin=' + erasure_plugin_name, 'k=' + str(data_chunks), 'm=' + str(coding_chunks), - 'ruleset_failure_domain=' + failure_domain] + 'plugin=' + erasure_plugin_name, 'k=' + str(data_chunks), 'm=' + str(coding_chunks) + ] if locality is not None and durability_estimator is not None: raise ValueError("create_erasure_profile should be called with k, m and one of l or c but not both.") + # failure_domain changed in luminous + if version and version >= '12.0.0': + cmd.append('crush-failure-domain=' + failure_domain) + else: + cmd.append('ruleset-failure-domain=' + failure_domain) + # Add plugin specific information if locality is not None: # For local erasure codes @@ -1064,14 +1073,24 @@ class CephBrokerRq(object): self.ops = [] def add_op_request_access_to_group(self, name, namespace=None, - permission=None, key_name=None): + permission=None, key_name=None, + object_prefix_permissions=None): """ Adds the requested permissions to the current service's Ceph key, - allowing the key to access only the specified pools + allowing the key to access only the specified pools or + object prefixes. object_prefix_permissions should be a dictionary + keyed on the permission with the corresponding value being a list + of prefixes to apply that permission to. + { + 'rwx': ['prefix1', 'prefix2'], + 'class-read': ['prefix3']} """ - self.ops.append({'op': 'add-permissions-to-key', 'group': name, - 'namespace': namespace, 'name': key_name or service_name(), - 'group-permission': permission}) + self.ops.append({ + 'op': 'add-permissions-to-key', 'group': name, + 'namespace': namespace, + 'name': key_name or service_name(), + 'group-permission': permission, + 'object-prefix-permissions': object_prefix_permissions}) def add_op_create_pool(self, name, replica_count=3, pg_num=None, weight=None, group=None, namespace=None): @@ -1107,7 +1126,10 @@ class CephBrokerRq(object): def _ops_equal(self, other): if len(self.ops) == len(other.ops): for req_no in range(0, len(self.ops)): - for key in ['replicas', 'name', 'op', 'pg_num', 'weight']: + for key in [ + 'replicas', 'name', 'op', 'pg_num', 'weight', + 'group', 'group-namespace', 'group-permission', + 'object-prefix-permissions']: if self.ops[req_no].get(key) != other.ops[req_no].get(key): return False else: diff --git a/hooks/neutron_api_hooks.py b/hooks/neutron_api_hooks.py index ea976abf..adf5d91f 100755 --- a/hooks/neutron_api_hooks.py +++ b/hooks/neutron_api_hooks.py @@ -52,9 +52,7 @@ from charmhelpers.fetch import ( ) from charmhelpers.contrib.openstack.utils import ( - config_value_changed, configure_installation_source, - git_install_requested, openstack_upgrade_available, os_release, sync_db_with_multi_ipv6_addresses, @@ -74,7 +72,6 @@ from neutron_api_utils import ( do_openstack_upgrade, dvr_router_present, force_etcd_restart, - git_install, is_api_ready, l3ha_router_present, migrate_neutron_database, @@ -200,9 +197,6 @@ def install(): packages = determine_packages(openstack_origin) apt_install(packages, fatal=True) - status_set('maintenance', 'Git install') - git_install(config('openstack-origin-git')) - [open_port(port) for port in determine_ports()] if neutron_plugin == 'midonet': @@ -271,11 +265,7 @@ def config_changed(): config('database-user')) global CONFIGS - if git_install_requested(): - if config_value_changed('openstack-origin-git'): - status_set('maintenance', 'Running Git install') - git_install(config('openstack-origin-git')) - elif not config('action-managed-upgrade'): + if not config('action-managed-upgrade'): if openstack_upgrade_available('neutron-common'): status_set('maintenance', 'Running openstack upgrade') do_openstack_upgrade(CONFIGS) diff --git a/hooks/neutron_api_utils.py b/hooks/neutron_api_utils.py index 199329b8..2bc1dcd1 100755 --- a/hooks/neutron_api_utils.py +++ b/hooks/neutron_api_utils.py @@ -30,13 +30,6 @@ from charmhelpers.contrib.openstack.neutron import ( from charmhelpers.contrib.openstack.utils import ( os_release, get_os_codename_install_source, - git_clone_and_install, - git_default_repos, - git_generate_systemd_init_files, - git_install_requested, - git_pip_venv_dir, - git_src_dir, - git_yaml_value, configure_installation_source, incomplete_relation_data, is_unit_paused_set, @@ -50,10 +43,6 @@ from charmhelpers.contrib.openstack.utils import ( reset_os_release, ) -from charmhelpers.contrib.python.packages import ( - pip_install, -) - from charmhelpers.core.hookenv import ( charm_dir, config, @@ -75,23 +64,16 @@ from charmhelpers.fetch import ( from charmhelpers.core.host import ( lsb_release, - adduser, - add_group, - add_user_to_group, CompareHostReleases, - mkdir, service_stop, service_start, service_restart, - write_file, ) from charmhelpers.contrib.hahelpers.cluster import ( get_hacluster_config, ) - -from charmhelpers.core.templating import render from charmhelpers.contrib.hahelpers.cluster import is_elected_leader import neutron_api_context @@ -134,20 +116,6 @@ BASE_GIT_PACKAGES = [ 'zlib1g-dev', ] -# ubuntu packages that should not be installed when deploying from git -GIT_PACKAGE_BLACKLIST = [ - 'neutron-server', - 'neutron-plugin-ml2', - 'python-keystoneclient', - 'python-six', -] - -GIT_PACKAGE_BLACKLIST_KILO = [ - 'python-neutron-lbaas', - 'python-neutron-fwaas', - 'python-neutron-vpnaas', -] - BASE_SERVICES = [ 'neutron-server' ] @@ -428,17 +396,6 @@ def determine_packages(source=None): nuage_pkgs = config('nuage-packages').split() packages += nuage_pkgs - if git_install_requested(): - packages.extend(BASE_GIT_PACKAGES) - # don't include packages that will be installed from git - packages = list(set(packages)) - for p in GIT_PACKAGE_BLACKLIST: - if p in packages: - packages.remove(p) - if CompareOpenStackReleases(release) >= 'kilo': - for p in GIT_PACKAGE_BLACKLIST_KILO: - packages.remove(p) - packages.extend(token_cache_pkgs(release=release)) return list(set(packages)) @@ -742,110 +699,6 @@ def neutron_ready(): return False -def git_install(projects_yaml): - """Perform setup, and install git repos specified in yaml parameter.""" - if git_install_requested(): - git_pre_install() - projects_yaml = git_default_repos(projects_yaml) - git_clone_and_install(projects_yaml, core_project='neutron') - git_post_install(projects_yaml) - - -def git_pre_install(): - """Perform pre-install setup.""" - dirs = [ - '/var/lib/neutron', - '/var/lib/neutron/lock', - '/var/log/neutron', - ] - - logs = [ - '/var/log/neutron/server.log', - ] - - adduser('neutron', shell='/bin/bash', system_user=True) - add_group('neutron', system_group=True) - add_user_to_group('neutron', 'neutron') - - for d in dirs: - mkdir(d, owner='neutron', group='neutron', perms=0o755, force=False) - - for l in logs: - write_file(l, '', owner='neutron', group='neutron', perms=0o600) - - -def git_post_install(projects_yaml): - """Perform post-install setup.""" - http_proxy = git_yaml_value(projects_yaml, 'http_proxy') - if http_proxy: - pip_install('mysql-python', proxy=http_proxy, - venv=git_pip_venv_dir(projects_yaml)) - else: - pip_install('mysql-python', - venv=git_pip_venv_dir(projects_yaml)) - - src_etc = os.path.join(git_src_dir(projects_yaml, 'neutron'), 'etc') - configs = [ - {'src': src_etc, - 'dest': '/etc/neutron'}, - {'src': os.path.join(src_etc, 'neutron/plugins'), - 'dest': '/etc/neutron/plugins'}, - {'src': os.path.join(src_etc, 'neutron/rootwrap.d'), - 'dest': '/etc/neutron/rootwrap.d'}, - ] - - for c in configs: - if os.path.exists(c['dest']): - shutil.rmtree(c['dest']) - shutil.copytree(c['src'], c['dest']) - - # NOTE(coreycb): Need to find better solution than bin symlinks. - symlinks = [ - {'src': os.path.join(git_pip_venv_dir(projects_yaml), - 'bin/neutron-rootwrap'), - 'link': '/usr/local/bin/neutron-rootwrap'}, - {'src': os.path.join(git_pip_venv_dir(projects_yaml), - 'bin/neutron-db-manage'), - 'link': '/usr/local/bin/neutron-db-manage'}, - ] - - for s in symlinks: - if os.path.lexists(s['link']): - os.remove(s['link']) - os.symlink(s['src'], s['link']) - - render('git/neutron_sudoers', '/etc/sudoers.d/neutron_sudoers', {}, - perms=0o440) - - bin_dir = os.path.join(git_pip_venv_dir(projects_yaml), 'bin') - # Use systemd init units/scripts from ubuntu wily onward - if lsb_release()['DISTRIB_RELEASE'] >= '15.10': - templates_dir = os.path.join(charm_dir(), 'templates/git') - daemon = 'neutron-server' - neutron_api_context = { - 'daemon_path': os.path.join(bin_dir, daemon), - } - template_file = 'git/{}.init.in.template'.format(daemon) - init_in_file = '{}.init.in'.format(daemon) - render(template_file, os.path.join(templates_dir, init_in_file), - neutron_api_context, perms=0o644) - git_generate_systemd_init_files(templates_dir) - else: - neutron_api_context = { - 'service_description': 'Neutron API server', - 'charm_name': 'neutron-api', - 'process_name': 'neutron-server', - 'executable_name': os.path.join(bin_dir, 'neutron-server'), - } - - render('git/upstart/neutron-server.upstart', - '/etc/init/neutron-server.conf', - neutron_api_context, perms=0o644) - - if not is_unit_paused_set(): - service_restart('neutron-server') - - def get_optional_interfaces(): """Return the optional interfaces that should be checked if the relavent relations have appeared. diff --git a/templates/git/neutron-server.init.in.template b/templates/git/neutron-server.init.in.template deleted file mode 100644 index 7540ecdb..00000000 --- a/templates/git/neutron-server.init.in.template +++ /dev/null @@ -1,19 +0,0 @@ -#! /bin/sh -### BEGIN INIT INFO -# Provides: neutron-server -# Required-Start: $remote_fs $syslog -# Required-Stop: $remote_fs $syslog -# Should-Start: mysql postgresql rabbitmq-server keystone -# Should-Stop: mysql postgresql rabbitmq-server keystone -# Default-Start: 2 3 4 5 -# Default-Stop: 0 1 6 -# Short-Description: neutron-server -# Description: Provides the Neutron networking service -### END INIT INFO - -DESC="OpenStack Neutron Server" -PROJECT_NAME=neutron -NAME=${PROJECT_NAME}-server -DAEMON={{ daemon_path }} -[ -r /etc/default/neutron-server ] && . /etc/default/neutron-server -[ -n "$NEUTRON_PLUGIN_CONFIG" ] && DAEMON_ARGS="--config-file=$NEUTRON_PLUGIN_CONFIG" diff --git a/templates/git/neutron_sudoers b/templates/git/neutron_sudoers deleted file mode 100644 index d6fec647..00000000 --- a/templates/git/neutron_sudoers +++ /dev/null @@ -1,4 +0,0 @@ -Defaults:neutron !requiretty - -neutron ALL = (root) NOPASSWD: /usr/local/bin/neutron-rootwrap /etc/neutron/rootwrap.conf * - diff --git a/templates/git/upstart/neutron-server.upstart b/templates/git/upstart/neutron-server.upstart deleted file mode 100644 index 4bd8e268..00000000 --- a/templates/git/upstart/neutron-server.upstart +++ /dev/null @@ -1,22 +0,0 @@ -description "{{ service_description }}" -author "Juju {{ charm_name }} Charm " - -start on runlevel [2345] -stop on runlevel [!2345] - -respawn - -chdir /var/run - -pre-start script - mkdir -p /var/run/neutron - chown neutron:root /var/run/neutron -end script - -script - [ -r /etc/default/{{ process_name }} ] && . /etc/default/{{ process_name }} - [ -r "$NEUTRON_PLUGIN_CONFIG" ] && CONF_ARG="--config-file $NEUTRON_PLUGIN_CONFIG" - exec start-stop-daemon --start --chuid neutron --exec {{ executable_name }} -- \ - --config-file /etc/neutron/neutron.conf \ - --log-file /var/log/neutron/server.log $CONF_ARG -end script diff --git a/tests/basic_deployment.py b/tests/basic_deployment.py index 85425fe1..a80821cf 100644 --- a/tests/basic_deployment.py +++ b/tests/basic_deployment.py @@ -13,8 +13,6 @@ # limitations under the License. import amulet -import os -import yaml from charmhelpers.contrib.openstack.amulet.deployment import ( OpenStackAmuletDeployment @@ -33,12 +31,11 @@ u = OpenStackAmuletUtils(DEBUG) class NeutronAPIBasicDeployment(OpenStackAmuletDeployment): """Amulet tests on a basic neutron-api deployment.""" - def __init__(self, series, openstack=None, source=None, git=False, + def __init__(self, series, openstack=None, source=None, stable=False): """Deploy the entire test environment.""" super(NeutronAPIBasicDeployment, self).__init__(series, openstack, source, stable) - self.git = git self._add_services() self._add_relations() self._configure_services() @@ -120,57 +117,6 @@ class NeutronAPIBasicDeployment(OpenStackAmuletDeployment): def _configure_services(self): """Configure all of the services.""" neutron_api_config = {} - if self.git: - amulet_http_proxy = os.environ.get('AMULET_HTTP_PROXY') - - branch = 'stable/' + self._get_openstack_release_string() - - if self._get_openstack_release() >= self.trusty_kilo: - openstack_origin_git = { - 'repositories': [ - {'name': 'requirements', - 'repository': 'git://github.com/openstack/requirements', # noqa - 'branch': branch}, - {'name': 'neutron-fwaas', - 'repository': 'git://github.com/openstack/neutron-fwaas', # noqa - 'branch': branch}, - {'name': 'neutron-lbaas', - 'repository': 'git://github.com/openstack/neutron-lbaas', # noqa - 'branch': branch}, - {'name': 'neutron-vpnaas', - 'repository': 'git://github.com/openstack/neutron-vpnaas', # noqa - 'branch': branch}, - {'name': 'neutron', - 'repository': 'git://github.com/openstack/neutron', - 'branch': branch}, - ], - 'directory': '/mnt/openstack-git', - 'http_proxy': amulet_http_proxy, - 'https_proxy': amulet_http_proxy, - } - else: - reqs_repo = 'git://github.com/openstack/requirements' - neutron_repo = 'git://github.com/openstack/neutron' - if self._get_openstack_release() == self.trusty_icehouse: - reqs_repo = 'git://github.com/coreycb/requirements' - neutron_repo = 'git://github.com/coreycb/neutron' - - openstack_origin_git = { - 'repositories': [ - {'name': 'requirements', - 'repository': reqs_repo, - 'branch': branch}, - {'name': 'neutron', - 'repository': neutron_repo, - 'branch': branch}, - ], - 'directory': '/mnt/openstack-git', - 'http_proxy': amulet_http_proxy, - 'https_proxy': amulet_http_proxy, - } - neutron_api_config['openstack-origin-git'] = \ - yaml.dump(openstack_origin_git) - neutron_api_config['enable-sriov'] = True neutron_api_config['supported-pci-vendor-devs'] = '8086:1515' diff --git a/tests/dfs-basic-trusty-icehouse b/tests/dfs-basic-trusty-icehouse deleted file mode 100755 index 19d7f839..00000000 --- a/tests/dfs-basic-trusty-icehouse +++ /dev/null @@ -1,23 +0,0 @@ -#!/usr/bin/env 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. - -"""Amulet tests on a basic neutron-api git deployment on trusty-icehouse.""" - -from basic_deployment import NeutronAPIBasicDeployment - -if __name__ == '__main__': - deployment = NeutronAPIBasicDeployment(series='trusty', git=True) - deployment.run_tests() diff --git a/tests/dfs-basic-trusty-kilo-git b/tests/dfs-basic-trusty-kilo-git deleted file mode 100755 index ab886f22..00000000 --- a/tests/dfs-basic-trusty-kilo-git +++ /dev/null @@ -1,26 +0,0 @@ -#!/usr/bin/env 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. - -"""Amulet tests on a basic neutron-api git deployment on trusty-kilo.""" - -from basic_deployment import NeutronAPIBasicDeployment - -if __name__ == '__main__': - deployment = NeutronAPIBasicDeployment(series='trusty', - openstack='cloud:trusty-kilo', - source='cloud:trusty-updates/kilo', - git=True) - deployment.run_tests() diff --git a/unit_tests/__init__.py b/unit_tests/__init__.py index 1e3af20b..474f81dd 100644 --- a/unit_tests/__init__.py +++ b/unit_tests/__init__.py @@ -13,6 +13,12 @@ # limitations under the License. import sys +import mock + +# python-apt is not installed as part of test-requirements but is imported by +# some charmhelpers modules so create a fake import. +sys.modules['apt'] = mock.MagicMock() +sys.modules['apt_pkg'] = mock.MagicMock() sys.path.append('actions/') sys.path.append('hooks/') diff --git a/unit_tests/test_actions_git_reinstall.py b/unit_tests/test_actions_git_reinstall.py deleted file mode 100644 index 231cfec7..00000000 --- a/unit_tests/test_actions_git_reinstall.py +++ /dev/null @@ -1,129 +0,0 @@ -# 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 - -from mock import patch, MagicMock - -# python-apt is not installed as part of test-requirements but is imported by -# some charmhelpers modules so create a fake import. -sys.modules['apt'] = MagicMock() - -patch('charmhelpers.core.hookenv.status_set').start() -with patch('charmhelpers.core.hookenv.config') as config: - config.return_value = 'neutron' - import neutron_api_utils as utils # noqa - -# Need to do some early patching to get the module loaded. -_reg = utils.register_configs -_map = utils.restart_map - -utils.register_configs = MagicMock() -utils.restart_map = MagicMock() - -with patch('charmhelpers.contrib.hardening.harden.harden') as mock_dec: - mock_dec.side_effect = (lambda *dargs, **dkwargs: lambda f: - lambda *args, **kwargs: f(*args, **kwargs)) - import git_reinstall - -# Unpatch it now that its loaded. -utils.register_configs = _reg -utils.restart_map = _map - -from test_utils import ( - CharmTestCase -) - -TO_PATCH = [ - 'config', -] - - -openstack_origin_git = \ - """repositories: - - {name: requirements, - repository: 'git://git.openstack.org/openstack/requirements', - branch: stable/juno} - - {name: neutron, - repository: 'git://git.openstack.org/openstack/neutron', - branch: stable/juno}""" - - -class TestNeutronAPIActions(CharmTestCase): - - def setUp(self): - super(TestNeutronAPIActions, self).setUp(git_reinstall, TO_PATCH) - self.config.side_effect = self.test_config.get - - @patch.object(git_reinstall, 'action_set') - @patch.object(git_reinstall, 'action_fail') - @patch.object(git_reinstall, 'git_install') - @patch.object(git_reinstall, 'config_changed') - def test_git_reinstall(self, config_changed, git_install, action_fail, - action_set): - self.test_config.set('openstack-origin-git', openstack_origin_git) - - git_reinstall.git_reinstall() - - git_install.assert_called_with(openstack_origin_git) - self.assertTrue(git_install.called) - self.assertTrue(config_changed.called) - self.assertFalse(action_set.called) - self.assertFalse(action_fail.called) - - @patch.object(git_reinstall, 'action_set') - @patch.object(git_reinstall, 'action_fail') - @patch.object(git_reinstall, 'git_install') - @patch.object(git_reinstall, 'config_changed') - @patch('charmhelpers.contrib.openstack.utils.config') - def test_git_reinstall_not_configured(self, _config, config_changed, - git_install, action_fail, - action_set): - _config.return_value = None - - git_reinstall.git_reinstall() - - msg = 'openstack-origin-git is not configured' - action_fail.assert_called_with(msg) - self.assertFalse(git_install.called) - self.assertFalse(action_set.called) - - @patch.object(git_reinstall, 'action_set') - @patch.object(git_reinstall, 'action_fail') - @patch.object(git_reinstall, 'git_install') - @patch.object(git_reinstall, 'config_changed') - @patch('traceback.format_exc') - @patch('charmhelpers.contrib.openstack.utils.config') - def test_git_reinstall_exception(self, _config, format_exc, - config_changed, git_install, action_fail, - action_set): - _config.return_value = openstack_origin_git - e = OSError('something bad happened') - git_install.side_effect = e - traceback = ( - "Traceback (most recent call last):\n" - " File \"actions/git_reinstall.py\", line 37, in git_reinstall\n" - " git_install(config(\'openstack-origin-git\'))\n" - " File \"/usr/lib/python2.7/dist-packages/mock.py\", line 964, in __call__\n" # noqa - " return _mock_self._mock_call(*args, **kwargs)\n" - " File \"/usr/lib/python2.7/dist-packages/mock.py\", line 1019, in _mock_call\n" # noqa - " raise effect\n" - "OSError: something bad happened\n") - format_exc.return_value = traceback - - git_reinstall.git_reinstall() - - msg = 'git-reinstall resulted in an unexpected error' - action_fail.assert_called_with(msg) - action_set.assert_called_with({'traceback': traceback}) diff --git a/unit_tests/test_actions_openstack_upgrade.py b/unit_tests/test_actions_openstack_upgrade.py index bc37b019..054bc8d9 100644 --- a/unit_tests/test_actions_openstack_upgrade.py +++ b/unit_tests/test_actions_openstack_upgrade.py @@ -19,9 +19,10 @@ from mock import patch os.environ['JUJU_UNIT_NAME'] = 'neutron-api' with patch('charmhelpers.core.hookenv.config') as config: - config.return_value = 'ovs' - with patch('neutron_api_utils.register_configs') as register_configs: - import openstack_upgrade + with patch('neutron_api_utils.restart_map'): + config.return_value = 'ovs' + with patch('neutron_api_utils.register_configs') as register_configs: + import openstack_upgrade from test_utils import CharmTestCase @@ -40,11 +41,9 @@ class TestNeutronAPIUpgradeActions(CharmTestCase): @patch('charmhelpers.contrib.openstack.utils.juju_log') @patch('charmhelpers.contrib.openstack.utils.config') @patch('charmhelpers.contrib.openstack.utils.action_set') - @patch('charmhelpers.contrib.openstack.utils.git_install_requested') @patch('charmhelpers.contrib.openstack.utils.openstack_upgrade_available') - def test_openstack_upgrade_true(self, upgrade_avail, git_requested, + def test_openstack_upgrade_true(self, upgrade_avail, action_set, config, log): - git_requested.return_value = False upgrade_avail.return_value = True config.return_value = True @@ -56,11 +55,9 @@ class TestNeutronAPIUpgradeActions(CharmTestCase): @patch('charmhelpers.contrib.openstack.utils.juju_log') @patch('charmhelpers.contrib.openstack.utils.config') @patch('charmhelpers.contrib.openstack.utils.action_set') - @patch('charmhelpers.contrib.openstack.utils.git_install_requested') @patch('charmhelpers.contrib.openstack.utils.openstack_upgrade_available') - def test_openstack_upgrade_false(self, upgrade_avail, git_requested, + def test_openstack_upgrade_false(self, upgrade_avail, action_set, config, log): - git_requested.return_value = False upgrade_avail.return_value = True config.return_value = False diff --git a/unit_tests/test_neutron_api_hooks.py b/unit_tests/test_neutron_api_hooks.py index d4ccbbd8..0db48cc9 100644 --- a/unit_tests/test_neutron_api_hooks.py +++ b/unit_tests/test_neutron_api_hooks.py @@ -14,7 +14,6 @@ import sys -import yaml import json from mock import MagicMock, patch, call @@ -66,7 +65,6 @@ TO_PATCH = [ 'get_l3ha', 'get_l2population', 'get_overlay_network_type', - 'git_install', 'is_clustered', 'is_elected_leader', 'is_qos_requested_and_valid', @@ -142,9 +140,7 @@ class NeutronAPIHooksTests(CharmTestCase): hooks.hooks.execute([ 'hooks/{}'.format(hookname)]) - @patch.object(utils, 'git_install_requested') - def test_install_hook(self, git_requested): - git_requested.return_value = False + def test_install_hook(self): _pkgs = ['foo', 'bar'] _ports = [80, 81, 82] _port_calls = [call(port) for port in _ports] @@ -161,9 +157,7 @@ class NeutronAPIHooksTests(CharmTestCase): self.open_port.assert_has_calls(_port_calls) self.assertTrue(self.execd_preinstall.called) - @patch.object(utils, 'git_install_requested') - def test_nuage_install_hook(self, git_requested): - git_requested.return_value = False + def test_nuage_install_hook(self): self.test_config.set('neutron-plugin', 'vsp') self.test_config.set('extra-source', "deb http://10.14.4.1/nuage trusty main") @@ -184,45 +178,8 @@ class NeutronAPIHooksTests(CharmTestCase): self.open_port.assert_has_calls(_port_calls) self.assertTrue(self.execd_preinstall.called) - @patch.object(utils, 'get_os_codename_install_source') - @patch.object(utils, 'git_install_requested') - def test_install_hook_git(self, git_requested, codename): - git_requested.return_value = True - _pkgs = ['foo', 'bar'] - _ports = [80, 81, 82] - _port_calls = [call(port) for port in _ports] - self.determine_packages.return_value = _pkgs - self.determine_ports.return_value = _ports - openstack_origin_git = { - 'repositories': [ - {'name': 'requirements', - 'repository': 'git://git.openstack.org/openstack/requirements', # noqa - 'branch': 'stable/juno'}, - {'name': 'neutron', - 'repository': 'git://git.openstack.org/openstack/neutron', - 'branch': 'stable/juno'} - ], - 'directory': '/mnt/openstack-git', - } - repo = "cloud:trusty-juno" - projects_yaml = yaml.dump(openstack_origin_git) - self.test_config.set('openstack-origin', repo) - self.test_config.set('openstack-origin-git', projects_yaml) - codename.return_value = 'juno' - self._call_hook('install') - self.assertTrue(self.execd_preinstall.called) - self.configure_installation_source.assert_called_with(repo) - self.apt_update.assert_called_with(fatal=True) - self.apt_install.assert_has_calls([ - call(_pkgs, fatal=True), - ]) - self.git_install.assert_called_with(projects_yaml) - self.open_port.assert_has_calls(_port_calls) - @patch.object(hooks, 'configure_https') - @patch.object(hooks, 'git_install_requested') - def test_config_changed(self, git_requested, conf_https): - git_requested.return_value = False + def test_config_changed(self, conf_https): self.neutron_ready.return_value = True self.openstack_upgrade_available.return_value = True self.dvr_router_present.return_value = False @@ -261,58 +218,7 @@ class NeutronAPIHooksTests(CharmTestCase): with self.assertRaises(Exception): self._call_hook('config-changed') - @patch.object(utils, 'get_os_codename_install_source') - @patch.object(hooks, 'configure_https') - @patch.object(hooks, 'git_install_requested') - @patch.object(hooks, 'config_value_changed') - def test_config_changed_git(self, config_val_changed, git_requested, - configure_https, codename): - git_requested.return_value = True - self.neutron_ready.return_value = True - self.dvr_router_present.return_value = False - self.l3ha_router_present.return_value = False - self.relation_ids.side_effect = self._fake_relids - _n_api_rel_joined = self.patch('neutron_api_relation_joined') - _n_plugin_api_rel_joined =\ - self.patch('neutron_plugin_api_relation_joined') - _amqp_rel_joined = self.patch('amqp_joined') - _id_rel_joined = self.patch('identity_joined') - _id_cluster_joined = self.patch('cluster_joined') - _id_ha_joined = self.patch('ha_joined') - repo = 'cloud:trusty-juno' - openstack_origin_git = { - 'repositories': [ - {'name': 'requirements', - 'repository': - 'git://git.openstack.org/openstack/requirements', - 'branch': 'stable/juno'}, - {'name': 'neutron', - 'repository': 'git://git.openstack.org/openstack/neutron', - 'branch': 'stable/juno'} - ], - 'directory': '/mnt/openstack-git', - } - projects_yaml = yaml.dump(openstack_origin_git) - self.test_config.set('openstack-origin', repo) - self.test_config.set('openstack-origin-git', projects_yaml) - codename.return_value = 'juno' - self._call_hook('config-changed') - self.git_install.assert_called_with(projects_yaml) - self.assertFalse(self.do_openstack_upgrade.called) - self.assertTrue(self.apt_install.called) - self.assertTrue(configure_https.called) - self.assertTrue(self.update_nrpe_config.called) - self.assertTrue(self.CONFIGS.write_all.called) - self.assertTrue(_n_api_rel_joined.called) - self.assertTrue(_n_plugin_api_rel_joined.called) - self.assertTrue(_amqp_rel_joined.called) - self.assertTrue(_id_rel_joined.called) - self.assertTrue(_id_cluster_joined.called) - self.assertTrue(_id_ha_joined.called) - - @patch.object(hooks, 'git_install_requested') - def test_config_changed_with_openstack_upgrade_action(self, git_requested): - git_requested.return_value = False + def test_config_changed_with_openstack_upgrade_action(self): self.openstack_upgrade_available.return_value = True self.test_config.set('action-managed-upgrade', True) diff --git a/unit_tests/test_neutron_api_utils.py b/unit_tests/test_neutron_api_utils.py index 8d045c69..c0cb7a6f 100644 --- a/unit_tests/test_neutron_api_utils.py +++ b/unit_tests/test_neutron_api_utils.py @@ -42,14 +42,10 @@ TO_PATCH = [ 'config', 'configure_installation_source', 'get_os_codename_install_source', - 'git_pip_venv_dir', - 'git_src_dir', 'log', 'lsb_release', 'neutron_plugin_attribute', 'os_release', - 'pip_install', - 'render', 'service_restart', 'subprocess', 'is_elected_leader', @@ -59,15 +55,6 @@ TO_PATCH = [ 'os_application_version_set', ] -openstack_origin_git = \ - """repositories: - - {name: requirements, - repository: 'git://git.openstack.org/openstack/requirements', - branch: stable/juno} - - {name: neutron, - repository: 'git://git.openstack.org/openstack/neutron', - branch: stable/juno}""" - def _mock_npa(plugin, attr, net_manager=None): plugins = { @@ -119,20 +106,16 @@ class TestNeutronAPIUtils(CharmTestCase): port = nutils.api_port('neutron-server') self.assertEqual(port, nutils.API_PORTS['neutron-server']) - @patch.object(nutils, 'git_install_requested') - def test_determine_packages(self, git_requested): + def test_determine_packages(self): self.os_release.return_value = 'havana' self.get_os_codename_install_source.return_value = 'havana' - git_requested.return_value = False pkg_list = nutils.determine_packages() expect = deepcopy(nutils.BASE_PACKAGES) expect.extend(['neutron-server', 'neutron-plugin-ml2']) self.assertEqual(sorted(pkg_list), sorted(expect)) - @patch.object(nutils, 'git_install_requested') - def test_determine_vsp_packages(self, git_requested): + def test_determine_vsp_packages(self): self.os_release.return_value = 'havana' - git_requested.return_value = False self.test_config.set('nuage-packages', 'python-nuagenetlib nuage-neutron') self.test_config.set('neutron-plugin', 'vsp') @@ -143,10 +126,8 @@ class TestNeutronAPIUtils(CharmTestCase): 'python-nuagenetlib', 'nuage-neutron']) self.assertEqual(sorted(pkg_list), sorted(expect)) - @patch.object(nutils, 'git_install_requested') - def test_determine_packages_kilo(self, git_requested): + def test_determine_packages_kilo(self): self.os_release.return_value = 'havana' - git_requested.return_value = False self.get_os_codename_install_source.return_value = 'kilo' pkg_list = nutils.determine_packages() expect = deepcopy(nutils.BASE_PACKAGES) @@ -155,11 +136,9 @@ class TestNeutronAPIUtils(CharmTestCase): expect.extend(nutils.KILO_PACKAGES) self.assertEqual(sorted(pkg_list), sorted(expect)) - @patch.object(nutils, 'git_install_requested') - def test_determine_packages_noplugin(self, git_requested): + def test_determine_packages_noplugin(self): self.os_release.return_value = 'havana' self.get_os_codename_install_source.return_value = 'havana' - git_requested.return_value = False self.test_config.set('manage-neutron-plugin-legacy-mode', False) pkg_list = nutils.determine_packages() expect = deepcopy(nutils.BASE_PACKAGES) @@ -282,11 +261,9 @@ class TestNeutronAPIUtils(CharmTestCase): 'get_os_codename_install_source') @patch.object(nutils, 'migrate_neutron_database') @patch.object(nutils, 'stamp_neutron_database') - @patch.object(nutils, 'git_install_requested') - def test_do_openstack_upgrade(self, git_requested, + def test_do_openstack_upgrade(self, stamp_neutron_db, migrate_neutron_db, gsrc): - git_requested.return_value = False self.is_elected_leader.return_value = True self.os_release.return_value = 'icehouse' self.config.side_effect = self.test_config.get @@ -322,11 +299,9 @@ class TestNeutronAPIUtils(CharmTestCase): 'get_os_codename_install_source') @patch.object(nutils, 'migrate_neutron_database') @patch.object(nutils, 'stamp_neutron_database') - @patch.object(nutils, 'git_install_requested') - def test_do_openstack_upgrade_liberty(self, git_requested, + def test_do_openstack_upgrade_liberty(self, stamp_neutron_db, migrate_neutron_db, gsrc): - git_requested.return_value = False self.is_elected_leader.return_value = True self.os_release.return_value = 'liberty' self.config.side_effect = self.test_config.get @@ -341,12 +316,10 @@ class TestNeutronAPIUtils(CharmTestCase): 'get_os_codename_install_source') @patch.object(nutils, 'migrate_neutron_database') @patch.object(nutils, 'stamp_neutron_database') - @patch.object(nutils, 'git_install_requested') - def test_do_openstack_upgrade_notleader(self, git_requested, + def test_do_openstack_upgrade_notleader(self, stamp_neutron_db, migrate_neutron_db, gsrc): - git_requested.return_value = False self.is_elected_leader.return_value = False self.os_release.return_value = 'icehouse' self.config.side_effect = self.test_config.get @@ -493,112 +466,6 @@ class TestNeutronAPIUtils(CharmTestCase): get_neutron_client.return_value = dummy_client self.assertEqual(nutils.neutron_ready(), False) - @patch.object(nutils, 'git_install_requested') - @patch.object(nutils, 'git_clone_and_install') - @patch.object(nutils, 'git_post_install') - @patch.object(nutils, 'git_pre_install') - def test_git_install(self, git_pre, git_post, git_clone_and_install, - git_requested): - projects_yaml = openstack_origin_git - git_requested.return_value = True - nutils.git_install(projects_yaml) - self.assertTrue(git_pre.called) - git_clone_and_install.assert_called_with(openstack_origin_git, - core_project='neutron') - self.assertTrue(git_post.called) - - @patch.object(nutils, 'mkdir') - @patch.object(nutils, 'write_file') - @patch.object(nutils, 'add_user_to_group') - @patch.object(nutils, 'add_group') - @patch.object(nutils, 'adduser') - def test_git_pre_install(self, adduser, add_group, add_user_to_group, - write_file, mkdir): - nutils.git_pre_install() - adduser.assert_called_with('neutron', shell='/bin/bash', - system_user=True) - add_group.assert_called_with('neutron', system_group=True) - add_user_to_group.assert_called_with('neutron', 'neutron') - expected = [ - call('/var/lib/neutron', owner='neutron', - group='neutron', perms=0o755, force=False), - call('/var/lib/neutron/lock', owner='neutron', - group='neutron', perms=0o755, force=False), - call('/var/log/neutron', owner='neutron', - group='neutron', perms=0o755, force=False), - ] - self.assertEqual(mkdir.call_args_list, expected) - expected = [ - call('/var/log/neutron/server.log', '', owner='neutron', - group='neutron', perms=0o600), - ] - self.assertEqual(write_file.call_args_list, expected) - - @patch('os.path.join') - @patch('os.path.exists') - @patch('os.symlink') - @patch('shutil.copytree') - @patch('shutil.rmtree') - @patch('subprocess.check_call') - def test_git_post_install_upstart(self, check_call, rmtree, copytree, - symlink, exists, join): - projects_yaml = openstack_origin_git - join.return_value = 'joined-string' - self.git_pip_venv_dir.return_value = '/mnt/openstack-git/venv' - self.lsb_release.return_value = {'DISTRIB_RELEASE': '15.04'} - nutils.git_post_install(projects_yaml) - expected = [ - call('joined-string', '/etc/neutron'), - call('joined-string', '/etc/neutron/plugins'), - call('joined-string', '/etc/neutron/rootwrap.d'), - ] - copytree.assert_has_calls(expected) - expected = [ - call('joined-string', '/usr/local/bin/neutron-rootwrap'), - call('joined-string', '/usr/local/bin/neutron-db-manage'), - ] - symlink.assert_has_calls(expected, any_order=True) - neutron_api_context = { - 'service_description': 'Neutron API server', - 'charm_name': 'neutron-api', - 'process_name': 'neutron-server', - 'executable_name': 'joined-string', - } - expected = [ - call('git/neutron_sudoers', '/etc/sudoers.d/neutron_sudoers', {}, - perms=0o440), - call('git/upstart/neutron-server.upstart', - '/etc/init/neutron-server.conf', - neutron_api_context, perms=0o644), - ] - self.assertEqual(self.render.call_args_list, expected) - expected = [ - call('neutron-server'), - ] - self.assertEqual(self.service_restart.call_args_list, expected) - - @patch('os.listdir') - @patch('os.path.join') - @patch('os.path.exists') - @patch('os.symlink') - @patch('shutil.copytree') - @patch('shutil.rmtree') - @patch('subprocess.check_call') - def test_git_post_install_systemd(self, check_call, rmtree, copytree, - symlink, exists, join, listdir): - projects_yaml = openstack_origin_git - join.return_value = 'joined-string' - self.git_pip_venv_dir.return_value = '/mnt/openstack-git/venv' - self.lsb_release.return_value = {'DISTRIB_RELEASE': '15.10'} - nutils.git_post_install(projects_yaml) - expected = [ - call('git/neutron_sudoers', '/etc/sudoers.d/neutron_sudoers', - {}, perms=288), - call('git/neutron-server.init.in.template', 'joined-string', - {'daemon_path': 'joined-string'}, perms=420) - ] - self.assertEqual(self.render.call_args_list, expected) - def test_stamp_neutron_database(self): nutils.stamp_neutron_database('icehouse') cmd = ['neutron-db-manage',