Juju Charms Collection
nova-compute package

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

  1. Trusty Tahr (14.04)
  2. amulet-git-fixups
  3. Merge into next
Proposed by Corey Bryant
Status: Merged
Merged at revision: 142
Proposed branch: lp:~corey.bryant/charms/trusty/nova-compute/amulet-git-fixups
Merge into: lp:~openstack-charmers-archive/charms/trusty/nova-compute/next
Diff against target: 178 lines (+83/-35)
2 files modified
tests/00-setup (+1/-0)
tests/basic_deployment.py (+82/-35)
To merge this branch: bzr merge lp:~corey.bryant/charms/trusty/nova-compute/amulet-git-fixups
Reviewer Review Type Date Requested Status
OpenStack Charmers Pending
Review via email: mp+264570@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

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

charm_lint_check #6123 nova-compute-next for corey.bryant mp264570
    LINT OK: passed

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

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

charm_unit_test #5755 nova-compute-next for corey.bryant mp264570
    UNIT OK: passed

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

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

charm_amulet_test #5112 nova-compute-next for corey.bryant mp264570
    AMULET OK: passed

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

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

charm_lint_check #6127 nova-compute-next for corey.bryant mp264570
    LINT OK: passed

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

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

charm_unit_test #5759 nova-compute-next for corey.bryant mp264570
    UNIT OK: passed

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

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

charm_amulet_test #5116 nova-compute-next for corey.bryant mp264570
    AMULET FAIL: amulet-test failed

AMULET Results (max last 2 lines):
make: *** [test] Error 1
ERROR:root:Make target returned non-zero.

Full amulet test output: http://paste.ubuntu.com/11875177/
Build: http://10.245.162.77:8080/job/charm_amulet_test/5116/

lp:~corey.bryant/charms/trusty/nova-compute/amulet-git-fixups updated
148. By Corey Bryant

Enable tests/017-basic-trusty-kilo

149. By Corey Bryant

Update tests for kilo

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

charm_lint_check #6175 nova-compute-next for corey.bryant mp264570
    LINT OK: passed

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

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

charm_unit_test #5807 nova-compute-next for corey.bryant mp264570
    UNIT OK: passed

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

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

