Juju Charms Collection
neutron-openvswitch package

Merge lp:~corey.bryant/charms/trusty/neutron-openvswitch/amulet-git-fixups into lp:~openstack-charmers-archive/charms/trusty/neutron-openvswitch/next

  1. Trusty Tahr (14.04)
  2. amulet-git-fixups
  3. Merge into next
Proposed by Corey Bryant
Status: Merged
Merged at revision: 75
Proposed branch: lp:~corey.bryant/charms/trusty/neutron-openvswitch/amulet-git-fixups
Merge into: lp:~openstack-charmers-archive/charms/trusty/neutron-openvswitch/next
Diff against target: 102 lines (+49/-19)
3 files modified
hooks/neutron_ovs_utils.py (+2/-0)
tests/00-setup (+1/-0)
tests/basic_deployment.py (+46/-19)
To merge this branch: bzr merge lp:~corey.bryant/charms/trusty/neutron-openvswitch/amulet-git-fixups
Reviewer Review Type Date Requested Status
OpenStack Charmers Pending
Review via email: mp+264575@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Corey Bryant (corey.bryant) wrote :

Amulet deploy from source updates:
  * Install amulet pre-req python-distro-info
  * Use modified icehouse branches due to requirements issues
  * Add neutron-*aas repos for kilo+

lp:~corey.bryant/charms/trusty/neutron-openvswitch/amulet-git-fixups updated
84. By Corey Bryant

Install libffi-dev requirement for deploy from source.

Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

charm_lint_check #6125 neutron-openvswitch-next for corey.bryant mp264575
    LINT OK: passed

Build: http://10.245.162.77:8080/job/charm_lint_check/6125/

Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

charm_unit_test #5757 neutron-openvswitch-next for corey.bryant mp264575
    UNIT OK: passed

Build: http://10.245.162.77:8080/job/charm_unit_test/5757/

Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

charm_amulet_test #5114 neutron-openvswitch-next for corey.bryant mp264575
    AMULET OK: passed

Build: http://10.245.162.77:8080/job/charm_amulet_test/5114/

lp:~corey.bryant/charms/trusty/neutron-openvswitch/amulet-git-fixups updated
85. By Corey Bryant

Enable tests/017-basic-trusty-kilo

Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

charm_lint_check #6174 neutron-openvswitch-next for corey.bryant mp264575
    LINT OK: passed

Build: http://10.245.162.77:8080/job/charm_lint_check/6174/

Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

charm_unit_test #5806 neutron-openvswitch-next for corey.bryant mp264575
    UNIT OK: passed

Build: http://10.245.162.77:8080/job/charm_unit_test/5806/

Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

charm_amulet_test #5118 neutron-openvswitch-next for corey.bryant mp264575
    AMULET OK: passed

Build: http://10.245.162.77:8080/job/charm_amulet_test/5118/

lp:~corey.bryant/charms/trusty/neutron-openvswitch/amulet-git-fixups updated
86. By Corey Bryant

Install libssl-dev for deploy from source

Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

charm_lint_check #6179 neutron-openvswitch-next for corey.bryant mp264575
    LINT OK: passed

Build: http://10.245.162.77:8080/job/charm_lint_check/6179/

Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

charm_unit_test #5811 neutron-openvswitch-next for corey.bryant mp264575
    UNIT OK: passed

Build: http://10.245.162.77:8080/job/charm_unit_test/5811/

Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

charm_amulet_test #5123 neutron-openvswitch-next for corey.bryant mp264575
    AMULET OK: passed

