Merge lp:~corey.bryant/charms/trusty/ceilometer/aodh into lp:~openstack-charmers-archive/charms/trusty/ceilometer/next
- Trusty Tahr (14.04)
- aodh
- Merge into next
Status: | Merged |
---|---|
Merged at revision: | 110 |
Proposed branch: | lp:~corey.bryant/charms/trusty/ceilometer/aodh |
Merge into: | lp:~openstack-charmers-archive/charms/trusty/ceilometer/next |
Diff against target: |
245 lines (+71/-29) 5 files modified
actions/actions.py (+7/-3) lib/ceilometer_utils.py (+47/-16) unit_tests/test_actions_openstack_upgrade.py (+2/-1) unit_tests/test_ceilometer_hooks.py (+5/-4) unit_tests/test_ceilometer_utils.py (+10/-5) |
To merge this branch: | bzr merge lp:~corey.bryant/charms/trusty/ceilometer/aodh |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Liam Young (community) | Approve | ||
Review via email: mp+281779@code.launchpad.net |
Commit message
Description of the change
uosci-testing-bot (uosci-testing-bot) wrote : | # |
uosci-testing-bot (uosci-testing-bot) wrote : | # |
charm_unit_test #15564 ceilometer-next for corey.bryant mp281779
UNIT OK: passed
uosci-testing-bot (uosci-testing-bot) wrote : | # |
charm_amulet_test #8542 ceilometer-next for corey.bryant mp281779
AMULET FAIL: amulet-test failed
AMULET Results (max last 2 lines):
make: *** [functional_test] Error 1
ERROR:root:Make target returned non-zero.
Full amulet test output: http://
Build: http://
- 111. By Corey Bryant
-
Lint fixes for aodh-notifier and aodh-evaluator updates
uosci-testing-bot (uosci-testing-bot) wrote : | # |
charm_lint_check #16669 ceilometer-next for corey.bryant mp281779
LINT OK: passed
Build: http://
uosci-testing-bot (uosci-testing-bot) wrote : | # |
charm_unit_test #15566 ceilometer-next for corey.bryant mp281779
UNIT OK: passed
uosci-testing-bot (uosci-testing-bot) wrote : | # |
charm_amulet_test #8543 ceilometer-next for corey.bryant mp281779
AMULET OK: passed
Build: http://
uosci-testing-bot (uosci-testing-bot) wrote : | # |
charm_amulet_test #8545 ceilometer-next for corey.bryant mp281779
AMULET OK: passed
Build: http://
Preview Diff
1 | === modified file 'actions/actions.py' | |||
2 | --- actions/actions.py 2015-10-16 13:01:34 +0000 | |||
3 | +++ actions/actions.py 2016-01-06 21:38:36 +0000 | |||
4 | @@ -6,7 +6,9 @@ | |||
5 | 6 | from charmhelpers.core.host import service_pause, service_resume | 6 | from charmhelpers.core.host import service_pause, service_resume |
6 | 7 | from charmhelpers.core.hookenv import action_fail, status_set | 7 | from charmhelpers.core.hookenv import action_fail, status_set |
7 | 8 | from charmhelpers.core.unitdata import kv | 8 | from charmhelpers.core.unitdata import kv |
9 | 9 | from ceilometer_utils import CEILOMETER_SERVICES, assess_status | 9 | from ceilometer_utils import ( |
10 | 10 | CEILOMETER_BASE_SERVICES, assess_status, ceilometer_release_services, | ||
11 | 11 | ) | ||
12 | 10 | from ceilometer_hooks import CONFIGS | 12 | from ceilometer_hooks import CONFIGS |
13 | 11 | 13 | ||
14 | 12 | 14 | ||
15 | @@ -15,7 +17,8 @@ | |||
16 | 15 | 17 | ||
17 | 16 | @raises Exception should the service fail to stop. | 18 | @raises Exception should the service fail to stop. |
18 | 17 | """ | 19 | """ |
20 | 18 | for service in CEILOMETER_SERVICES: | 20 | services = CEILOMETER_BASE_SERVICES + ceilometer_release_services() |
21 | 21 | for service in services: | ||
22 | 19 | if not service_pause(service): | 22 | if not service_pause(service): |
23 | 20 | raise Exception("Failed to %s." % service) | 23 | raise Exception("Failed to %s." % service) |
24 | 21 | 24 | ||
25 | @@ -32,7 +35,8 @@ | |||
26 | 32 | """Resume the Ceilometer services. | 35 | """Resume the Ceilometer services. |
27 | 33 | 36 | ||
28 | 34 | @raises Exception should the service fail to start.""" | 37 | @raises Exception should the service fail to start.""" |
30 | 35 | for service in CEILOMETER_SERVICES: | 38 | services = CEILOMETER_BASE_SERVICES + ceilometer_release_services() |
31 | 39 | for service in services: | ||
32 | 36 | if not service_resume(service): | 40 | if not service_resume(service): |
33 | 37 | raise Exception("Failed to resume %s." % service) | 41 | raise Exception("Failed to resume %s." % service) |
34 | 38 | 42 | ||
35 | 39 | 43 | ||
36 | === modified file 'lib/ceilometer_utils.py' | |||
37 | --- lib/ceilometer_utils.py 2015-10-16 12:29:41 +0000 | |||
38 | +++ lib/ceilometer_utils.py 2016-01-06 21:38:36 +0000 | |||
39 | @@ -33,19 +33,29 @@ | |||
40 | 33 | "openstack_https_frontend.conf" | 33 | "openstack_https_frontend.conf" |
41 | 34 | CLUSTER_RES = 'grp_ceilometer_vips' | 34 | CLUSTER_RES = 'grp_ceilometer_vips' |
42 | 35 | 35 | ||
44 | 36 | CEILOMETER_SERVICES = [ | 36 | CEILOMETER_BASE_SERVICES = [ |
45 | 37 | 'ceilometer-agent-central', | 37 | 'ceilometer-agent-central', |
46 | 38 | 'ceilometer-collector', | 38 | 'ceilometer-collector', |
47 | 39 | 'ceilometer-api', | 39 | 'ceilometer-api', |
48 | 40 | 'ceilometer-alarm-evaluator', | ||
49 | 41 | 'ceilometer-alarm-notifier', | ||
50 | 42 | 'ceilometer-agent-notification', | 40 | 'ceilometer-agent-notification', |
51 | 43 | ] | 41 | ] |
52 | 44 | 42 | ||
53 | 43 | ICEHOUSE_SERVICES = [ | ||
54 | 44 | 'ceilometer-alarm-notifier', | ||
55 | 45 | 'ceilometer-alarm-evaluator', | ||
56 | 46 | 'ceilometer-agent-notification' | ||
57 | 47 | ] | ||
58 | 48 | |||
59 | 49 | MITAKA_SERVICES = [ | ||
60 | 50 | 'aodh-notifier', | ||
61 | 51 | 'aodh-evaluator', | ||
62 | 52 | 'ceilometer-agent-notification' | ||
63 | 53 | ] | ||
64 | 54 | |||
65 | 45 | CEILOMETER_DB = "ceilometer" | 55 | CEILOMETER_DB = "ceilometer" |
66 | 46 | CEILOMETER_SERVICE = "ceilometer" | 56 | CEILOMETER_SERVICE = "ceilometer" |
67 | 47 | 57 | ||
69 | 48 | CEILOMETER_PACKAGES = [ | 58 | CEILOMETER_BASE_PACKAGES = [ |
70 | 49 | 'haproxy', | 59 | 'haproxy', |
71 | 50 | 'apache2', | 60 | 'apache2', |
72 | 51 | 'ceilometer-agent-central', | 61 | 'ceilometer-agent-central', |
73 | @@ -60,9 +70,9 @@ | |||
74 | 60 | 'ceilometer-agent-notification' | 70 | 'ceilometer-agent-notification' |
75 | 61 | ] | 71 | ] |
76 | 62 | 72 | ||
80 | 63 | ICEHOUSE_SERVICES = [ | 73 | MITAKA_PACKAGES = [ |
81 | 64 | 'ceilometer-alarm-notifier', | 74 | 'aodh-notifier', |
82 | 65 | 'ceilometer-alarm-evaluator', | 75 | 'aodh-evaluator', |
83 | 66 | 'ceilometer-agent-notification' | 76 | 'ceilometer-agent-notification' |
84 | 67 | ] | 77 | ] |
85 | 68 | 78 | ||
86 | @@ -85,7 +95,7 @@ | |||
87 | 85 | CeilometerContext(), | 95 | CeilometerContext(), |
88 | 86 | context.SyslogContext(), | 96 | context.SyslogContext(), |
89 | 87 | HAProxyContext()], | 97 | HAProxyContext()], |
91 | 88 | 'services': CEILOMETER_SERVICES | 98 | 'services': CEILOMETER_BASE_SERVICES |
92 | 89 | }), | 99 | }), |
93 | 90 | (HAPROXY_CONF, { | 100 | (HAPROXY_CONF, { |
94 | 91 | 'hook_contexts': [context.HAProxyContext(singlenode_mode=True), | 101 | 'hook_contexts': [context.HAProxyContext(singlenode_mode=True), |
95 | @@ -121,10 +131,9 @@ | |||
96 | 121 | configs = templating.OSConfigRenderer(templates_dir=TEMPLATES, | 131 | configs = templating.OSConfigRenderer(templates_dir=TEMPLATES, |
97 | 122 | openstack_release=release) | 132 | openstack_release=release) |
98 | 123 | 133 | ||
103 | 124 | if (get_os_codename_install_source( | 134 | CONFIG_FILES[CEILOMETER_CONF]['services'] = ( |
104 | 125 | config('openstack-origin')) >= 'icehouse'): | 135 | CONFIG_FILES[CEILOMETER_CONF]['services'] + |
105 | 126 | CONFIG_FILES[CEILOMETER_CONF]['services'] = \ | 136 | ceilometer_release_services()) |
102 | 127 | CONFIG_FILES[CEILOMETER_CONF]['services'] + ICEHOUSE_SERVICES | ||
106 | 128 | 137 | ||
107 | 129 | for conf in CONFIG_FILES: | 138 | for conf in CONFIG_FILES: |
108 | 130 | configs.register(conf, CONFIG_FILES[conf]['hook_contexts']) | 139 | configs.register(conf, CONFIG_FILES[conf]['hook_contexts']) |
109 | @@ -151,8 +160,12 @@ | |||
110 | 151 | svcs = [] | 160 | svcs = [] |
111 | 152 | for svc in ctxt['services']: | 161 | for svc in ctxt['services']: |
112 | 153 | svcs.append(svc) | 162 | svcs.append(svc) |
113 | 163 | if f == CEILOMETER_CONF: | ||
114 | 164 | for svc in ceilometer_release_services(): | ||
115 | 165 | svcs.append(svc) | ||
116 | 154 | if svcs: | 166 | if svcs: |
117 | 155 | _map[f] = svcs | 167 | _map[f] = svcs |
118 | 168 | |||
119 | 156 | return _map | 169 | return _map |
120 | 157 | 170 | ||
121 | 158 | 171 | ||
122 | @@ -200,11 +213,29 @@ | |||
123 | 200 | configs.set_release(openstack_release=new_os_rel) | 213 | configs.set_release(openstack_release=new_os_rel) |
124 | 201 | 214 | ||
125 | 202 | 215 | ||
126 | 216 | def ceilometer_release_services(): | ||
127 | 217 | codename = get_os_codename_install_source(config('openstack-origin')) | ||
128 | 218 | if codename >= 'mitaka': | ||
129 | 219 | return MITAKA_SERVICES | ||
130 | 220 | elif codename >= 'icehouse': | ||
131 | 221 | return ICEHOUSE_SERVICES | ||
132 | 222 | else: | ||
133 | 223 | return [] | ||
134 | 224 | |||
135 | 225 | |||
136 | 226 | def ceilometer_release_packages(): | ||
137 | 227 | codename = get_os_codename_install_source(config('openstack-origin')) | ||
138 | 228 | if codename >= 'mitaka': | ||
139 | 229 | return MITAKA_PACKAGES | ||
140 | 230 | elif codename >= 'icehouse': | ||
141 | 231 | return ICEHOUSE_PACKAGES | ||
142 | 232 | else: | ||
143 | 233 | return [] | ||
144 | 234 | |||
145 | 235 | |||
146 | 203 | def get_packages(): | 236 | def get_packages(): |
151 | 204 | packages = deepcopy(CEILOMETER_PACKAGES) | 237 | packages = (deepcopy(CEILOMETER_BASE_PACKAGES) + |
152 | 205 | if (get_os_codename_install_source( | 238 | ceilometer_release_packages()) |
149 | 206 | config('openstack-origin')) >= 'icehouse'): | ||
150 | 207 | packages = packages + ICEHOUSE_PACKAGES | ||
153 | 208 | return packages | 239 | return packages |
154 | 209 | 240 | ||
155 | 210 | 241 | ||
156 | 211 | 242 | ||
157 | === modified file 'unit_tests/test_actions_openstack_upgrade.py' | |||
158 | --- unit_tests/test_actions_openstack_upgrade.py 2015-10-16 11:59:37 +0000 | |||
159 | +++ unit_tests/test_actions_openstack_upgrade.py 2016-01-06 21:38:36 +0000 | |||
160 | @@ -4,7 +4,8 @@ | |||
161 | 4 | os.environ['JUJU_UNIT_NAME'] = 'ceilometer' | 4 | os.environ['JUJU_UNIT_NAME'] = 'ceilometer' |
162 | 5 | 5 | ||
163 | 6 | with patch('ceilometer_utils.register_configs') as register_configs: | 6 | with patch('ceilometer_utils.register_configs') as register_configs: |
165 | 7 | import openstack_upgrade | 7 | with patch('ceilometer_utils.ceilometer_release_services') as rel_services: |
166 | 8 | import openstack_upgrade | ||
167 | 8 | 9 | ||
168 | 9 | from test_utils import ( | 10 | from test_utils import ( |
169 | 10 | CharmTestCase | 11 | CharmTestCase |
170 | 11 | 12 | ||
171 | === modified file 'unit_tests/test_ceilometer_hooks.py' | |||
172 | --- unit_tests/test_ceilometer_hooks.py 2015-10-10 22:53:35 +0000 | |||
173 | +++ unit_tests/test_ceilometer_hooks.py 2016-01-06 21:38:36 +0000 | |||
174 | @@ -44,9 +44,10 @@ | |||
175 | 44 | def setUp(self): | 44 | def setUp(self): |
176 | 45 | super(CeilometerHooksTest, self).setUp(hooks, TO_PATCH) | 45 | super(CeilometerHooksTest, self).setUp(hooks, TO_PATCH) |
177 | 46 | self.config.side_effect = self.test_config.get | 46 | self.config.side_effect = self.test_config.get |
179 | 47 | self.get_packages.return_value = ceilometer_utils.CEILOMETER_PACKAGES | 47 | self.get_packages.return_value = \ |
180 | 48 | ceilometer_utils.CEILOMETER_BASE_PACKAGES | ||
181 | 48 | self.filter_installed_packages.return_value = \ | 49 | self.filter_installed_packages.return_value = \ |
183 | 49 | ceilometer_utils.CEILOMETER_PACKAGES | 50 | ceilometer_utils.CEILOMETER_BASE_PACKAGES |
184 | 50 | self.lsb_release.return_value = {'DISTRIB_CODENAME': 'precise'} | 51 | self.lsb_release.return_value = {'DISTRIB_CODENAME': 'precise'} |
185 | 51 | 52 | ||
186 | 52 | @patch('charmhelpers.payload.execd.default_execd_dir', | 53 | @patch('charmhelpers.payload.execd.default_execd_dir', |
187 | @@ -68,7 +69,7 @@ | |||
188 | 68 | self.open_port.assert_called_with(hooks.CEILOMETER_PORT) | 69 | self.open_port.assert_called_with(hooks.CEILOMETER_PORT) |
189 | 69 | self.apt_update.assert_called_with(fatal=True) | 70 | self.apt_update.assert_called_with(fatal=True) |
190 | 70 | self.apt_install.assert_called_with( | 71 | self.apt_install.assert_called_with( |
192 | 71 | ceilometer_utils.CEILOMETER_PACKAGES, | 72 | ceilometer_utils.CEILOMETER_BASE_PACKAGES, |
193 | 72 | fatal=True | 73 | fatal=True |
194 | 73 | ) | 74 | ) |
195 | 74 | 75 | ||
196 | @@ -83,7 +84,7 @@ | |||
197 | 83 | self.open_port.assert_called_with(hooks.CEILOMETER_PORT) | 84 | self.open_port.assert_called_with(hooks.CEILOMETER_PORT) |
198 | 84 | self.apt_update.assert_called_with(fatal=True) | 85 | self.apt_update.assert_called_with(fatal=True) |
199 | 85 | self.apt_install.assert_called_with( | 86 | self.apt_install.assert_called_with( |
201 | 86 | ceilometer_utils.CEILOMETER_PACKAGES, | 87 | ceilometer_utils.CEILOMETER_BASE_PACKAGES, |
202 | 87 | fatal=True | 88 | fatal=True |
203 | 88 | ) | 89 | ) |
204 | 89 | 90 | ||
205 | 90 | 91 | ||
206 | === modified file 'unit_tests/test_ceilometer_utils.py' | |||
207 | --- unit_tests/test_ceilometer_utils.py 2015-10-10 22:37:50 +0000 | |||
208 | +++ unit_tests/test_ceilometer_utils.py 2016-01-06 21:38:36 +0000 | |||
209 | @@ -45,8 +45,6 @@ | |||
210 | 45 | 'ceilometer-agent-central', | 45 | 'ceilometer-agent-central', |
211 | 46 | 'ceilometer-collector', | 46 | 'ceilometer-collector', |
212 | 47 | 'ceilometer-api', | 47 | 'ceilometer-api', |
213 | 48 | 'ceilometer-alarm-evaluator', | ||
214 | 49 | 'ceilometer-alarm-notifier', | ||
215 | 50 | 'ceilometer-agent-notification'], | 48 | 'ceilometer-agent-notification'], |
216 | 51 | '/etc/haproxy/haproxy.cfg': ['haproxy'], | 49 | '/etc/haproxy/haproxy.cfg': ['haproxy'], |
217 | 52 | "/etc/apache2/sites-available/openstack_https_frontend": [ | 50 | "/etc/apache2/sites-available/openstack_https_frontend": [ |
218 | @@ -82,7 +80,7 @@ | |||
219 | 82 | '--option', 'Dpkg::Options::=--force-confdef', | 80 | '--option', 'Dpkg::Options::=--force-confdef', |
220 | 83 | ] | 81 | ] |
221 | 84 | self.apt_install.assert_called_with( | 82 | self.apt_install.assert_called_with( |
223 | 85 | packages=utils.CEILOMETER_PACKAGES, | 83 | packages=utils.CEILOMETER_BASE_PACKAGES, |
224 | 86 | options=dpkg_opts, fatal=True | 84 | options=dpkg_opts, fatal=True |
225 | 87 | ) | 85 | ) |
226 | 88 | self.configure_installation_source.assert_called_with( | 86 | self.configure_installation_source.assert_called_with( |
227 | @@ -92,9 +90,16 @@ | |||
228 | 92 | def test_get_packages(self): | 90 | def test_get_packages(self): |
229 | 93 | self.get_os_codename_install_source.return_value = 'havana' | 91 | self.get_os_codename_install_source.return_value = 'havana' |
230 | 94 | self.assertEqual(utils.get_packages(), | 92 | self.assertEqual(utils.get_packages(), |
232 | 95 | utils.CEILOMETER_PACKAGES) | 93 | utils.CEILOMETER_BASE_PACKAGES) |
233 | 96 | 94 | ||
234 | 97 | def test_get_packages_icehouse(self): | 95 | def test_get_packages_icehouse(self): |
235 | 98 | self.get_os_codename_install_source.return_value = 'icehouse' | 96 | self.get_os_codename_install_source.return_value = 'icehouse' |
236 | 99 | self.assertEqual(utils.get_packages(), | 97 | self.assertEqual(utils.get_packages(), |
238 | 100 | utils.CEILOMETER_PACKAGES + utils.ICEHOUSE_PACKAGES) | 98 | utils.CEILOMETER_BASE_PACKAGES + |
239 | 99 | utils.ICEHOUSE_PACKAGES) | ||
240 | 100 | |||
241 | 101 | def test_get_packages_mitaka(self): | ||
242 | 102 | self.get_os_codename_install_source.return_value = 'mitaka' | ||
243 | 103 | self.assertEqual(utils.get_packages(), | ||
244 | 104 | utils.CEILOMETER_BASE_PACKAGES + | ||
245 | 105 | utils.MITAKA_PACKAGES) |
charm_lint_check #16667 ceilometer-next for corey.bryant mp281779
LINT FAIL: lint-test failed
LINT Results (max last 2 lines):
make: *** [lint] Error 1
ERROR:root:Make target returned non-zero.
Full lint test output: http:// paste.ubuntu. com/14423180/ 10.245. 162.77: 8080/job/ charm_lint_ check/16667/
Build: http://