Merge lp:~1chb1n/charms/trusty/cinder/next-amulet-lp1442268 into lp:~openstack-charmers-archive/charms/trusty/cinder/next

Proposed by Ryan Beisner
Status: Merged
Merged at revision: 84
Proposed branch: lp:~1chb1n/charms/trusty/cinder/next-amulet-lp1442268
Merge into: lp:~openstack-charmers-archive/charms/trusty/cinder/next
Diff against target: 139 lines (+43/-11)
5 files modified
hooks/charmhelpers/contrib/openstack/context.py (+15/-0)
hooks/charmhelpers/contrib/openstack/neutron.py (+13/-0)
hooks/charmhelpers/contrib/openstack/templates/git.upstart (+4/-0)
hooks/charmhelpers/core/strutils.py (+2/-2)
tests/basic_deployment.py (+9/-9)
To merge this branch: bzr merge lp:~1chb1n/charms/trusty/cinder/next-amulet-lp1442268
Reviewer Review Type Date Requested Status
Corey Bryant Approve
Review via email: mp+256021@code.launchpad.net

Description of the change

 - sync charm helpers
 - bump timeout in amulet test for volume operations
 - rename kilo amulet tests for consistency
 - update amulet test re: bug 1442268

https://bugs.launchpad.net/charms/+source/cinder/+bug/1442268

To post a comment you must log in.

charm_lint_check #3308 cinder-next for 1chb1n mp256021
    LINT OK: passed

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

charm_unit_test #3096 cinder-next for 1chb1n mp256021
    UNIT OK: passed

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