Build: http://10.245.162.77:8080/job/charm_amulet_test/5123/

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'hooks/neutron_ovs_utils.py'
2--- hooks/neutron_ovs_utils.py 2015-05-12 19:51:00 +0000
3+++ hooks/neutron_ovs_utils.py 2015-07-14 19:52:49 +0000
4@@ -44,6 +44,8 @@
5 from charmhelpers.core.templating import render
6
7 BASE_GIT_PACKAGES = [
8+ 'libffi-dev',
9+ 'libssl-dev',
10 'libxml2-dev',
11 'libxslt1-dev',
12 'libyaml-dev',
13
14=== modified file 'tests/00-setup'
15--- tests/00-setup 2015-02-13 12:02:13 +0000
16+++ tests/00-setup 2015-07-14 19:52:49 +0000
17@@ -5,6 +5,7 @@
18 sudo add-apt-repository --yes ppa:juju/stable
19 sudo apt-get update --yes
20 sudo apt-get install --yes python-amulet \
21+ python-distro-info \
22 python-neutronclient \
23 python-keystoneclient \
24 python-novaclient \
25
26=== modified file 'tests/017-basic-trusty-kilo' (properties changed: -x to +x)
27=== modified file 'tests/basic_deployment.py'
28--- tests/basic_deployment.py 2015-07-09 18:16:49 +0000
29+++ tests/basic_deployment.py 2015-07-14 19:52:49 +0000
30@@ -67,26 +67,53 @@
31 """Configure all of the services."""
32 neutron_ovs_config = {}
33 if self.git:
34- release = self._get_openstack_release_string()
35- reqs_branch = 'stable/' + release
36- if self._get_openstack_release() == self.trusty_icehouse:
37- neutron_branch = release + '-eol'
38+ amulet_http_proxy = os.environ.get('AMULET_HTTP_PROXY')
39+
40+ branch = 'stable/' + self._get_openstack_release_string()
41+
42+ if self._get_openstack_release() >= self.trusty_kilo:
43+ openstack_origin_git = {
44+ 'repositories': [
45+ {'name': 'requirements',
46+ 'repository': 'git://github.com/openstack/requirements',
47+ 'branch': branch},
48+ {'name': 'neutron-fwaas',
49+ 'repository': 'git://github.com/openstack/neutron-fwaas',
50+ 'branch': branch},
51+ {'name': 'neutron-lbaas',
52+ 'repository': 'git://github.com/openstack/neutron-lbaas',
53+ 'branch': branch},
54+ {'name': 'neutron-vpnaas',
55+ 'repository': 'git://github.com/openstack/neutron-vpnaas',
56+ 'branch': branch},
57+ {'name': 'neutron',
58+ 'repository': 'git://github.com/openstack/neutron',
59+ 'branch': branch},
60+ ],
61+ 'directory': '/mnt/openstack-git',
62+ 'http_proxy': amulet_http_proxy,
63+ 'https_proxy': amulet_http_proxy,
64+ }
65 else:
66- neutron_branch = 'stable/' + release
67- amulet_http_proxy = os.environ.get('AMULET_HTTP_PROXY')
68- openstack_origin_git = {
69- 'repositories': [
70- {'name': 'requirements',
71- 'repository': 'git://github.com/openstack/requirements',
72- 'branch': reqs_branch},
73- {'name': 'neutron',
74- 'repository': 'git://github.com/openstack/neutron',
75- 'branch': neutron_branch},
76- ],
77- 'directory': '/mnt/openstack-git',
78- 'http_proxy': amulet_http_proxy,
79- 'https_proxy': amulet_http_proxy,
80- }
81+ reqs_repo = 'git://github.com/openstack/requirements'
82+ neutron_repo = 'git://github.com/openstack/neutron'
83+ if self._get_openstack_release() == self.trusty_icehouse:
84+ reqs_repo = 'git://github.com/coreycb/requirements'
85+ neutron_repo = 'git://github.com/coreycb/neutron'
86+
87+ openstack_origin_git = {
88+ 'repositories': [
89+ {'name': 'requirements',
90+ 'repository': reqs_repo,
91+ 'branch': branch},
92+ {'name': 'neutron',
93+ 'repository': neutron_repo,
94+ 'branch': branch},
95+ ],
96+ 'directory': '/mnt/openstack-git',
97+ 'http_proxy': amulet_http_proxy,
98+ 'https_proxy': amulet_http_proxy,
99+ }
100 neutron_ovs_config['openstack-origin-git'] = yaml.dump(openstack_origin_git)
101 configs = {'neutron-openvswitch': neutron_ovs_config}
102 super(NeutronOVSBasicDeployment, self)._configure_services(configs)

Subscribers

People subscribed via source and target branches