openstack
/
charm-neutron-api
Code Issues Proposed changes

[corey.bryant,trivial] Deploy from source updates 

* Install python-neutronclient for deploy from source, required for
  get_neutron_client() import.
* Install amulet requirement python-distro-info.
* Use icehouse repositories with modified requirements due to issues
  with final upstream icehouse requirements.
* Add neutron-*aas repositories for amulet tests >= kilo.
This commit is contained in:
Corey Bryant 2015-07-13 15:58:01 -04:00
parent b3895fadd4 f72657c7e9
commit 0ff315aa37
3 changed files with 48 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
hooks/neutron_api_utils.py
View File

@ -81,6 +81,7 @@ BASE_GIT_PACKAGES = [
'libxslt1-dev',
'libyaml-dev',
'python-dev',
'python-neutronclient', # required for get_neutron_client() import
'python-pip',
'python-setuptools',
'zlib1g-dev',

1
tests/00-setup
View File

@ -5,6 +5,7 @@ set -ex
sudo add-apt-repository --yes ppa:juju/stable
sudo apt-get update --yes
sudo apt-get install --yes python-amulet \
python-distro-info \
python-neutronclient \
python-keystoneclient \
python-novaclient \

65
tests/basic_deployment.py
View File

@ -107,26 +107,53 @@ class NeutronAPIBasicDeployment(OpenStackAmuletDeployment):
"""Configure all of the services."""
neutron_api_config = {}
if self.git:
release = self._get_openstack_release_string()
reqs_branch = 'stable/' + release
if self._get_openstack_release() == self.trusty_icehouse:
neutron_branch = release + '-eol'
else:
neutron_branch = 'stable/' + release
amulet_http_proxy = os.environ.get('AMULET_HTTP_PROXY')
openstack_origin_git = {
'repositories': [
{'name': 'requirements',
'repository': 'git://github.com/openstack/requirements',
'branch': reqs_branch},
{'name': 'neutron',
'repository': 'git://github.com/openstack/neutron',
'branch': neutron_branch},
],
'directory': '/mnt/openstack-git',
'http_proxy': amulet_http_proxy,
'https_proxy': amulet_http_proxy,
}
branch = 'stable/' + self._get_openstack_release_string()
if self._get_openstack_release() >= self.trusty_kilo:
openstack_origin_git = {
'repositories': [
{'name': 'requirements',
'repository': 'git://github.com/openstack/requirements',
'branch': branch},
{'name': 'neutron-fwaas',
'repository': 'git://github.com/openstack/neutron-fwaas',
'branch': branch},
{'name': 'neutron-lbaas',
'repository': 'git://github.com/openstack/neutron-lbaas',
'branch': branch},
{'name': 'neutron-vpnaas',
'repository': 'git://github.com/openstack/neutron-vpnaas',
'branch': branch},
{'name': 'neutron',
'repository': 'git://github.com/openstack/neutron',
'branch': branch},
],
'directory': '/mnt/openstack-git',
'http_proxy': amulet_http_proxy,
'https_proxy': amulet_http_proxy,
}
else:
reqs_repo = 'git://github.com/openstack/requirements'
neutron_repo = 'git://github.com/openstack/neutron'
if self._get_openstack_release() == self.trusty_icehouse:
reqs_repo = 'git://github.com/coreycb/requirements'
neutron_repo = 'git://github.com/coreycb/neutron'
openstack_origin_git = {
'repositories': [
{'name': 'requirements',
'repository': reqs_repo,
'branch': branch},
{'name': 'neutron',
'repository': neutron_repo,
'branch': branch},
],
'directory': '/mnt/openstack-git',
'http_proxy': amulet_http_proxy,
'https_proxy': amulet_http_proxy,
}
neutron_api_config['openstack-origin-git'] = yaml.dump(openstack_origin_git)
keystone_config = {'admin-password': 'openstack',
'admin-token': 'ubuntutesting'}