Remove deploy from source support
Drop support for deployment from Git repositories, as deprecated in the 17.02 charm release. This feature is unmaintained and has no known users. Change-Id: I2fe15b648d485e5b03965a00dee6324669ebe9fa
This commit is contained in:
James Page
parent
4a9209ea0f
commit
0f14eac672
|
|
@ -1,5 +1,3 @@
|
|||
git-reinstall:
|
||||
description: Reinstall nova-cloud-controller from the openstack-origin-git repositories.
|
||||
openstack-upgrade:
|
||||
description: Perform openstack upgrades. Config option action-managed-upgrade must be set to True.
|
||||
pause:
|
||||
|
|
|
|||
|
|
@ -1,60 +0,0 @@
|
|||
#!/usr/bin/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 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 nova_cc_utils import (
|
||||
git_install,
|
||||
)
|
||||
|
||||
from nova_cc_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()
|
||||
27
config.yaml
27
config.yaml
|
|
@ -31,33 +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 requirements, neutron, and nova
|
||||
repositories, and may also include repositories for other dependencies:
|
||||
repositories:
|
||||
- {name: requirements,
|
||||
repository: 'git://github.com/openstack/requirements',
|
||||
branch: master}
|
||||
- {name: neutron,
|
||||
repository: 'git://github.com/openstack/neutron',
|
||||
branch: master}
|
||||
- {name: nova,
|
||||
repository: 'git://github.com/openstack/nova',
|
||||
branch: master}
|
||||
release: master
|
||||
harden:
|
||||
type: string
|
||||
default:
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
||||
|
|
|
|||
|
|
@ -15,9 +15,6 @@ Listen {{ public_port }}
|
|||
{% if port -%}
|
||||
<VirtualHost *:{{ port }}>
|
||||
WSGIDaemonProcess {{ service_name }} processes={{ processes }} threads={{ threads }} user={{ service_name }} group={{ service_name }} \
|
||||
{% if python_path -%}
|
||||
python-path={{ python_path }} \
|
||||
{% endif -%}
|
||||
display-name=%{GROUP}
|
||||
WSGIProcessGroup {{ service_name }}
|
||||
WSGIScriptAlias / {{ script }}
|
||||
|
|
@ -29,7 +26,7 @@ Listen {{ public_port }}
|
|||
ErrorLog /var/log/apache2/{{ service_name }}_error.log
|
||||
CustomLog /var/log/apache2/{{ service_name }}_access.log combined
|
||||
|
||||
<Directory {{ usr_bin }}>
|
||||
<Directory /usr/bin>
|
||||
<IfVersion >= 2.4>
|
||||
Require all granted
|
||||
</IfVersion>
|
||||
|
|
@ -44,9 +41,6 @@ Listen {{ public_port }}
|
|||
{% if admin_port -%}
|
||||
<VirtualHost *:{{ admin_port }}>
|
||||
WSGIDaemonProcess {{ service_name }}-admin processes={{ admin_processes }} threads={{ threads }} user={{ service_name }} group={{ service_name }} \
|
||||
{% if python_path -%}
|
||||
python-path={{ python_path }} \
|
||||
{% endif -%}
|
||||
display-name=%{GROUP}
|
||||
WSGIProcessGroup {{ service_name }}-admin
|
||||
WSGIScriptAlias / {{ admin_script }}
|
||||
|
|
@ -58,7 +52,7 @@ Listen {{ public_port }}
|
|||
ErrorLog /var/log/apache2/{{ service_name }}_error.log
|
||||
CustomLog /var/log/apache2/{{ service_name }}_access.log combined
|
||||
|
||||
<Directory {{ usr_bin }}>
|
||||
<Directory /usr/bin>
|
||||
<IfVersion >= 2.4>
|
||||
Require all granted
|
||||
</IfVersion>
|
||||
|
|
@ -73,9 +67,6 @@ Listen {{ public_port }}
|
|||
{% if public_port -%}
|
||||
<VirtualHost *:{{ public_port }}>
|
||||
WSGIDaemonProcess {{ service_name }}-public processes={{ public_processes }} threads={{ threads }} user={{ service_name }} group={{ service_name }} \
|
||||
{% if python_path -%}
|
||||
python-path={{ python_path }} \
|
||||
{% endif -%}
|
||||
display-name=%{GROUP}
|
||||
WSGIProcessGroup {{ service_name }}-public
|
||||
WSGIScriptAlias / {{ public_script }}
|
||||
|
|
@ -87,7 +78,7 @@ Listen {{ public_port }}
|
|||
ErrorLog /var/log/apache2/{{ service_name }}_error.log
|
||||
CustomLog /var/log/apache2/{{ service_name }}_access.log combined
|
||||
|
||||
<Directory {{ usr_bin }}>
|
||||
<Directory /usr/bin>
|
||||
<IfVersion >= 2.4>
|
||||
Require all granted
|
||||
</IfVersion>
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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:
|
||||
|
|
|
|||
|
|
@ -59,7 +59,6 @@ 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,
|
||||
|
|
@ -93,7 +92,6 @@ from nova_cc_utils import (
|
|||
disable_services,
|
||||
do_openstack_upgrade,
|
||||
enable_services,
|
||||
git_install,
|
||||
is_api_ready,
|
||||
is_cellv2_init_ready,
|
||||
keystone_ca_cert_b64,
|
||||
|
|
@ -264,8 +262,6 @@ def install():
|
|||
if placement_api_enabled():
|
||||
disable_package_apache_site()
|
||||
|
||||
git_install(config('openstack-origin-git'))
|
||||
|
||||
_files = os.path.join(charm_dir(), 'files')
|
||||
if os.path.isdir(_files):
|
||||
for f in os.listdir(_files):
|
||||
|
|
@ -301,11 +297,7 @@ def config_changed():
|
|||
relation_prefix='nova')
|
||||
|
||||
global CONFIGS
|
||||
if git_install_requested():
|
||||
status_set('maintenance', 'Running Git install')
|
||||
if config_value_changed('openstack-origin-git'):
|
||||
git_install(config('openstack-origin-git'))
|
||||
elif not config('action-managed-upgrade'):
|
||||
if not config('action-managed-upgrade'):
|
||||
if openstack_upgrade_available('nova-common'):
|
||||
status_set('maintenance', 'Running openstack upgrade')
|
||||
do_openstack_upgrade(CONFIGS)
|
||||
|
|
@ -322,10 +314,9 @@ def config_changed():
|
|||
|
||||
# NOTE(jamespage): deal with any changes to the console and serial
|
||||
# console configuration options
|
||||
if not git_install_requested():
|
||||
filtered = filter_installed_packages(determine_packages())
|
||||
if filtered:
|
||||
apt_install(filtered, fatal=True)
|
||||
filtered = filter_installed_packages(determine_packages())
|
||||
if filtered:
|
||||
apt_install(filtered, fatal=True)
|
||||
|
||||
for rid in relation_ids('quantum-network-service'):
|
||||
quantum_joined(rid=rid)
|
||||
|
|
|
|||
|
|
@ -13,7 +13,6 @@
|
|||
# limitations under the License.
|
||||
|
||||
import os
|
||||
import shutil
|
||||
import subprocess
|
||||
import ConfigParser
|
||||
|
||||
|
|
@ -32,22 +31,11 @@ from charmhelpers.contrib.peerstorage import (
|
|||
peer_store,
|
||||
)
|
||||
|
||||
from charmhelpers.contrib.python.packages import (
|
||||
pip_install,
|
||||
)
|
||||
|
||||
from charmhelpers.contrib.openstack.utils import (
|
||||
configure_installation_source,
|
||||
get_host_ip,
|
||||
get_hostname,
|
||||
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,
|
||||
incomplete_relation_data,
|
||||
is_ip,
|
||||
os_release,
|
||||
|
|
@ -72,7 +60,6 @@ from charmhelpers.fetch import (
|
|||
)
|
||||
|
||||
from charmhelpers.core.hookenv import (
|
||||
charm_dir,
|
||||
config,
|
||||
is_leader,
|
||||
log,
|
||||
|
|
@ -88,10 +75,6 @@ from charmhelpers.core.hookenv import (
|
|||
)
|
||||
|
||||
from charmhelpers.core.host import (
|
||||
adduser,
|
||||
add_group,
|
||||
add_user_to_group,
|
||||
mkdir,
|
||||
service,
|
||||
service_pause,
|
||||
service_resume,
|
||||
|
|
@ -102,8 +85,6 @@ from charmhelpers.core.host import (
|
|||
CompareHostReleases,
|
||||
)
|
||||
|
||||
from charmhelpers.core.templating import render
|
||||
|
||||
from charmhelpers.contrib.network.ip import (
|
||||
is_ipv6,
|
||||
ns_query,
|
||||
|
|
@ -145,47 +126,6 @@ BASE_PACKAGES = [
|
|||
|
||||
VERSION_PACKAGE = 'nova-common'
|
||||
|
||||
BASE_GIT_PACKAGES = [
|
||||
'libffi-dev',
|
||||
'libmysqlclient-dev',
|
||||
'libssl-dev',
|
||||
'libxml2-dev',
|
||||
'libxslt1-dev',
|
||||
'libyaml-dev',
|
||||
'openstack-pkg-tools',
|
||||
'python-dev',
|
||||
'python-pip',
|
||||
'python-setuptools',
|
||||
'zlib1g-dev',
|
||||
]
|
||||
|
||||
LATE_GIT_PACKAGES = [
|
||||
'novnc',
|
||||
'spice-html5',
|
||||
'websockify',
|
||||
]
|
||||
|
||||
# ubuntu packages that should not be installed when deploying from git
|
||||
GIT_PACKAGE_BLACKLIST = [
|
||||
'neutron-common',
|
||||
'neutron-server',
|
||||
'neutron-plugin-ml2',
|
||||
'nova-api-ec2',
|
||||
'nova-api-os-compute',
|
||||
'nova-api-os-volume',
|
||||
'nova-cert',
|
||||
'nova-conductor',
|
||||
'nova-consoleauth',
|
||||
'nova-novncproxy',
|
||||
'nova-objectstore',
|
||||
'nova-scheduler',
|
||||
'nova-spiceproxy',
|
||||
'nova-xvpvncproxy',
|
||||
'python-keystoneclient',
|
||||
'python-six',
|
||||
'quantum-server',
|
||||
]
|
||||
|
||||
BASE_SERVICES = [
|
||||
'nova-api-ec2',
|
||||
'nova-api-os-compute',
|
||||
|
|
@ -483,14 +423,6 @@ def determine_packages():
|
|||
CompareOpenStackReleases(os_release('nova-common')) >= 'juno'):
|
||||
packages.extend(SERIAL_CONSOLE['packages'])
|
||||
|
||||
if git_install_requested():
|
||||
packages = list(set(packages))
|
||||
packages.extend(BASE_GIT_PACKAGES)
|
||||
# don't include packages that will be installed from git
|
||||
for p in GIT_PACKAGE_BLACKLIST:
|
||||
if p in packages:
|
||||
packages.remove(p)
|
||||
|
||||
packages.extend(token_cache_pkgs(source=config('openstack-origin')))
|
||||
return list(set(packages))
|
||||
|
||||
|
|
@ -1239,288 +1171,6 @@ def setup_ipv6():
|
|||
apt_install('haproxy/trusty-backports', fatal=True)
|
||||
|
||||
|
||||
def git_install(projects_yaml):
|
||||
"""Perform setup, and install git repos specified in yaml parameter."""
|
||||
if git_install_requested():
|
||||
status_set('maintenance', 'Git install')
|
||||
git_pre_install()
|
||||
projects_yaml = git_default_repos(projects_yaml)
|
||||
git_clone_and_install(projects_yaml, core_project='nova')
|
||||
git_post_install(projects_yaml)
|
||||
|
||||
|
||||
def git_pre_install():
|
||||
"""Perform pre-install setup."""
|
||||
dirs = [
|
||||
'/var/lib/nova',
|
||||
'/var/lib/nova/buckets',
|
||||
'/var/lib/nova/CA',
|
||||
'/var/lib/nova/CA/INTER',
|
||||
'/var/lib/nova/CA/newcerts',
|
||||
'/var/lib/nova/CA/private',
|
||||
'/var/lib/nova/CA/reqs',
|
||||
'/var/lib/nova/images',
|
||||
'/var/lib/nova/instances',
|
||||
'/var/lib/nova/keys',
|
||||
'/var/lib/nova/networks',
|
||||
'/var/lib/nova/tmp',
|
||||
'/var/lib/neutron',
|
||||
'/var/lib/neutron/lock',
|
||||
'/var/log/nova',
|
||||
'/etc/neutron',
|
||||
'/etc/neutron/plugins',
|
||||
'/etc/neutron/plugins/ml2',
|
||||
]
|
||||
|
||||
adduser('nova', shell='/bin/bash', system_user=True)
|
||||
subprocess.check_call(['usermod', '--home', '/var/lib/nova', 'nova'])
|
||||
add_group('nova', system_group=True)
|
||||
add_user_to_group('nova', 'nova')
|
||||
|
||||
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='nova', group='nova', perms=0755, force=False)
|
||||
|
||||
|
||||
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, 'nova'), 'etc/nova')
|
||||
configs = [
|
||||
{'src': src_etc,
|
||||
'dest': '/etc/nova'},
|
||||
]
|
||||
|
||||
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/nova-manage'),
|
||||
'link': '/usr/local/bin/nova-manage'},
|
||||
{'src': os.path.join(git_pip_venv_dir(projects_yaml),
|
||||
'bin/nova-rootwrap'),
|
||||
'link': '/usr/local/bin/nova-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/nova_sudoers', '/etc/sudoers.d/nova_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')
|
||||
daemons = ['nova-api-os-compute', 'nova-baremetal-deploy-helper',
|
||||
'nova-cells', 'nova-cert', 'nova-conductor',
|
||||
'nova-consoleauth', 'nova-console', 'nova-novncproxy',
|
||||
'nova-scheduler', 'nova-serialproxy',
|
||||
'nova-spicehtml5proxy', 'nova-xvpvncproxy']
|
||||
for daemon in daemons:
|
||||
nova_compute_context = {
|
||||
'daemon_path': os.path.join(bin_dir, daemon),
|
||||
}
|
||||
if daemon == 'nova-baremetal-deploy-helper':
|
||||
filename = 'nova-baremetal'
|
||||
elif daemon == 'nova-spicehtml5proxy':
|
||||
filename = 'nova-spiceproxy'
|
||||
else:
|
||||
filename = daemon
|
||||
template_file = 'git/{}.init.in.template'.format(filename)
|
||||
init_in_file = '{}.init.in'.format(filename)
|
||||
render(template_file, os.path.join(templates_dir, init_in_file),
|
||||
nova_compute_context, perms=0o644)
|
||||
git_generate_systemd_init_files(templates_dir)
|
||||
else:
|
||||
nova_cc = 'nova-cloud-controller'
|
||||
nova_user = 'nova'
|
||||
start_dir = '/var/lib/nova'
|
||||
nova_conf = '/etc/nova/nova.conf'
|
||||
nova_ec2_api_context = {
|
||||
'service_description': 'Nova EC2 API server',
|
||||
'service_name': nova_cc,
|
||||
'user_name': nova_user,
|
||||
'start_dir': start_dir,
|
||||
'process_name': 'nova-api-ec2',
|
||||
'executable_name': os.path.join(bin_dir, 'nova-api-ec2'),
|
||||
'config_files': [nova_conf],
|
||||
}
|
||||
nova_api_os_compute_context = {
|
||||
'service_description': 'Nova OpenStack Compute API server',
|
||||
'service_name': nova_cc,
|
||||
'user_name': nova_user,
|
||||
'start_dir': start_dir,
|
||||
'process_name': 'nova-api-os-compute',
|
||||
'executable_name': os.path.join(bin_dir, 'nova-api-os-compute'),
|
||||
'config_files': [nova_conf],
|
||||
}
|
||||
nova_cells_context = {
|
||||
'service_description': 'Nova cells',
|
||||
'service_name': nova_cc,
|
||||
'user_name': nova_user,
|
||||
'start_dir': start_dir,
|
||||
'process_name': 'nova-cells',
|
||||
'executable_name': os.path.join(bin_dir, 'nova-cells'),
|
||||
'config_files': [nova_conf],
|
||||
}
|
||||
nova_cert_context = {
|
||||
'service_description': 'Nova cert',
|
||||
'service_name': nova_cc,
|
||||
'user_name': nova_user,
|
||||
'start_dir': start_dir,
|
||||
'process_name': 'nova-cert',
|
||||
'executable_name': os.path.join(bin_dir, 'nova-cert'),
|
||||
'config_files': [nova_conf],
|
||||
}
|
||||
nova_conductor_context = {
|
||||
'service_description': 'Nova conductor',
|
||||
'service_name': nova_cc,
|
||||
'user_name': nova_user,
|
||||
'start_dir': start_dir,
|
||||
'process_name': 'nova-conductor',
|
||||
'executable_name': os.path.join(bin_dir, 'nova-conductor'),
|
||||
'config_files': [nova_conf],
|
||||
}
|
||||
nova_consoleauth_context = {
|
||||
'service_description': 'Nova console auth',
|
||||
'service_name': nova_cc,
|
||||
'user_name': nova_user,
|
||||
'start_dir': start_dir,
|
||||
'process_name': 'nova-consoleauth',
|
||||
'executable_name': os.path.join(bin_dir, 'nova-consoleauth'),
|
||||
'config_files': [nova_conf],
|
||||
}
|
||||
nova_console_context = {
|
||||
'service_description': 'Nova console',
|
||||
'service_name': nova_cc,
|
||||
'user_name': nova_user,
|
||||
'start_dir': start_dir,
|
||||
'process_name': 'nova-console',
|
||||
'executable_name': os.path.join(bin_dir, 'nova-console'),
|
||||
'config_files': [nova_conf],
|
||||
}
|
||||
nova_novncproxy_context = {
|
||||
'service_description': 'Nova NoVNC proxy',
|
||||
'service_name': nova_cc,
|
||||
'user_name': nova_user,
|
||||
'start_dir': start_dir,
|
||||
'process_name': 'nova-novncproxy',
|
||||
'executable_name': os.path.join(bin_dir, 'nova-novncproxy'),
|
||||
'config_files': [nova_conf],
|
||||
}
|
||||
nova_objectstore_context = {
|
||||
'service_description': 'Nova object store',
|
||||
'service_name': nova_cc,
|
||||
'user_name': nova_user,
|
||||
'start_dir': start_dir,
|
||||
'process_name': 'nova-objectstore',
|
||||
'executable_name': os.path.join(bin_dir, 'nova-objectstore'),
|
||||
'config_files': [nova_conf],
|
||||
}
|
||||
nova_scheduler_context = {
|
||||
'service_description': 'Nova scheduler',
|
||||
'service_name': nova_cc,
|
||||
'user_name': nova_user,
|
||||
'start_dir': start_dir,
|
||||
'process_name': 'nova-scheduler',
|
||||
'executable_name': os.path.join(bin_dir, 'nova-scheduler'),
|
||||
'config_files': [nova_conf],
|
||||
}
|
||||
nova_serialproxy_context = {
|
||||
'service_description': 'Nova serial proxy',
|
||||
'service_name': nova_cc,
|
||||
'user_name': nova_user,
|
||||
'start_dir': start_dir,
|
||||
'process_name': 'nova-serialproxy',
|
||||
'executable_name': os.path.join(bin_dir, 'nova-serialproxy'),
|
||||
'config_files': [nova_conf],
|
||||
}
|
||||
nova_spiceproxy_context = {
|
||||
'service_description': 'Nova spice proxy',
|
||||
'service_name': nova_cc,
|
||||
'user_name': nova_user,
|
||||
'start_dir': start_dir,
|
||||
'process_name': 'nova-spicehtml5proxy',
|
||||
'executable_name': os.path.join(bin_dir, 'nova-spicehtml5proxy'),
|
||||
'config_files': [nova_conf],
|
||||
}
|
||||
nova_xvpvncproxy_context = {
|
||||
'service_description': 'Nova XVPVNC proxy',
|
||||
'service_name': nova_cc,
|
||||
'user_name': nova_user,
|
||||
'start_dir': start_dir,
|
||||
'process_name': 'nova-xvpvncproxy',
|
||||
'executable_name': os.path.join(bin_dir, 'nova-xvpvncproxy'),
|
||||
'config_files': [nova_conf],
|
||||
}
|
||||
|
||||
templates_dir = 'hooks/charmhelpers/contrib/openstack/templates'
|
||||
templates_dir = os.path.join(charm_dir(), templates_dir)
|
||||
os_rel = os_release('nova-common')
|
||||
render('git.upstart', '/etc/init/nova-api-ec2.conf',
|
||||
nova_ec2_api_context, perms=0o644,
|
||||
templates_dir=templates_dir)
|
||||
render('git.upstart', '/etc/init/nova-api-os-compute.conf',
|
||||
nova_api_os_compute_context, perms=0o644,
|
||||
templates_dir=templates_dir)
|
||||
render('git.upstart', '/etc/init/nova-cells.conf',
|
||||
nova_cells_context, perms=0o644,
|
||||
templates_dir=templates_dir)
|
||||
render('git.upstart', '/etc/init/nova-cert.conf',
|
||||
nova_cert_context, perms=0o644,
|
||||
templates_dir=templates_dir)
|
||||
render('git.upstart', '/etc/init/nova-conductor.conf',
|
||||
nova_conductor_context, perms=0o644,
|
||||
templates_dir=templates_dir)
|
||||
render('git.upstart', '/etc/init/nova-consoleauth.conf',
|
||||
nova_consoleauth_context, perms=0o644,
|
||||
templates_dir=templates_dir)
|
||||
render('git.upstart', '/etc/init/nova-console.conf',
|
||||
nova_console_context, perms=0o644,
|
||||
templates_dir=templates_dir)
|
||||
render('git.upstart', '/etc/init/nova-novncproxy.conf',
|
||||
nova_novncproxy_context, perms=0o644,
|
||||
templates_dir=templates_dir)
|
||||
render('git.upstart', '/etc/init/nova-objectstore.conf',
|
||||
nova_objectstore_context, perms=0o644,
|
||||
templates_dir=templates_dir)
|
||||
render('git.upstart', '/etc/init/nova-scheduler.conf',
|
||||
nova_scheduler_context, perms=0o644,
|
||||
templates_dir=templates_dir)
|
||||
if CompareOpenStackReleases(os_rel) >= 'juno':
|
||||
render('git.upstart', '/etc/init/nova-serialproxy.conf',
|
||||
nova_serialproxy_context, perms=0o644,
|
||||
templates_dir=templates_dir)
|
||||
render('git.upstart', '/etc/init/nova-spiceproxy.conf',
|
||||
nova_spiceproxy_context, perms=0o644,
|
||||
templates_dir=templates_dir)
|
||||
render('git.upstart', '/etc/init/nova-xvpvncproxy.conf',
|
||||
nova_xvpvncproxy_context, perms=0o644,
|
||||
templates_dir=templates_dir)
|
||||
|
||||
apt_update()
|
||||
apt_install(LATE_GIT_PACKAGES, fatal=True)
|
||||
|
||||
|
||||
def get_optional_interfaces():
|
||||
"""Return the optional interfaces that should be checked if the relavent
|
||||
relations have appeared.
|
||||
|
|
|
|||
|
|
@ -1,20 +0,0 @@
|
|||
#!/bin/sh
|
||||
### BEGIN INIT INFO
|
||||
# Provides: nova-api-metadata
|
||||
# Required-Start: $network $local_fs $remote_fs $syslog
|
||||
# Required-Stop: $remote_fs
|
||||
# Should-Start: postgresql mysql keystone rabbitmq-server ntp
|
||||
# Should-Stop: postgresql mysql keystone rabbitmq-server ntp
|
||||
# Default-Start: 2 3 4 5
|
||||
# Default-Stop: 0 1 6
|
||||
# Short-Description: Nova API metadata server
|
||||
# Description: Frontend Nova API metadata server
|
||||
### END INIT INFO
|
||||
|
||||
# Author: Julien Danjou <acid@debian.org>
|
||||
|
||||
# PATH should only include /usr/* if it runs after the mountnfs.sh script
|
||||
PATH=/sbin:/usr/sbin:/bin:/usr/bin
|
||||
DESC="OpenStack Compute metadata API"
|
||||
PROJECT_NAME=nova
|
||||
NAME=${PROJECT_NAME}-api-metadata
|
||||
|
|
@ -1,21 +0,0 @@
|
|||
#!/bin/sh
|
||||
### BEGIN INIT INFO
|
||||
# Provides: nova-api-os-compute
|
||||
# Required-Start: $network $local_fs $remote_fs $syslog
|
||||
# Required-Stop: $remote_fs
|
||||
# Should-Start: postgresql mysql keystone rabbitmq-server ntp
|
||||
# Should-Stop: postgresql mysql keystone rabbitmq-server ntp
|
||||
# Default-Start: 2 3 4 5
|
||||
# Default-Stop: 0 1 6
|
||||
# Short-Description: Nova API server
|
||||
# Description: Frontend Nova API server
|
||||
### END INIT INFO
|
||||
|
||||
# Author: Julien Danjou <acid@debian.org>
|
||||
|
||||
# PATH should only include /usr/* if it runs after the mountnfs.sh script
|
||||
PATH=/sbin:/usr/sbin:/bin:/usr/bin
|
||||
DESC="OpenStack Compute OS API"
|
||||
PROJECT_NAME=nova
|
||||
NAME=${PROJECT_NAME}-api-os-compute
|
||||
DAEMON={{ daemon_path }}
|
||||
|
|
@ -1,20 +0,0 @@
|
|||
#!/bin/sh
|
||||
### BEGIN INIT INFO
|
||||
# Provides: nova-api
|
||||
# Required-Start: $network $local_fs $remote_fs $syslog
|
||||
# Required-Stop: $remote_fs
|
||||
# Should-Start: postgresql mysql keystone rabbitmq-server ntp
|
||||
# Should-Stop: postgresql mysql keystone rabbitmq-server ntp
|
||||
# Default-Start: 2 3 4 5
|
||||
# Default-Stop: 0 1 6
|
||||
# Short-Description: Nova API server
|
||||
# Description: Frontend Nova API server
|
||||
### END INIT INFO
|
||||
|
||||
# Author: Julien Danjou <acid@debian.org>
|
||||
|
||||
# PATH should only include /usr/* if it runs after the mountnfs.sh script
|
||||
PATH=/sbin:/usr/sbin:/bin:/usr/bin
|
||||
DESC="OpenStack Compute API"
|
||||
PROJECT_NAME=nova
|
||||
NAME=${PROJECT_NAME}-api
|
||||
|
|
@ -1,21 +0,0 @@
|
|||
#!/bin/sh
|
||||
### BEGIN INIT INFO
|
||||
# Provides: nova-baremetal
|
||||
# Required-Start: $network $local_fs $remote_fs $syslog
|
||||
# Required-Stop: $remote_fs
|
||||
# Should-Start: postgresql mysql keystone
|
||||
# Should-Stop: postgresql mysql keystone
|
||||
# Default-Start: 2 3 4 5
|
||||
# Default-Stop: 0 1 6
|
||||
# Short-Description: Nova API server
|
||||
# Description: Frontend Nova API server
|
||||
### END INIT INFO
|
||||
|
||||
# Author: Julien Danjou <acid@debian.org>
|
||||
|
||||
# PATH should only include /usr/* if it runs after the mountnfs.sh script
|
||||
PATH=/sbin:/usr/sbin:/bin:/usr/bin
|
||||
DESC="OpenStack Compute Baremetal"
|
||||
PROJECT_NAME=nova
|
||||
NAME=${PROJECT_NAME}-baremetal-deploy-helper
|
||||
DAEMON={{ daemon_path }}
|
||||
|
|
@ -1,21 +0,0 @@
|
|||
#!/bin/sh
|
||||
### BEGIN INIT INFO
|
||||
# Provides: nova-cells
|
||||
# Required-Start: $network $local_fs $remote_fs $syslog
|
||||
# Required-Stop: $remote_fs
|
||||
# Should-Start: postgresql mysql keystone
|
||||
# Should-Stop: postgresql mysql keystone
|
||||
# Default-Start: 2 3 4 5
|
||||
# Default-Stop: 0 1 6
|
||||
# Short-Description: Nova Cells server
|
||||
# Description: Frontend Nova Cells server
|
||||
### END INIT INFO
|
||||
|
||||
# Author: Julien Danjou <acid@debian.org>
|
||||
|
||||
# PATH should only include /usr/* if it runs after the mountnfs.sh script
|
||||
PATH=/sbin:/usr/sbin:/bin:/usr/bin
|
||||
DESC="OpenStack Compute Cells"
|
||||
PROJECT_NAME=nova
|
||||
NAME=${PROJECT_NAME}-cells
|
||||
DAEMON={{ daemon_path }}
|
||||
|
|
@ -1,21 +0,0 @@
|
|||
#!/bin/sh
|
||||
### BEGIN INIT INFO
|
||||
# Provides: nova-cert
|
||||
# Required-Start: $network $local_fs $remote_fs $syslog
|
||||
# Required-Stop: $remote_fs
|
||||
# Should-Start: postgresql mysql keystone rabbitmq-server ntp
|
||||
# Should-Stop: postgresql mysql keystone rabbitmq-server ntp
|
||||
# Default-Start: 2 3 4 5
|
||||
# Default-Stop: 0 1 6
|
||||
# Short-Description: Nova Cert server
|
||||
# Description: Nova Cert server
|
||||
### END INIT INFO
|
||||
|
||||
# Author: Julien Danjou <acid@debian.org>
|
||||
|
||||
# PATH should only include /usr/* if it runs after the mountnfs.sh script
|
||||
PATH=/sbin:/usr/sbin:/bin:/usr/bin
|
||||
DESC="OpenStack Compute Cert"
|
||||
PROJECT_NAME=nova
|
||||
NAME=${PROJECT_NAME}-cert
|
||||
DAEMON={{ daemon_path }}
|
||||
|
|
@ -1,26 +0,0 @@
|
|||
#!/bin/sh
|
||||
### BEGIN INIT INFO
|
||||
# Provides: nova-compute
|
||||
# Required-Start: $network $local_fs $remote_fs $syslog
|
||||
# Required-Stop: $remote_fs
|
||||
# Should-Start: libvirt-bin postgresql mysql keystone rabbitmq-server ntp neutron-ovs-cleanup
|
||||
# Should-Stop: libvirt-bin postgresql mysql keystone rabbitmq-server ntp
|
||||
# Default-Start: 2 3 4 5
|
||||
# Default-Stop: 0 1 6
|
||||
# Short-Description: Nova Compute server
|
||||
# Description: Provides compute server resources for the
|
||||
# OpenStack cloud computing system
|
||||
### END INIT INFO
|
||||
|
||||
# Author: Julien Danjou <acid@debian.org>
|
||||
|
||||
# PATH should only include /usr/* if it runs after the mountnfs.sh script
|
||||
PATH=/sbin:/usr/sbin:/bin:/usr/bin
|
||||
DESC="OpenStack Compute"
|
||||
PROJECT_NAME=nova
|
||||
NAME=${PROJECT_NAME}-compute
|
||||
DAEMON_ARGS=""
|
||||
if [ -f '/etc/nova/nova-compute.conf' ] ; then
|
||||
DAEMON_ARGS="--config-file=/etc/nova/nova-compute.conf"
|
||||
fi
|
||||
|
||||
|
|
@ -1,21 +0,0 @@
|
|||
#!/bin/sh
|
||||
### BEGIN INIT INFO
|
||||
# Provides: nova-conductor
|
||||
# Required-Start: $network $local_fs $remote_fs $syslog
|
||||
# Required-Stop: $remote_fs
|
||||
# Should-Start: postgresql mysql keystone rabbitmq-server ntp
|
||||
# Should-Stop: postgresql mysql keystone rabbitmq-server ntp
|
||||
# Default-Start: 2 3 4 5
|
||||
# Default-Stop: 0 1 6
|
||||
# Short-Description: Nova Conductor server
|
||||
# Description: Frontend Nova Conductor server
|
||||
### END INIT INFO
|
||||
|
||||
# Author: Julien Danjou <acid@debian.org>
|
||||
|
||||
# PATH should only include /usr/* if it runs after the mountnfs.sh script
|
||||
PATH=/sbin:/usr/sbin:/bin:/usr/bin
|
||||
DESC="OpenStack Compute Conductor"
|
||||
PROJECT_NAME=nova
|
||||
NAME=${PROJECT_NAME}-conductor
|
||||
DAEMON={{ daemon_path }}
|
||||
|
|
@ -1,19 +0,0 @@
|
|||
#!/bin/sh
|
||||
### BEGIN INIT INFO
|
||||
# Provides: nova-console
|
||||
# Required-Start: $network $local_fs $remote_fs $syslog
|
||||
# Required-Stop: $remote_fs
|
||||
# Should-Start: postgresql mysql keystone rabbitmq-server ntp
|
||||
# Should-Stop: postgresql mysql keystone rabbitmq-server ntp
|
||||
# Default-Start: 2 3 4 5
|
||||
# Default-Stop: 0 1 6
|
||||
# Short-Description: Nova Console for XenServer and XVP
|
||||
# Description: Nova Console for XenServer and XVP
|
||||
### END INIT INFO
|
||||
|
||||
# Author: Julien Danjou <acid@debian.org>
|
||||
|
||||
DESC="OpenStack Compute Console"
|
||||
PROJECT_NAME=nova
|
||||
NAME=${PROJECT_NAME}-console
|
||||
DAEMON={{ daemon_path }}
|
||||
|
|
@ -1,19 +0,0 @@
|
|||
#!/bin/sh
|
||||
### BEGIN INIT INFO
|
||||
# Provides: nova-consoleauth
|
||||
# Required-Start: $network $local_fs $remote_fs $syslog
|
||||
# Required-Stop: $remote_fs
|
||||
# Should-Start: postgresql mysql keystone rabbitmq-server ntp
|
||||
# Should-Stop: postgresql mysql keystone rabbitmq-server ntp
|
||||
# Default-Start: 2 3 4 5
|
||||
# Default-Stop: 0 1 6
|
||||
# Short-Description: Nova Console Auth
|
||||
# Description: Nova Console Auth
|
||||
### END INIT INFO
|
||||
|
||||
# AUthor: Thomas Goirand <zigo@debian.org>
|
||||
|
||||
DESC="OpenStack Compute Console"
|
||||
PROJECT_NAME=nova
|
||||
NAME=${PROJECT_NAME}-consoleauth
|
||||
DAEMON={{ daemon_path }}
|
||||
|
|
@ -1,18 +0,0 @@
|
|||
#!/bin/sh
|
||||
### BEGIN INIT INFO
|
||||
# Provides: nova-network
|
||||
# Required-Start: $network $local_fs $remote_fs $syslog
|
||||
# Required-Stop: $remote_fs
|
||||
# Should-Start: postgresql mysql keystone
|
||||
# Should-Stop: postgresql mysql keystone
|
||||
# Default-Start: 2 3 4 5
|
||||
# Default-Stop: 0 1 6
|
||||
# Short-Description: Nova Network
|
||||
# Description: Provides network resources
|
||||
### END INIT INFO
|
||||
|
||||
# Author: Thomas Goirand <zigo@debian.org>
|
||||
|
||||
DESC="OpenStack Compute Network"
|
||||
PROJECT_NAME=nova
|
||||
NAME=${PROJECT_NAME}-network
|
||||
|
|
@ -1,21 +0,0 @@
|
|||
#!/bin/sh
|
||||
### BEGIN INIT INFO
|
||||
# Provides: nova-novncproxy
|
||||
# Required-Start: $network $local_fs $remote_fs $syslog
|
||||
# Required-Stop: $remote_fs
|
||||
# Should-Start: nova-consoleauth
|
||||
# Should-Stop: nova-consoleauth
|
||||
# Default-Start: 2 3 4 5
|
||||
# Default-Stop: 0 1 6
|
||||
# Short-Description: Nova novncproxy server
|
||||
# Description: Frontend Nova novncproxy server
|
||||
### END INIT INFO
|
||||
|
||||
# Authors: Julien Danjou <acid@debian.org> & Thomas Goirand <zigo@debian.org>
|
||||
|
||||
# PATH should only include /usr/* if it runs after the mountnfs.sh script
|
||||
PATH=/sbin:/usr/sbin:/bin:/usr/bin
|
||||
DESC="OpenStack Compute novncproxy"
|
||||
PROJECT_NAME=nova
|
||||
NAME=${PROJECT_NAME}-novncproxy
|
||||
DAEMON={{ daemon_path }}
|
||||
|
|
@ -1,19 +0,0 @@
|
|||
#!/bin/sh
|
||||
### BEGIN INIT INFO
|
||||
# Provides: nova-scheduler
|
||||
# Required-Start: $network $local_fs $remote_fs $syslog
|
||||
# Required-Stop: $remote_fs
|
||||
# Should-Start: postgresql mysql keystone
|
||||
# Should-Stop: postgresql mysql keystone
|
||||
# Default-Start: 2 3 4 5
|
||||
# Default-Stop: 0 1 6
|
||||
# Short-Description: Nova Scheduler
|
||||
# Description: Schedules instances, volumes, etc. for Nova
|
||||
### END INIT INFO
|
||||
|
||||
# Author: Julien Danjou <acid@debian.org>
|
||||
|
||||
DESC="OpenStack Compute Scheduler"
|
||||
PROJECT_NAME=nova
|
||||
NAME=nova-scheduler
|
||||
DAEMON={{ daemon_path }}
|
||||
|
|
@ -1,21 +0,0 @@
|
|||
#!/bin/sh
|
||||
### BEGIN INIT INFO
|
||||
# Provides: nova-serialproxy
|
||||
# Required-Start: $network $local_fs $remote_fs $syslog
|
||||
# Required-Stop: $remote_fs
|
||||
# Should-Start: nova-consoleauth
|
||||
# Should-Stop: nova-consoleauth
|
||||
# Default-Start: 2 3 4 5
|
||||
# Default-Stop: 0 1 6
|
||||
# Short-Description: Nova serialproxy server
|
||||
# Description: Frontend Nova serialproxy server
|
||||
### END INIT INFO
|
||||
|
||||
# Authors: Thomas Goirand <zigo@debian.org>
|
||||
|
||||
# PATH should only include /usr/* if it runs after the mountnfs.sh script
|
||||
PATH=/sbin:/usr/sbin:/bin:/usr/bin
|
||||
DESC="OpenStack Compute serialproxy"
|
||||
PROJECT_NAME=nova
|
||||
NAME=${PROJECT_NAME}-serialproxy
|
||||
DAEMON={{ daemon_path }}
|
||||
|
|
@ -1,21 +0,0 @@
|
|||
#!/bin/sh
|
||||
### BEGIN INIT INFO
|
||||
# Provides: nova-spiceproxy
|
||||
# Required-Start: $network $local_fs $remote_fs $syslog
|
||||
# Required-Stop: $remote_fs
|
||||
# Should-Start: nova-consoleauth
|
||||
# Should-Stop: nova-consoleauth
|
||||
# Default-Start: 2 3 4 5
|
||||
# Default-Stop: 0 1 6
|
||||
# Short-Description: Nova Spice HTML5 Proxy
|
||||
# Description: Nova Spice HTML5 Proxy
|
||||
### END INIT INFO
|
||||
|
||||
# Author: Thomas Goirand <zigo@debian.org>
|
||||
|
||||
# PATH should only include /usr/* if it runs after the mountnfs.sh script
|
||||
PATH=/sbin:/usr/sbin:/bin:/usr/bin
|
||||
DESC="OpenStack Compute Spice HTML5 Proxy"
|
||||
PROJECT_NAME=nova
|
||||
NAME=${PROJECT_NAME}-spiceproxy
|
||||
DAEMON={{ daemon_path }}
|
||||
|
|
@ -1,17 +0,0 @@
|
|||
#!/bin/sh
|
||||
### BEGIN INIT INFO
|
||||
# Provides: nova-xvpvncproxy nova-xenvncproxy
|
||||
# Required-Start: $network $local_fs $remote_fs $syslog
|
||||
# Required-Stop: $remote_fs
|
||||
# Default-Start: 2 3 4 5
|
||||
# Default-Stop: 0 1 6
|
||||
# Short-Description: Nova XVP VNC proxy
|
||||
# Description: Nova XVP VNC proxy
|
||||
### END INIT INFO
|
||||
|
||||
# Authors: Thomas Goirand <zigo@debian.org>
|
||||
|
||||
DESC="OpenStack XVP VNC proxy"
|
||||
PROJECT_NAME=nova
|
||||
NAME=${PROJECT_NAME}-xvpvncproxy
|
||||
DAEMON={{ daemon_path }}
|
||||
|
|
@ -1,4 +0,0 @@
|
|||
Defaults:nova !requiretty
|
||||
|
||||
nova ALL = (root) NOPASSWD: /usr/local/bin/nova-rootwrap /etc/nova/rootwrap.conf *
|
||||
|
||||
|
|
@ -13,8 +13,6 @@
|
|||
# limitations under the License.
|
||||
|
||||
import amulet
|
||||
import os
|
||||
import yaml
|
||||
|
||||
from charmhelpers.contrib.openstack.amulet.deployment import (
|
||||
OpenStackAmuletDeployment
|
||||
|
|
@ -51,12 +49,11 @@ u = NovaOpenStackAmuletUtils(DEBUG)
|
|||
class NovaCCBasicDeployment(OpenStackAmuletDeployment):
|
||||
"""Amulet tests on a basic nova cloud controller deployment."""
|
||||
|
||||
def __init__(self, series=None, openstack=None, source=None, git=False,
|
||||
def __init__(self, series=None, openstack=None, source=None,
|
||||
stable=False):
|
||||
"""Deploy the entire test environment."""
|
||||
super(NovaCCBasicDeployment, self).__init__(series, openstack,
|
||||
source, stable)
|
||||
self.git = git
|
||||
self._add_services()
|
||||
self._add_relations()
|
||||
self._configure_services()
|
||||
|
|
@ -145,42 +142,6 @@ class NovaCCBasicDeployment(OpenStackAmuletDeployment):
|
|||
nova_cc_config = {}
|
||||
nova_config = {}
|
||||
|
||||
if self.git:
|
||||
amulet_http_proxy = os.environ.get('AMULET_HTTP_PROXY')
|
||||
|
||||
reqs_repo = 'git://github.com/openstack/requirements'
|
||||
neutron_repo = 'git://github.com/openstack/neutron'
|
||||
nova_repo = 'git://github.com/openstack/nova'
|
||||
if self._get_openstack_release() == self.trusty_icehouse:
|
||||
reqs_repo = 'git://github.com/coreycb/requirements'
|
||||
neutron_repo = 'git://github.com/coreycb/neutron'
|
||||
nova_repo = 'git://github.com/coreycb/nova'
|
||||
|
||||
branch = 'stable/' + self._get_openstack_release_string()
|
||||
|
||||
openstack_origin_git = {
|
||||
'repositories': [
|
||||
{'name': 'requirements',
|
||||
'repository': reqs_repo,
|
||||
'branch': branch},
|
||||
{'name': 'neutron',
|
||||
'repository': neutron_repo,
|
||||
'branch': branch},
|
||||
{'name': 'nova',
|
||||
'repository': nova_repo,
|
||||
'branch': branch},
|
||||
],
|
||||
'directory': '/mnt/openstack-git',
|
||||
'http_proxy': amulet_http_proxy,
|
||||
'https_proxy': amulet_http_proxy,
|
||||
}
|
||||
|
||||
nova_cc_config['openstack-origin-git'] = \
|
||||
yaml.dump(openstack_origin_git)
|
||||
|
||||
nova_config['openstack-origin-git'] = \
|
||||
yaml.dump(openstack_origin_git)
|
||||
|
||||
# Add some rate-limiting options to the charm. These will noop before
|
||||
# icehouse.
|
||||
nova_cc_config['api-rate-limit-rules'] = \
|
||||
|
|
|
|||
|
|
@ -1,24 +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 nova cloud controller git deployment on
|
||||
trusty-icehouse."""
|
||||
|
||||
from basic_deployment import NovaCCBasicDeployment
|
||||
|
||||
if __name__ == '__main__':
|
||||
deployment = NovaCCBasicDeployment(series='trusty', git=True)
|
||||
deployment.run_tests()
|
||||
|
|
@ -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 nova-cloud-controller git deployment on trusty-kilo."""
|
||||
|
||||
from basic_deployment import NovaCCBasicDeployment
|
||||
|
||||
if __name__ == '__main__':
|
||||
deployment = NovaCCBasicDeployment(series='trusty',
|
||||
openstack='cloud:trusty-kilo',
|
||||
source='cloud:trusty-updates/kilo',
|
||||
git=True)
|
||||
deployment.run_tests()
|
||||
|
|
@ -13,6 +13,14 @@
|
|||
# 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.
|
||||
mock_apt = mock.MagicMock()
|
||||
sys.modules['apt'] = mock_apt
|
||||
mock_apt.apt_pkg = mock.MagicMock()
|
||||
|
||||
|
||||
sys.path.append('actions/')
|
||||
sys.path.append('hooks/')
|
||||
|
|
|
|||
|
|
@ -27,7 +27,7 @@ __default_config['openstack-origin'] = ''
|
|||
with mock.patch('charmhelpers.core.hookenv.config') as config:
|
||||
with mock.patch('charmhelpers.contrib.openstack.utils.get_os_codename_package'): # noqa
|
||||
# this makes the config behave more similar to the real config()
|
||||
config.side_effect = lambda k: __default_config[k]
|
||||
config.side_effect = lambda k: __default_config.get(k)
|
||||
|
||||
import nova_cc_utils as utils # noqa
|
||||
|
||||
|
|
|
|||
|
|
@ -1,121 +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()
|
||||
sys.modules['apt_pkg'] = 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))
|
||||
with patch('charmhelpers.contrib.openstack.utils.get_os_codename_package'):
|
||||
with patch('nova_cc_utils.restart_map'):
|
||||
with patch('nova_cc_utils.register_configs'):
|
||||
with patch('nova_cc_utils.guard_map') as gmap:
|
||||
with patch('charmhelpers.core.hookenv.config') as config:
|
||||
config.return_value = False
|
||||
gmap.return_value = {}
|
||||
import git_reinstall
|
||||
|
||||
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: nova,
|
||||
repository: 'git://git.openstack.org/openstack/nova',
|
||||
branch: stable/juno}"""
|
||||
|
||||
|
||||
class TestnovaAPIActions(CharmTestCase):
|
||||
|
||||
def setUp(self):
|
||||
super(TestnovaAPIActions, 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')
|
||||
@patch('charmhelpers.contrib.openstack.utils.config')
|
||||
def test_git_reinstall(self, _config, config_changed, git_install,
|
||||
action_fail, action_set):
|
||||
_config.side_effect = self.test_config.get
|
||||
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})
|
||||
|
|
@ -56,18 +56,16 @@ class TestNovaCCUpgradeActions(CharmTestCase):
|
|||
|
||||
@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):
|
||||
git_requested.return_value = False
|
||||
upgrade_avail.return_value = True
|
||||
config.return_value = True
|
||||
self.relation_ids.return_value = ['relid1']
|
||||
|
||||
openstack_upgrade.openstack_upgrade()
|
||||
|
||||
self.assertTrue(self.do_openstack_upgrade.called)
|
||||
self.assertTrue(self.do_openstack_upgrade.called, config.mock_calls)
|
||||
self.neutron_api_relation_joined.assert_called_with(
|
||||
rid='relid1', remote_restart=True)
|
||||
self.db_joined.assert_called_with(relation_id='relid1')
|
||||
|
|
@ -75,11 +73,9 @@ class TestNovaCCUpgradeActions(CharmTestCase):
|
|||
|
||||
@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):
|
||||
git_requested.return_value = False
|
||||
upgrade_avail.return_value = True
|
||||
config.return_value = False
|
||||
|
||||
|
|
|
|||
|
|
@ -15,8 +15,6 @@
|
|||
import os
|
||||
import tempfile
|
||||
|
||||
import yaml
|
||||
|
||||
from mock import MagicMock, patch, call
|
||||
from test_utils import CharmTestCase
|
||||
|
||||
|
|
@ -87,8 +85,6 @@ TO_PATCH = [
|
|||
'get_iface_for_address',
|
||||
'get_netmask_for_address',
|
||||
'update_nrpe_config',
|
||||
'git_install',
|
||||
'git_install_requested',
|
||||
'status_set',
|
||||
'update_dns_ha_resource_params',
|
||||
'serial_console_settings',
|
||||
|
|
@ -140,32 +136,6 @@ class NovaCCHooksTests(CharmTestCase):
|
|||
self.assertTrue(self.disable_services.called)
|
||||
self.cmd_all_services.assert_called_with('stop')
|
||||
|
||||
def test_install_hook_git(self):
|
||||
self.git_install_requested.return_value = True
|
||||
self.determine_packages.return_value = ['foo', 'bar']
|
||||
self.determine_ports.return_value = [80, 81, 82]
|
||||
repo = 'cloud:trusty-juno'
|
||||
openstack_origin_git = {
|
||||
'repositories': [
|
||||
{'name': 'requirements',
|
||||
'repository': 'git://git.openstack.org/openstack/requirements', # noqa
|
||||
'branch': 'stable/juno'},
|
||||
{'name': 'nova',
|
||||
'repository': 'git://git.openstack.org/openstack/nova',
|
||||
'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)
|
||||
hooks.install()
|
||||
self.git_install.assert_called_with(projects_yaml)
|
||||
self.apt_install.assert_called_with(['foo', 'bar'], fatal=True)
|
||||
self.assertTrue(self.execd_preinstall.called)
|
||||
self.assertTrue(self.disable_services.called)
|
||||
self.cmd_all_services.assert_called_with('stop')
|
||||
|
||||
@patch.object(hooks, 'update_aws_compat_services')
|
||||
@patch.object(hooks, 'update_nova_consoleauth_config')
|
||||
@patch.object(hooks, 'is_db_initialised')
|
||||
|
|
@ -183,7 +153,6 @@ class NovaCCHooksTests(CharmTestCase):
|
|||
mock_determine_packages.return_value = []
|
||||
utils_config.side_effect = self.test_config.get
|
||||
self.test_config.set('console-access-protocol', 'dummy')
|
||||
self.git_install_requested.return_value = False
|
||||
self.openstack_upgrade_available.return_value = False
|
||||
mock_is_db_initialised.return_value = False
|
||||
self.os_release.return_value = 'diablo'
|
||||
|
|
@ -193,40 +162,6 @@ class NovaCCHooksTests(CharmTestCase):
|
|||
self.assertTrue(mock_update_nova_consoleauth_config.called)
|
||||
self.assertTrue(mock_update_aws_compat_services.called)
|
||||
|
||||
@patch.object(hooks, 'update_aws_compat_services')
|
||||
@patch.object(hooks, 'update_nova_consoleauth_config')
|
||||
@patch.object(hooks, 'is_db_initialised')
|
||||
@patch.object(utils, 'service_resume')
|
||||
@patch.object(hooks, 'configure_https')
|
||||
def test_config_changed_git(self, configure_https, mock_service_resume,
|
||||
mock_is_db_initialised,
|
||||
mock_update_nova_consoleauth_config,
|
||||
mock_update_aws_compat_services):
|
||||
self.git_install_requested.return_value = True
|
||||
repo = 'cloud:trusty-juno'
|
||||
openstack_origin_git = {
|
||||
'repositories': [
|
||||
{'name': 'requirements',
|
||||
'repository':
|
||||
'git://git.openstack.org/openstack/requirements',
|
||||
'branch': 'stable/juno'},
|
||||
{'name': 'nova',
|
||||
'repository': 'git://git.openstack.org/openstack/nova',
|
||||
'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)
|
||||
mock_is_db_initialised.return_value = False
|
||||
self.os_release.return_value = 'diablo'
|
||||
hooks.config_changed()
|
||||
self.git_install.assert_called_with(projects_yaml)
|
||||
self.assertFalse(self.do_openstack_upgrade.called)
|
||||
self.assertTrue(mock_update_nova_consoleauth_config.called)
|
||||
self.assertTrue(mock_update_aws_compat_services.called)
|
||||
|
||||
@patch.object(hooks, 'update_aws_compat_services')
|
||||
@patch.object(hooks, 'update_nova_consoleauth_config')
|
||||
@patch.object(hooks, 'is_db_initialised')
|
||||
|
|
@ -257,7 +192,6 @@ class NovaCCHooksTests(CharmTestCase):
|
|||
mock_update_aws_compat_services):
|
||||
mock_determine_packages.return_value = []
|
||||
mock_is_db_initialised.return_value = False
|
||||
self.git_install_requested.return_value = False
|
||||
self.openstack_upgrade_available.return_value = True
|
||||
self.relation_ids.return_value = ['generic_rid']
|
||||
utils_config.side_effect = self.test_config.get
|
||||
|
|
@ -291,7 +225,6 @@ class NovaCCHooksTests(CharmTestCase):
|
|||
mock_is_db_initialised,
|
||||
mock_update_nova_consoleauth_config,
|
||||
mock_update_aws_compat_services):
|
||||
self.git_install_requested.return_value = False
|
||||
self.openstack_upgrade_available.return_value = False
|
||||
self.config_value_changed.return_value = True
|
||||
self.related_units.return_value = ['unit/0']
|
||||
|
|
@ -1037,7 +970,6 @@ class NovaCCHooksTests(CharmTestCase):
|
|||
mock_determine_packages.return_value = []
|
||||
mock_is_db_initialised.return_value = False
|
||||
self.config_value_changed.return_value = False
|
||||
self.git_install_requested.return_value = False
|
||||
self.os_release.return_value = 'diablo'
|
||||
|
||||
def cfg(k, v):
|
||||
|
|
|
|||
|
|
@ -43,16 +43,12 @@ TO_PATCH = [
|
|||
'enable_policy_rcd',
|
||||
'enable_services',
|
||||
'get_os_codename_install_source',
|
||||
'git_src_dir',
|
||||
'git_pip_venv_dir',
|
||||
'log',
|
||||
'os_release',
|
||||
'peer_store',
|
||||
'pip_install',
|
||||
'register_configs',
|
||||
'relation_ids',
|
||||
'remote_unit',
|
||||
'render',
|
||||
'_save_script_rc',
|
||||
'service_start',
|
||||
'services',
|
||||
|
|
@ -173,15 +169,6 @@ ubuntu-cloud-archive/liberty-staging/ubuntu trusty main
|
|||
%s
|
||||
""" % GPG_PPA_CLOUD_ARCHIVE
|
||||
|
||||
openstack_origin_git = \
|
||||
"""repositories:
|
||||
- {name: requirements,
|
||||
repository: 'git://git.openstack.org/openstack/requirements',
|
||||
branch: stable/juno}
|
||||
- {name: nova,
|
||||
repository: 'git://git.openstack.org/openstack/nova',
|
||||
branch: stable/juno}"""
|
||||
|
||||
|
||||
class NovaCCUtilsTests(CharmTestCase):
|
||||
|
||||
|
|
@ -386,9 +373,7 @@ class NovaCCUtilsTests(CharmTestCase):
|
|||
unit='mysql/0')
|
||||
|
||||
@patch('charmhelpers.contrib.openstack.context.SubordinateConfigContext')
|
||||
@patch.object(utils, 'git_install_requested')
|
||||
def test_determine_packages_console(self, git_requested, subcontext):
|
||||
git_requested.return_value = False
|
||||
def test_determine_packages_console(self, subcontext):
|
||||
self.test_config.set('console-access-protocol', 'spice')
|
||||
self.relation_ids.return_value = []
|
||||
self.os_release.return_value = 'diablo'
|
||||
|
|
@ -398,9 +383,7 @@ class NovaCCUtilsTests(CharmTestCase):
|
|||
self.assertIn(console_pkg, pkgs)
|
||||
|
||||
@patch('charmhelpers.contrib.openstack.context.SubordinateConfigContext')
|
||||
@patch.object(utils, 'git_install_requested')
|
||||
def test_determine_packages_base_icehouse(self, git_requested, subcontext):
|
||||
git_requested.return_value = False
|
||||
def test_determine_packages_base_icehouse(self, subcontext):
|
||||
self.relation_ids.return_value = []
|
||||
self.os_release.return_value = 'icehouse'
|
||||
self.token_cache_pkgs.return_value = []
|
||||
|
|
@ -412,9 +395,7 @@ class NovaCCUtilsTests(CharmTestCase):
|
|||
self.assertEqual(ex, pkgs)
|
||||
|
||||
@patch('charmhelpers.contrib.openstack.context.SubordinateConfigContext')
|
||||
@patch.object(utils, 'git_install_requested')
|
||||
def test_determine_packages_base_ocata(self, git_requested, subcontext):
|
||||
git_requested.return_value = False
|
||||
def test_determine_packages_base_ocata(self, subcontext):
|
||||
self.relation_ids.return_value = []
|
||||
self.os_release.return_value = 'ocata'
|
||||
self.token_cache_pkgs.return_value = []
|
||||
|
|
@ -424,11 +405,8 @@ class NovaCCUtilsTests(CharmTestCase):
|
|||
self.assertEqual(ex, pkgs)
|
||||
|
||||
@patch('charmhelpers.contrib.openstack.context.SubordinateConfigContext')
|
||||
@patch.object(utils, 'git_install_requested')
|
||||
def test_determine_packages_serial_console(self,
|
||||
git_requested,
|
||||
subcontext):
|
||||
git_requested.return_value = False
|
||||
self.test_config.set('enable-serial-console', True)
|
||||
self.relation_ids.return_value = []
|
||||
self.os_release.return_value = 'juno'
|
||||
|
|
@ -438,11 +416,8 @@ class NovaCCUtilsTests(CharmTestCase):
|
|||
self.assertIn(console_pkg, pkgs)
|
||||
|
||||
@patch('charmhelpers.contrib.openstack.context.SubordinateConfigContext')
|
||||
@patch.object(utils, 'git_install_requested')
|
||||
def test_determine_packages_serial_console_icehouse(self,
|
||||
git_requested,
|
||||
subcontext):
|
||||
git_requested.return_value = False
|
||||
self.test_config.set('enable-serial-console', True)
|
||||
self.relation_ids.return_value = []
|
||||
self.os_release.return_value = 'icehouse'
|
||||
|
|
@ -925,320 +900,6 @@ class NovaCCUtilsTests(CharmTestCase):
|
|||
self.assertFalse(self.service_stop.called)
|
||||
self.assertTrue(contexts.complete_contexts.called)
|
||||
|
||||
@patch.object(utils, 'git_install_requested')
|
||||
@patch.object(utils, 'git_clone_and_install')
|
||||
@patch.object(utils, 'git_post_install')
|
||||
@patch.object(utils, '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
|
||||
utils.git_install(projects_yaml)
|
||||
self.assertTrue(git_pre.called)
|
||||
git_clone_and_install.assert_called_with(openstack_origin_git,
|
||||
core_project='nova')
|
||||
self.assertTrue(git_post.called)
|
||||
|
||||
@patch.object(utils, 'mkdir')
|
||||
@patch.object(utils, 'add_user_to_group')
|
||||
@patch.object(utils, 'add_group')
|
||||
@patch.object(utils, 'adduser')
|
||||
@patch('subprocess.check_call')
|
||||
def test_git_pre_install(self, check_call, adduser, add_group,
|
||||
add_user_to_group, mkdir):
|
||||
utils.git_pre_install()
|
||||
expected = [
|
||||
call('nova', shell='/bin/bash', system_user=True),
|
||||
call('neutron', shell='/bin/bash', system_user=True),
|
||||
]
|
||||
self.assertEqual(adduser.call_args_list, expected)
|
||||
check_call.assert_called_with(['usermod', '--home', '/var/lib/nova',
|
||||
'nova'])
|
||||
expected = [
|
||||
call('nova', system_group=True),
|
||||
call('neutron', system_group=True),
|
||||
]
|
||||
self.assertEqual(add_group.call_args_list, expected)
|
||||
expected = [
|
||||
call('nova', 'nova'),
|
||||
call('neutron', 'neutron'),
|
||||
]
|
||||
self.assertEqual(add_user_to_group.call_args_list, expected)
|
||||
expected = [
|
||||
call('/var/lib/nova', owner='nova',
|
||||
group='nova', perms=0755, force=False),
|
||||
call('/var/lib/nova/buckets', owner='nova',
|
||||
group='nova', perms=0755, force=False),
|
||||
call('/var/lib/nova/CA', owner='nova',
|
||||
group='nova', perms=0755, force=False),
|
||||
call('/var/lib/nova/CA/INTER', owner='nova',
|
||||
group='nova', perms=0755, force=False),
|
||||
call('/var/lib/nova/CA/newcerts', owner='nova',
|
||||
group='nova', perms=0755, force=False),
|
||||
call('/var/lib/nova/CA/private', owner='nova',
|
||||
group='nova', perms=0755, force=False),
|
||||
call('/var/lib/nova/CA/reqs', owner='nova',
|
||||
group='nova', perms=0755, force=False),
|
||||
call('/var/lib/nova/images', owner='nova',
|
||||
group='nova', perms=0755, force=False),
|
||||
call('/var/lib/nova/instances', owner='nova',
|
||||
group='nova', perms=0755, force=False),
|
||||
call('/var/lib/nova/keys', owner='nova',
|
||||
group='nova', perms=0755, force=False),
|
||||
call('/var/lib/nova/networks', owner='nova',
|
||||
group='nova', perms=0755, force=False),
|
||||
call('/var/lib/nova/tmp', owner='nova',
|
||||
group='nova', perms=0755, force=False),
|
||||
call('/var/lib/neutron', owner='nova',
|
||||
group='nova', perms=0755, force=False),
|
||||
call('/var/lib/neutron/lock', owner='nova',
|
||||
group='nova', perms=0755, force=False),
|
||||
call('/var/log/nova', owner='nova',
|
||||
group='nova', perms=0755, force=False),
|
||||
call('/etc/neutron', owner='nova',
|
||||
group='nova', perms=0755, force=False),
|
||||
call('/etc/neutron/plugins', owner='nova',
|
||||
group='nova', perms=0755, force=False),
|
||||
call('/etc/neutron/plugins/ml2', owner='nova',
|
||||
group='nova', perms=0755, force=False),
|
||||
]
|
||||
self.assertEqual(mkdir.call_args_list, expected)
|
||||
|
||||
@patch('os.listdir')
|
||||
@patch('os.path.join')
|
||||
@patch('os.path.exists')
|
||||
@patch('os.symlink')
|
||||
@patch('shutil.copytree')
|
||||
@patch('shutil.rmtree')
|
||||
def test_git_post_install_upstart(self, rmtree, copytree, symlink, exists,
|
||||
join, listdir):
|
||||
projects_yaml = openstack_origin_git
|
||||
join.return_value = 'joined-string'
|
||||
self.lsb_release.return_value = {'DISTRIB_RELEASE': '15.04'}
|
||||
self.git_pip_venv_dir.return_value = '/mnt/openstack-git/venv'
|
||||
self.os_release.return_value = 'diablo'
|
||||
utils.git_post_install(projects_yaml)
|
||||
expected = [
|
||||
call('joined-string', '/etc/nova'),
|
||||
]
|
||||
copytree.assert_has_calls(expected)
|
||||
expected = [
|
||||
call('joined-string', '/usr/local/bin/nova-manage'),
|
||||
call('joined-string', '/usr/local/bin/nova-rootwrap'),
|
||||
]
|
||||
|
||||
nova_cc = 'nova-cloud-controller'
|
||||
nova_user = 'nova'
|
||||
start_dir = '/var/lib/nova'
|
||||
nova_conf = '/etc/nova/nova.conf'
|
||||
nova_ec2_api_context = {
|
||||
'service_description': 'Nova EC2 API server',
|
||||
'service_name': nova_cc,
|
||||
'user_name': nova_user,
|
||||
'start_dir': start_dir,
|
||||
'process_name': 'nova-api-ec2',
|
||||
'executable_name': 'joined-string',
|
||||
'config_files': [nova_conf],
|
||||
}
|
||||
nova_api_os_compute_context = {
|
||||
'service_description': 'Nova OpenStack Compute API server',
|
||||
'service_name': nova_cc,
|
||||
'user_name': nova_user,
|
||||
'start_dir': start_dir,
|
||||
'process_name': 'nova-api-os-compute',
|
||||
'executable_name': 'joined-string',
|
||||
'config_files': [nova_conf],
|
||||
}
|
||||
nova_cells_context = {
|
||||
'service_description': 'Nova cells',
|
||||
'service_name': nova_cc,
|
||||
'user_name': nova_user,
|
||||
'start_dir': start_dir,
|
||||
'process_name': 'nova-cells',
|
||||
'executable_name': 'joined-string',
|
||||
'config_files': [nova_conf],
|
||||
}
|
||||
nova_cert_context = {
|
||||
'service_description': 'Nova cert',
|
||||
'service_name': nova_cc,
|
||||
'user_name': nova_user,
|
||||
'start_dir': start_dir,
|
||||
'process_name': 'nova-cert',
|
||||
'executable_name': 'joined-string',
|
||||
'config_files': [nova_conf],
|
||||
}
|
||||
nova_conductor_context = {
|
||||
'service_description': 'Nova conductor',
|
||||
'service_name': nova_cc,
|
||||
'user_name': nova_user,
|
||||
'start_dir': start_dir,
|
||||
'process_name': 'nova-conductor',
|
||||
'executable_name': 'joined-string',
|
||||
'config_files': [nova_conf],
|
||||
}
|
||||
nova_consoleauth_context = {
|
||||
'service_description': 'Nova console auth',
|
||||
'service_name': nova_cc,
|
||||
'user_name': nova_user,
|
||||
'start_dir': start_dir,
|
||||
'process_name': 'nova-consoleauth',
|
||||
'executable_name': 'joined-string',
|
||||
'config_files': [nova_conf],
|
||||
}
|
||||
nova_console_context = {
|
||||
'service_description': 'Nova console',
|
||||
'service_name': nova_cc,
|
||||
'user_name': nova_user,
|
||||
'start_dir': start_dir,
|
||||
'process_name': 'nova-console',
|
||||
'executable_name': 'joined-string',
|
||||
'config_files': [nova_conf],
|
||||
}
|
||||
nova_novncproxy_context = {
|
||||
'service_description': 'Nova NoVNC proxy',
|
||||
'service_name': nova_cc,
|
||||
'user_name': nova_user,
|
||||
'start_dir': start_dir,
|
||||
'process_name': 'nova-novncproxy',
|
||||
'executable_name': 'joined-string',
|
||||
'config_files': [nova_conf],
|
||||
}
|
||||
nova_objectstore_context = {
|
||||
'service_description': 'Nova object store',
|
||||
'service_name': nova_cc,
|
||||
'user_name': nova_user,
|
||||
'start_dir': start_dir,
|
||||
'process_name': 'nova-objectstore',
|
||||
'executable_name': 'joined-string',
|
||||
'config_files': [nova_conf],
|
||||
}
|
||||
nova_scheduler_context = {
|
||||
'service_description': 'Nova scheduler',
|
||||
'service_name': nova_cc,
|
||||
'user_name': nova_user,
|
||||
'start_dir': start_dir,
|
||||
'process_name': 'nova-scheduler',
|
||||
'executable_name': 'joined-string',
|
||||
'config_files': [nova_conf],
|
||||
}
|
||||
nova_spiceproxy_context = {
|
||||
'service_description': 'Nova spice proxy',
|
||||
'service_name': nova_cc,
|
||||
'user_name': nova_user,
|
||||
'start_dir': start_dir,
|
||||
'process_name': 'nova-spicehtml5proxy',
|
||||
'executable_name': 'joined-string',
|
||||
'config_files': [nova_conf],
|
||||
}
|
||||
nova_xvpvncproxy_context = {
|
||||
'service_description': 'Nova XVPVNC proxy',
|
||||
'service_name': nova_cc,
|
||||
'user_name': nova_user,
|
||||
'start_dir': start_dir,
|
||||
'process_name': 'nova-xvpvncproxy',
|
||||
'executable_name': 'joined-string',
|
||||
'config_files': [nova_conf],
|
||||
}
|
||||
expected = [
|
||||
call('git/nova_sudoers', '/etc/sudoers.d/nova_sudoers',
|
||||
{}, perms=0o440),
|
||||
call('git.upstart', '/etc/init/nova-api-ec2.conf',
|
||||
nova_ec2_api_context, perms=0o644,
|
||||
templates_dir='joined-string'),
|
||||
call('git.upstart', '/etc/init/nova-api-os-compute.conf',
|
||||
nova_api_os_compute_context, perms=0o644,
|
||||
templates_dir='joined-string'),
|
||||
call('git.upstart', '/etc/init/nova-cells.conf',
|
||||
nova_cells_context, perms=0o644,
|
||||
templates_dir='joined-string'),
|
||||
call('git.upstart', '/etc/init/nova-cert.conf',
|
||||
nova_cert_context, perms=0o644,
|
||||
templates_dir='joined-string'),
|
||||
call('git.upstart', '/etc/init/nova-conductor.conf',
|
||||
nova_conductor_context, perms=0o644,
|
||||
templates_dir='joined-string'),
|
||||
call('git.upstart', '/etc/init/nova-consoleauth.conf',
|
||||
nova_consoleauth_context, perms=0o644,
|
||||
templates_dir='joined-string'),
|
||||
call('git.upstart', '/etc/init/nova-console.conf',
|
||||
nova_console_context, perms=0o644,
|
||||
templates_dir='joined-string'),
|
||||
call('git.upstart', '/etc/init/nova-novncproxy.conf',
|
||||
nova_novncproxy_context, perms=0o644,
|
||||
templates_dir='joined-string'),
|
||||
call('git.upstart', '/etc/init/nova-objectstore.conf',
|
||||
nova_objectstore_context, perms=0o644,
|
||||
templates_dir='joined-string'),
|
||||
call('git.upstart', '/etc/init/nova-scheduler.conf',
|
||||
nova_scheduler_context, perms=0o644,
|
||||
templates_dir='joined-string'),
|
||||
call('git.upstart', '/etc/init/nova-spiceproxy.conf',
|
||||
nova_spiceproxy_context, perms=0o644,
|
||||
templates_dir='joined-string'),
|
||||
call('git.upstart', '/etc/init/nova-xvpvncproxy.conf',
|
||||
nova_xvpvncproxy_context, perms=0o644,
|
||||
templates_dir='joined-string'),
|
||||
]
|
||||
self.assertEqual(self.render.call_args_list, expected)
|
||||
self.assertTrue(self.apt_update.called)
|
||||
self.apt_install.assert_called_with(['novnc', 'spice-html5',
|
||||
'websockify'], fatal=True)
|
||||
|
||||
@patch('os.listdir')
|
||||
@patch('os.path.join')
|
||||
@patch('os.path.exists')
|
||||
@patch('os.symlink')
|
||||
@patch('shutil.copytree')
|
||||
@patch('shutil.rmtree')
|
||||
def test_git_post_install_systemd(self, rmtree, copytree, symlink, exists,
|
||||
join, listdir):
|
||||
projects_yaml = openstack_origin_git
|
||||
join.return_value = 'joined-string'
|
||||
self.lsb_release.return_value = {'DISTRIB_RELEASE': '15.10'}
|
||||
self.git_pip_venv_dir.return_value = '/mnt/openstack-git/venv'
|
||||
utils.git_post_install(projects_yaml)
|
||||
expected = [
|
||||
call('git/nova_sudoers', '/etc/sudoers.d/nova_sudoers',
|
||||
{}, perms=288),
|
||||
call('git/nova-api-os-compute.init.in.template',
|
||||
'joined-string', {'daemon_path': 'joined-string'},
|
||||
perms=420),
|
||||
call('git/nova-baremetal.init.in.template',
|
||||
'joined-string', {'daemon_path': 'joined-string'},
|
||||
perms=420),
|
||||
call('git/nova-cells.init.in.template',
|
||||
'joined-string', {'daemon_path': 'joined-string'},
|
||||
perms=420),
|
||||
call('git/nova-cert.init.in.template',
|
||||
'joined-string', {'daemon_path': 'joined-string'},
|
||||
perms=420),
|
||||
call('git/nova-conductor.init.in.template',
|
||||
'joined-string', {'daemon_path': 'joined-string'},
|
||||
perms=420),
|
||||
call('git/nova-consoleauth.init.in.template',
|
||||
'joined-string', {'daemon_path': 'joined-string'},
|
||||
perms=420),
|
||||
call('git/nova-console.init.in.template',
|
||||
'joined-string', {'daemon_path': 'joined-string'},
|
||||
perms=420),
|
||||
call('git/nova-novncproxy.init.in.template',
|
||||
'joined-string', {'daemon_path': 'joined-string'},
|
||||
perms=420),
|
||||
call('git/nova-scheduler.init.in.template',
|
||||
'joined-string', {'daemon_path': 'joined-string'},
|
||||
perms=420),
|
||||
call('git/nova-serialproxy.init.in.template',
|
||||
'joined-string', {'daemon_path': 'joined-string'},
|
||||
perms=420),
|
||||
call('git/nova-spiceproxy.init.in.template',
|
||||
'joined-string', {'daemon_path': 'joined-string'},
|
||||
perms=420),
|
||||
call('git/nova-xvpvncproxy.init.in.template',
|
||||
'joined-string', {'daemon_path': 'joined-string'},
|
||||
perms=420),
|
||||
]
|
||||
self.assertEqual(self.render.call_args_list, expected)
|
||||
|
||||
def _test_is_api_ready(self, tgt):
|
||||
fake_config = MagicMock()
|
||||
with patch.object(utils, 'incomplete_relation_data') as ird:
|
||||
|
|
|
|||
Loading…
Reference in New Issue