[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:
commit
0ff315aa37
|
@ -81,6 +81,7 @@ BASE_GIT_PACKAGES = [
|
||||||
'libxslt1-dev',
|
'libxslt1-dev',
|
||||||
'libyaml-dev',
|
'libyaml-dev',
|
||||||
'python-dev',
|
'python-dev',
|
||||||
|
'python-neutronclient', # required for get_neutron_client() import
|
||||||
'python-pip',
|
'python-pip',
|
||||||
'python-setuptools',
|
'python-setuptools',
|
||||||
'zlib1g-dev',
|
'zlib1g-dev',
|
||||||
|
|
|
@ -5,6 +5,7 @@ set -ex
|
||||||
sudo add-apt-repository --yes ppa:juju/stable
|
sudo add-apt-repository --yes ppa:juju/stable
|
||||||
sudo apt-get update --yes
|
sudo apt-get update --yes
|
||||||
sudo apt-get install --yes python-amulet \
|
sudo apt-get install --yes python-amulet \
|
||||||
|
python-distro-info \
|
||||||
python-neutronclient \
|
python-neutronclient \
|
||||||
python-keystoneclient \
|
python-keystoneclient \
|
||||||
python-novaclient \
|
python-novaclient \
|
||||||
|
|
|
@ -107,21 +107,48 @@ class NeutronAPIBasicDeployment(OpenStackAmuletDeployment):
|
||||||
"""Configure all of the services."""
|
"""Configure all of the services."""
|
||||||
neutron_api_config = {}
|
neutron_api_config = {}
|
||||||
if self.git:
|
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')
|
amulet_http_proxy = os.environ.get('AMULET_HTTP_PROXY')
|
||||||
|
|
||||||
|
branch = 'stable/' + self._get_openstack_release_string()
|
||||||
|
|
||||||
|
if self._get_openstack_release() >= self.trusty_kilo:
|
||||||
openstack_origin_git = {
|
openstack_origin_git = {
|
||||||
'repositories': [
|
'repositories': [
|
||||||
{'name': 'requirements',
|
{'name': 'requirements',
|
||||||
'repository': 'git://github.com/openstack/requirements',
|
'repository': 'git://github.com/openstack/requirements',
|
||||||
'branch': reqs_branch},
|
'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',
|
{'name': 'neutron',
|
||||||
'repository': 'git://github.com/openstack/neutron',
|
'repository': 'git://github.com/openstack/neutron',
|
||||||
'branch': neutron_branch},
|
'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',
|
'directory': '/mnt/openstack-git',
|
||||||
'http_proxy': amulet_http_proxy,
|
'http_proxy': amulet_http_proxy,
|
||||||
|
|
Loading…
Reference in New Issue