charm_amulet_test #3127 cinder-next for 1chb1n mp256021
    AMULET OK: passed

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

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'hooks/charmhelpers/contrib/openstack/context.py'
2--- hooks/charmhelpers/contrib/openstack/context.py 2015-04-09 04:52:26 +0000
3+++ hooks/charmhelpers/contrib/openstack/context.py 2015-04-13 19:43:03 +0000
4@@ -808,6 +808,19 @@
5
6 return ovs_ctxt
7
8+ def nuage_ctxt(self):
9+ driver = neutron_plugin_attribute(self.plugin, 'driver',
10+ self.network_manager)
11+ config = neutron_plugin_attribute(self.plugin, 'config',
12+ self.network_manager)
13+ nuage_ctxt = {'core_plugin': driver,
14+ 'neutron_plugin': 'vsp',
15+ 'neutron_security_groups': self.neutron_security_groups,
16+ 'local_ip': unit_private_ip(),
17+ 'config': config}
18+
19+ return nuage_ctxt
20+
21 def nvp_ctxt(self):
22 driver = neutron_plugin_attribute(self.plugin, 'driver',
23 self.network_manager)
24@@ -891,6 +904,8 @@
25 ctxt.update(self.n1kv_ctxt())
26 elif self.plugin == 'Calico':
27 ctxt.update(self.calico_ctxt())
28+ elif self.plugin == 'vsp':
29+ ctxt.update(self.nuage_ctxt())
30
31 alchemy_flags = config('neutron-alchemy-flags')
32 if alchemy_flags:
33
34=== modified file 'hooks/charmhelpers/contrib/openstack/neutron.py'
35--- hooks/charmhelpers/contrib/openstack/neutron.py 2015-03-18 10:19:15 +0000
36+++ hooks/charmhelpers/contrib/openstack/neutron.py 2015-04-13 19:43:03 +0000
37@@ -180,6 +180,19 @@
38 'nova-api-metadata']],
39 'server_packages': ['neutron-server', 'calico-control'],
40 'server_services': ['neutron-server']
41+ },
42+ 'vsp': {
43+ 'config': '/etc/neutron/plugins/nuage/nuage_plugin.ini',
44+ 'driver': 'neutron.plugins.nuage.plugin.NuagePlugin',
45+ 'contexts': [
46+ context.SharedDBContext(user=config('neutron-database-user'),
47+ database=config('neutron-database'),
48+ relation_prefix='neutron',
49+ ssl_dir=NEUTRON_CONF_DIR)],
50+ 'services': [],
51+ 'packages': [],
52+ 'server_packages': ['neutron-server', 'neutron-plugin-nuage'],
53+ 'server_services': ['neutron-server']
54 }
55 }
56 if release >= 'icehouse':
57
58=== modified file 'hooks/charmhelpers/contrib/openstack/templates/git.upstart'
59--- hooks/charmhelpers/contrib/openstack/templates/git.upstart 2015-04-09 04:52:26 +0000
60+++ hooks/charmhelpers/contrib/openstack/templates/git.upstart 2015-04-13 19:43:03 +0000
61@@ -9,5 +9,9 @@
62 exec start-stop-daemon --start --chuid {{ user_name }} \
63 --chdir {{ start_dir }} --name {{ process_name }} \
64 --exec {{ executable_name }} -- \
65+ {% for config_file in config_files -%}
66 --config-file={{ config_file }} \
67+ {% endfor -%}
68+ {% if log_file -%}
69 --log-file={{ log_file }}
70+ {% endif -%}
71
72=== modified file 'hooks/charmhelpers/core/strutils.py'
73--- hooks/charmhelpers/core/strutils.py 2015-02-19 03:38:40 +0000
74+++ hooks/charmhelpers/core/strutils.py 2015-04-13 19:43:03 +0000
75@@ -33,9 +33,9 @@
76
77 value = value.strip().lower()
78
79- if value in ['y', 'yes', 'true', 't']:
80+ if value in ['y', 'yes', 'true', 't', 'on']:
81 return True
82- elif value in ['n', 'no', 'false', 'f']:
83+ elif value in ['n', 'no', 'false', 'f', 'off']:
84 return False
85
86 msg = "Unable to interpret string value '%s' as boolean" % (value)
87
88=== renamed file 'tests/16-vivid-kilo' => 'tests/16-basic-vivid-kilo'
89=== renamed file 'tests/17-trusty-kilo' => 'tests/17-basic-trusty-kilo'
90=== modified file 'tests/basic_deployment.py'
91--- tests/basic_deployment.py 2015-04-09 04:52:46 +0000
92+++ tests/basic_deployment.py 2015-04-13 19:43:03 +0000
93@@ -169,9 +169,9 @@
94 obj_count)
95
96 def obj_is_status(self, obj, obj_id, stat='available',
97- msg='openstack object status check', max_wait=60):
98+ msg='openstack object status check', max_wait=120):
99 ''''Wait for an openstack object status to be as expected.
100- By default, expect an available status within 60s. Useful
101+ By default, expect an available status within 120s. Useful
102 when confirming cinder volumes, snapshots, glance images, etc.
103 reach a certain state/status within a specified time.'''
104 # NOTE(beisner): need to move to charmhelpers, and adjust calls here.
105@@ -301,7 +301,7 @@
106 'auth_protocol': 'http',
107 'private-address': u.valid_ip,
108 'auth_host': u.valid_ip,
109- 'service_username': 'cinder',
110+ 'service_username': 'cinder_cinderv2',
111 'service_tenant_id': u.not_null,
112 'service_host': u.valid_ip
113 }
114@@ -317,11 +317,11 @@
115 relation = ['identity-service',
116 'keystone:identity-service']
117 expected = {
118- 'service': 'cinder',
119- 'region': 'RegionOne',
120- 'public_url': u.valid_url,
121- 'internal_url': u.valid_url,
122- 'admin_url': u.valid_url,
123+ 'cinder_service': 'cinder',
124+ 'cinder_region': 'RegionOne',
125+ 'cinder_public_url': u.valid_url,
126+ 'cinder_internal_url': u.valid_url,
127+ 'cinder_admin_url': u.valid_url,
128 'private-address': u.valid_ip
129 }
130 u.log.debug('')
131@@ -508,7 +508,7 @@
132
133 def test_users(self):
134 '''Verify expected users.'''
135- user0 = {'name': 'cinder',
136+ user0 = {'name': 'cinder_cinderv2',
137 'enabled': True,
138 'tenantId': u.not_null,
139 'id': u.not_null,

Subscribers

People subscribed via source and target branches