charm_amulet_test #5119 nova-compute-next for corey.bryant mp264570
    AMULET OK: passed

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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'tests/00-setup'
2--- tests/00-setup 2014-09-30 20:31:36 +0000
3+++ tests/00-setup 2015-07-14 17:49:25 +0000
4@@ -5,6 +5,7 @@
5 sudo add-apt-repository --yes ppa:juju/stable
6 sudo apt-get update --yes
7 sudo apt-get install --yes python-amulet \
8+ python-distro-info \
9 python-glanceclient \
10 python-keystoneclient \
11 python-novaclient
12
13=== modified file 'tests/017-basic-trusty-kilo' (properties changed: -x to +x)
14=== modified file 'tests/basic_deployment.py'
15--- tests/basic_deployment.py 2015-07-09 18:16:49 +0000
16+++ tests/basic_deployment.py 2015-07-14 17:49:25 +0000
17@@ -70,21 +70,24 @@
18 nova_config = {'config-flags': 'auto_assign_floating_ip=False',
19 'enable-live-migration': 'False'}
20 if self.git:
21- release = self._get_openstack_release_string()
22- reqs_branch = 'stable/' + release
23+ amulet_http_proxy = os.environ.get('AMULET_HTTP_PROXY')
24+
25+ reqs_repo = 'git://github.com/openstack/requirements'
26+ nova_repo = 'git://github.com/openstack/nova'
27 if self._get_openstack_release() == self.trusty_icehouse:
28- nova_branch = release + '-eol'
29- else:
30- nova_branch = 'stable/' + release
31- amulet_http_proxy = os.environ.get('AMULET_HTTP_PROXY')
32+ reqs_repo = 'git://github.com/coreycb/requirements'
33+ nova_repo = 'git://github.com/coreycb/nova'
34+
35+ branch = 'stable/' + self._get_openstack_release_string()
36+
37 openstack_origin_git = {
38 'repositories': [
39 {'name': 'requirements',
40- 'repository': 'git://github.com/openstack/requirements',
41- 'branch': reqs_branch},
42+ 'repository': reqs_repo,
43+ 'branch': branch},
44 {'name': 'nova',
45- 'repository': 'git://github.com/openstack/nova',
46- 'branch': nova_branch},
47+ 'repository': nova_repo,
48+ 'branch': branch},
49 ],
50 'directory': '/mnt/openstack-git',
51 'http_proxy': amulet_http_proxy,
52@@ -182,8 +185,11 @@
53 if self._get_openstack_release() >= self.precise_folsom:
54 endpoint_vol['id'] = u.not_null
55 endpoint_id['id'] = u.not_null
56- expected = {'s3': [endpoint_vol], 'compute': [endpoint_vol],
57- 'ec2': [endpoint_vol], 'identity': [endpoint_id]}
58+ if self._get_openstack_release() >= self.trusty_kilo:
59+ expected = {'compute': [endpoint_vol], 'identity': [endpoint_id]}
60+ else:
61+ expected = {'s3': [endpoint_vol], 'compute': [endpoint_vol],
62+ 'ec2': [endpoint_vol], 'identity': [endpoint_id]}
63 actual = self.keystone_demo.service_catalog.get_endpoints()
64
65 ret = u.validate_svc_catalog_endpoint_data(expected, actual)
66@@ -209,6 +215,9 @@
67
68 def test_ec2_api_endpoint(self):
69 """Verify the EC2 api endpoint data."""
70+ if self._get_openstack_release() >= self.trusty_kilo:
71+ return
72+
73 endpoints = self.keystone.endpoints.list()
74 admin_port = internal_port = public_port = '8773'
75 expected = {'id': u.not_null,
76@@ -226,6 +235,9 @@
77
78 def test_s3_api_endpoint(self):
79 """Verify the S3 api endpoint data."""
80+ if self._get_openstack_release() >= self.trusty_kilo:
81+ return
82+
83 endpoints = self.keystone.endpoints.list()
84 admin_port = internal_port = public_port = '3333'
85 expected = {'id': u.not_null,
86@@ -382,34 +394,69 @@
87 mysql_relation['db_host'],
88 'nova')
89
90- expected = {'dhcpbridge_flagfile': '/etc/nova/nova.conf',
91- 'dhcpbridge': '/usr/bin/nova-dhcpbridge',
92- 'logdir': '/var/log/nova',
93- 'state_path': '/var/lib/nova',
94- 'lock_path': '/var/lock/nova',
95- 'force_dhcp_release': 'True',
96- 'libvirt_use_virtio_for_bridges': 'True',
97- 'verbose': 'False',
98- 'use_syslog': 'False',
99- 'ec2_private_dns_show_ip': 'True',
100- 'api_paste_config': '/etc/nova/api-paste.ini',
101- 'enabled_apis': 'ec2,osapi_compute,metadata',
102- 'auth_strategy': 'keystone',
103- 'compute_driver': 'libvirt.LibvirtDriver',
104- 'sql_connection': db_uri,
105+ expected = {
106+ 'DEFAULT': {
107+ 'dhcpbridge_flagfile': '/etc/nova/nova.conf',
108+ 'dhcpbridge': '/usr/bin/nova-dhcpbridge',
109+ 'logdir': '/var/log/nova',
110+ 'state_path': '/var/lib/nova',
111+ 'force_dhcp_release': 'True',
112+ 'verbose': 'False',
113+ 'use_syslog': 'False',
114+ 'ec2_private_dns_show_ip': 'True',
115+ 'api_paste_config': '/etc/nova/api-paste.ini',
116+ 'enabled_apis': 'ec2,osapi_compute,metadata',
117+ 'auth_strategy': 'keystone',
118+ 'flat_interface': 'eth1',
119+ 'network_manager': 'nova.network.manager.FlatDHCPManager',
120+ 'volume_api_class': 'nova.volume.cinder.API',
121+ }
122+ }
123+ if self._get_openstack_release() < self.trusty_kilo:
124+ d = 'DEFAULT'
125+ expected[d]['lock_path'] = '/var/lock/nova'
126+ expected[d]['libvirt_use_virtio_for_bridges'] = 'True'
127+ expected[d]['compute_driver'] = 'libvirt.LibvirtDriver'
128+ expected[d]['sql_connection'] = db_uri
129+ expected[d]['rabbit_userid'] = 'nova'
130+ expected[d]['rabbit_virtual_host'] = 'openstack'
131+ expected[d]['rabbit_password'] = rabbitmq_relation['password']
132+ expected[d]['rabbit_host'] = rabbitmq_relation['hostname']
133+ expected[d]['glance_api_servers'] = glance_relation['glance-api-server']
134+ else:
135+ oslo_concurrency = {
136+ 'oslo_concurrency': {
137+ 'lock_path': '/var/lock/nova'
138+ }
139+ }
140+ database = {
141+ 'database': {
142+ 'connection': db_uri
143+ }
144+ }
145+ oslo_messaging_rabbit = {
146+ 'oslo_messaging_rabbit': {
147 'rabbit_userid': 'nova',
148 'rabbit_virtual_host': 'openstack',
149 'rabbit_password': rabbitmq_relation['password'],
150 'rabbit_host': rabbitmq_relation['hostname'],
151- 'glance_api_servers': glance_relation['glance-api-server'],
152- 'flat_interface': 'eth1',
153- 'network_manager': 'nova.network.manager.FlatDHCPManager',
154- 'volume_api_class': 'nova.volume.cinder.API'}
155+ }
156+ }
157+ glance = {
158+ 'glance': {
159+ 'api_servers': glance_relation['glance-api-server']
160+ }
161+ }
162+ expected.update(oslo_concurrency)
163+ expected.update(database)
164+ expected.update(oslo_messaging_rabbit)
165+ expected.update(glance)
166
167- ret = u.validate_config_data(unit, conf, 'DEFAULT', expected)
168- if ret:
169- message = "nova config error: {}".format(ret)
170- amulet.raise_status(amulet.FAIL, msg=message)
171+ for section, pairs in expected.iteritems():
172+ ret = u.validate_config_data(unit, conf, section, pairs)
173+ if ret:
174+ message = "nova config error: {}".format(ret)
175+ amulet.raise_status(amulet.FAIL, msg=message)
176
177 def test_image_instance_create(self):
178 """Create an image/instance, verify they exist, and delete them."""

Subscribers

People subscribed via source and target branches