Merge lp:~james-page/charms/trusty/glance/lp1531102-trunk into lp:~openstack-charmers-archive/charms/trusty/glance/trunk

Proposed by James Page
Status: Merged
Merged at revision: 126
Proposed branch: lp:~james-page/charms/trusty/glance/lp1531102-trunk
Merge into: lp:~openstack-charmers-archive/charms/trusty/glance/trunk
Diff against target: 671 lines (+325/-35)
9 files modified
charmhelpers/contrib/openstack/amulet/deployment.py (+100/-1)
charmhelpers/contrib/openstack/amulet/utils.py (+25/-3)
charmhelpers/contrib/openstack/context.py (+25/-9)
charmhelpers/contrib/openstack/neutron.py (+14/-0)
charmhelpers/contrib/openstack/utils.py (+22/-17)
charmhelpers/core/host.py (+12/-1)
charmhelpers/core/hugepage.py (+2/-0)
tests/charmhelpers/contrib/openstack/amulet/deployment.py (+100/-1)
tests/charmhelpers/contrib/openstack/amulet/utils.py (+25/-3)
To merge this branch: bzr merge lp:~james-page/charms/trusty/glance/lp1531102-trunk
Reviewer Review Type Date Requested Status
Liam Young Approve
Review via email: mp+281863@code.launchpad.net

Commit message

Resync helpers

Description of the change

Resync stable helpers to resolve liberty point release issues.

To post a comment you must log in.
Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

charm_unit_test #15633 glance for james-page mp281863
    UNIT OK: passed

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

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

charm_amulet_test #8569 glance for james-page mp281863
    AMULET OK: passed

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

Revision history for this message
Liam Young (gnuoy) wrote :

approve

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'charmhelpers/contrib/openstack/amulet/deployment.py'
--- charmhelpers/contrib/openstack/amulet/deployment.py 2015-10-22 13:20:02 +0000
+++ charmhelpers/contrib/openstack/amulet/deployment.py 2016-01-07 14:17:04 +0000
@@ -14,12 +14,18 @@
14# You should have received a copy of the GNU Lesser General Public License14# You should have received a copy of the GNU Lesser General Public License
15# along with charm-helpers. If not, see <http://www.gnu.org/licenses/>.15# along with charm-helpers. If not, see <http://www.gnu.org/licenses/>.
1616
17import logging
18import re
19import sys
17import six20import six
18from collections import OrderedDict21from collections import OrderedDict
19from charmhelpers.contrib.amulet.deployment import (22from charmhelpers.contrib.amulet.deployment import (
20 AmuletDeployment23 AmuletDeployment
21)24)
2225
26DEBUG = logging.DEBUG
27ERROR = logging.ERROR
28
2329
24class OpenStackAmuletDeployment(AmuletDeployment):30class OpenStackAmuletDeployment(AmuletDeployment):
25 """OpenStack amulet deployment.31 """OpenStack amulet deployment.
@@ -28,9 +34,12 @@
28 that is specifically for use by OpenStack charms.34 that is specifically for use by OpenStack charms.
29 """35 """
3036
31 def __init__(self, series=None, openstack=None, source=None, stable=True):37 def __init__(self, series=None, openstack=None, source=None,
38 stable=True, log_level=DEBUG):
32 """Initialize the deployment environment."""39 """Initialize the deployment environment."""
33 super(OpenStackAmuletDeployment, self).__init__(series)40 super(OpenStackAmuletDeployment, self).__init__(series)
41 self.log = self.get_logger(level=log_level)
42 self.log.info('OpenStackAmuletDeployment: init')
34 self.openstack = openstack43 self.openstack = openstack
35 self.source = source44 self.source = source
36 self.stable = stable45 self.stable = stable
@@ -38,6 +47,22 @@
38 # out.47 # out.
39 self.current_next = "trusty"48 self.current_next = "trusty"
4049
50 def get_logger(self, name="deployment-logger", level=logging.DEBUG):
51 """Get a logger object that will log to stdout."""
52 log = logging
53 logger = log.getLogger(name)
54 fmt = log.Formatter("%(asctime)s %(funcName)s "
55 "%(levelname)s: %(message)s")
56
57 handler = log.StreamHandler(stream=sys.stdout)
58 handler.setLevel(level)
59 handler.setFormatter(fmt)
60
61 logger.addHandler(handler)
62 logger.setLevel(level)
63
64 return logger
65
41 def _determine_branch_locations(self, other_services):66 def _determine_branch_locations(self, other_services):
42 """Determine the branch locations for the other services.67 """Determine the branch locations for the other services.
4368
@@ -45,6 +70,8 @@
45 stable or next (dev) branch, and based on this, use the corresonding70 stable or next (dev) branch, and based on this, use the corresonding
46 stable or next branches for the other_services."""71 stable or next branches for the other_services."""
4772
73 self.log.info('OpenStackAmuletDeployment: determine branch locations')
74
48 # Charms outside the lp:~openstack-charmers namespace75 # Charms outside the lp:~openstack-charmers namespace
49 base_charms = ['mysql', 'mongodb', 'nrpe']76 base_charms = ['mysql', 'mongodb', 'nrpe']
5077
@@ -82,6 +109,8 @@
82109
83 def _add_services(self, this_service, other_services):110 def _add_services(self, this_service, other_services):
84 """Add services to the deployment and set openstack-origin/source."""111 """Add services to the deployment and set openstack-origin/source."""
112 self.log.info('OpenStackAmuletDeployment: adding services')
113
85 other_services = self._determine_branch_locations(other_services)114 other_services = self._determine_branch_locations(other_services)
86115
87 super(OpenStackAmuletDeployment, self)._add_services(this_service,116 super(OpenStackAmuletDeployment, self)._add_services(this_service,
@@ -111,9 +140,79 @@
111140
112 def _configure_services(self, configs):141 def _configure_services(self, configs):
113 """Configure all of the services."""142 """Configure all of the services."""
143 self.log.info('OpenStackAmuletDeployment: configure services')
114 for service, config in six.iteritems(configs):144 for service, config in six.iteritems(configs):
115 self.d.configure(service, config)145 self.d.configure(service, config)
116146
147 def _auto_wait_for_status(self, message=None, exclude_services=None,
148 include_only=None, timeout=1800):
149 """Wait for all units to have a specific extended status, except
150 for any defined as excluded. Unless specified via message, any
151 status containing any case of 'ready' will be considered a match.
152
153 Examples of message usage:
154
155 Wait for all unit status to CONTAIN any case of 'ready' or 'ok':
156 message = re.compile('.*ready.*|.*ok.*', re.IGNORECASE)
157
158 Wait for all units to reach this status (exact match):
159 message = re.compile('^Unit is ready and clustered$')
160
161 Wait for all units to reach any one of these (exact match):
162 message = re.compile('Unit is ready|OK|Ready')
163
164 Wait for at least one unit to reach this status (exact match):
165 message = {'ready'}
166
167 See Amulet's sentry.wait_for_messages() for message usage detail.
168 https://github.com/juju/amulet/blob/master/amulet/sentry.py
169
170 :param message: Expected status match
171 :param exclude_services: List of juju service names to ignore,
172 not to be used in conjuction with include_only.
173 :param include_only: List of juju service names to exclusively check,
174 not to be used in conjuction with exclude_services.
175 :param timeout: Maximum time in seconds to wait for status match
176 :returns: None. Raises if timeout is hit.
177 """
178 self.log.info('Waiting for extended status on units...')
179
180 all_services = self.d.services.keys()
181
182 if exclude_services and include_only:
183 raise ValueError('exclude_services can not be used '
184 'with include_only')
185
186 if message:
187 if isinstance(message, re._pattern_type):
188 match = message.pattern
189 else:
190 match = message
191
192 self.log.debug('Custom extended status wait match: '
193 '{}'.format(match))
194 else:
195 self.log.debug('Default extended status wait match: contains '
196 'READY (case-insensitive)')
197 message = re.compile('.*ready.*', re.IGNORECASE)
198
199 if exclude_services:
200 self.log.debug('Excluding services from extended status match: '
201 '{}'.format(exclude_services))
202 else:
203 exclude_services = []
204
205 if include_only:
206 services = include_only
207 else:
208 services = list(set(all_services) - set(exclude_services))
209
210 self.log.debug('Waiting up to {}s for extended status on services: '
211 '{}'.format(timeout, services))
212 service_messages = {service: message for service in services}
213 self.d.sentry.wait_for_messages(service_messages, timeout=timeout)
214 self.log.info('OK')
215
117 def _get_openstack_release(self):216 def _get_openstack_release(self):
118 """Get openstack release.217 """Get openstack release.
119218
120219
=== modified file 'charmhelpers/contrib/openstack/amulet/utils.py'
--- charmhelpers/contrib/openstack/amulet/utils.py 2015-10-22 13:20:02 +0000
+++ charmhelpers/contrib/openstack/amulet/utils.py 2016-01-07 14:17:04 +0000
@@ -18,6 +18,7 @@
18import json18import json
19import logging19import logging
20import os20import os
21import re
21import six22import six
22import time23import time
23import urllib24import urllib
@@ -604,7 +605,22 @@
604 '{}'.format(sample_type, samples))605 '{}'.format(sample_type, samples))
605 return None606 return None
606607
607# rabbitmq/amqp specific helpers:608 # rabbitmq/amqp specific helpers:
609
610 def rmq_wait_for_cluster(self, deployment, init_sleep=15, timeout=1200):
611 """Wait for rmq units extended status to show cluster readiness,
612 after an optional initial sleep period. Initial sleep is likely
613 necessary to be effective following a config change, as status
614 message may not instantly update to non-ready."""
615
616 if init_sleep:
617 time.sleep(init_sleep)
618
619 message = re.compile('^Unit is ready and clustered$')
620 deployment._auto_wait_for_status(message=message,
621 timeout=timeout,
622 include_only=['rabbitmq-server'])
623
608 def add_rmq_test_user(self, sentry_units,624 def add_rmq_test_user(self, sentry_units,
609 username="testuser1", password="changeme"):625 username="testuser1", password="changeme"):
610 """Add a test user via the first rmq juju unit, check connection as626 """Add a test user via the first rmq juju unit, check connection as
@@ -805,7 +821,10 @@
805 if port:821 if port:
806 config['ssl_port'] = port822 config['ssl_port'] = port
807823
808 deployment.configure('rabbitmq-server', config)824 deployment.d.configure('rabbitmq-server', config)
825
826 # Wait for unit status
827 self.rmq_wait_for_cluster(deployment)
809828
810 # Confirm829 # Confirm
811 tries = 0830 tries = 0
@@ -832,7 +851,10 @@
832851
833 # Disable RMQ SSL852 # Disable RMQ SSL
834 config = {'ssl': 'off'}853 config = {'ssl': 'off'}
835 deployment.configure('rabbitmq-server', config)854 deployment.d.configure('rabbitmq-server', config)
855
856 # Wait for unit status
857 self.rmq_wait_for_cluster(deployment)
836858
837 # Confirm859 # Confirm
838 tries = 0860 tries = 0
839861
=== modified file 'charmhelpers/contrib/openstack/context.py'
--- charmhelpers/contrib/openstack/context.py 2015-10-22 13:20:02 +0000
+++ charmhelpers/contrib/openstack/context.py 2016-01-07 14:17:04 +0000
@@ -952,6 +952,19 @@
952 'config': config}952 'config': config}
953 return ovs_ctxt953 return ovs_ctxt
954954
955 def midonet_ctxt(self):
956 driver = neutron_plugin_attribute(self.plugin, 'driver',
957 self.network_manager)
958 midonet_config = neutron_plugin_attribute(self.plugin, 'config',
959 self.network_manager)
960 mido_ctxt = {'core_plugin': driver,
961 'neutron_plugin': 'midonet',
962 'neutron_security_groups': self.neutron_security_groups,
963 'local_ip': unit_private_ip(),
964 'config': midonet_config}
965
966 return mido_ctxt
967
955 def __call__(self):968 def __call__(self):
956 if self.network_manager not in ['quantum', 'neutron']:969 if self.network_manager not in ['quantum', 'neutron']:
957 return {}970 return {}
@@ -973,6 +986,8 @@
973 ctxt.update(self.nuage_ctxt())986 ctxt.update(self.nuage_ctxt())
974 elif self.plugin == 'plumgrid':987 elif self.plugin == 'plumgrid':
975 ctxt.update(self.pg_ctxt())988 ctxt.update(self.pg_ctxt())
989 elif self.plugin == 'midonet':
990 ctxt.update(self.midonet_ctxt())
976991
977 alchemy_flags = config('neutron-alchemy-flags')992 alchemy_flags = config('neutron-alchemy-flags')
978 if alchemy_flags:993 if alchemy_flags:
@@ -1105,7 +1120,7 @@
11051120
1106 ctxt = {1121 ctxt = {
1107 ... other context ...1122 ... other context ...
1108 'subordinate_config': {1123 'subordinate_configuration': {
1109 'DEFAULT': {1124 'DEFAULT': {
1110 'key1': 'value1',1125 'key1': 'value1',
1111 },1126 },
@@ -1146,22 +1161,23 @@
1146 try:1161 try:
1147 sub_config = json.loads(sub_config)1162 sub_config = json.loads(sub_config)
1148 except:1163 except:
1149 log('Could not parse JSON from subordinate_config '1164 log('Could not parse JSON from '
1150 'setting from %s' % rid, level=ERROR)1165 'subordinate_configuration setting from %s'
1166 % rid, level=ERROR)
1151 continue1167 continue
11521168
1153 for service in self.services:1169 for service in self.services:
1154 if service not in sub_config:1170 if service not in sub_config:
1155 log('Found subordinate_config on %s but it contained'1171 log('Found subordinate_configuration on %s but it '
1156 'nothing for %s service' % (rid, service),1172 'contained nothing for %s service'
1157 level=INFO)1173 % (rid, service), level=INFO)
1158 continue1174 continue
11591175
1160 sub_config = sub_config[service]1176 sub_config = sub_config[service]
1161 if self.config_file not in sub_config:1177 if self.config_file not in sub_config:
1162 log('Found subordinate_config on %s but it contained'1178 log('Found subordinate_configuration on %s but it '
1163 'nothing for %s' % (rid, self.config_file),1179 'contained nothing for %s'
1164 level=INFO)1180 % (rid, self.config_file), level=INFO)
1165 continue1181 continue
11661182
1167 sub_config = sub_config[self.config_file]1183 sub_config = sub_config[self.config_file]
11681184
=== modified file 'charmhelpers/contrib/openstack/neutron.py'
--- charmhelpers/contrib/openstack/neutron.py 2015-10-22 13:20:02 +0000
+++ charmhelpers/contrib/openstack/neutron.py 2016-01-07 14:17:04 +0000
@@ -209,6 +209,20 @@
209 'server_packages': ['neutron-server',209 'server_packages': ['neutron-server',
210 'neutron-plugin-plumgrid'],210 'neutron-plugin-plumgrid'],
211 'server_services': ['neutron-server']211 'server_services': ['neutron-server']
212 },
213 'midonet': {
214 'config': '/etc/neutron/plugins/midonet/midonet.ini',
215 'driver': 'midonet.neutron.plugin.MidonetPluginV2',
216 'contexts': [
217 context.SharedDBContext(user=config('neutron-database-user'),
218 database=config('neutron-database'),
219 relation_prefix='neutron',
220 ssl_dir=NEUTRON_CONF_DIR)],
221 'services': [],
222 'packages': [[headers_package()] + determine_dkms_package()],
223 'server_packages': ['neutron-server',
224 'python-neutron-plugin-midonet'],
225 'server_services': ['neutron-server']
212 }226 }
213 }227 }
214 if release >= 'icehouse':228 if release >= 'icehouse':
215229
=== modified file 'charmhelpers/contrib/openstack/utils.py'
--- charmhelpers/contrib/openstack/utils.py 2015-10-22 13:20:02 +0000
+++ charmhelpers/contrib/openstack/utils.py 2016-01-07 14:17:04 +0000
@@ -121,36 +121,37 @@
121 ('2.2.2', 'kilo'),121 ('2.2.2', 'kilo'),
122 ('2.3.0', 'liberty'),122 ('2.3.0', 'liberty'),
123 ('2.4.0', 'liberty'),123 ('2.4.0', 'liberty'),
124 ('2.5.0', 'liberty'),
124])125])
125126
126# >= Liberty version->codename mapping127# >= Liberty version->codename mapping
127PACKAGE_CODENAMES = {128PACKAGE_CODENAMES = {
128 'nova-common': OrderedDict([129 'nova-common': OrderedDict([
129 ('12.0.0', 'liberty'),130 ('12.0', 'liberty'),
130 ]),131 ]),
131 'neutron-common': OrderedDict([132 'neutron-common': OrderedDict([
132 ('7.0.0', 'liberty'),133 ('7.0', 'liberty'),
133 ]),134 ]),
134 'cinder-common': OrderedDict([135 'cinder-common': OrderedDict([
135 ('7.0.0', 'liberty'),136 ('7.0', 'liberty'),
136 ]),137 ]),
137 'keystone': OrderedDict([138 'keystone': OrderedDict([
138 ('8.0.0', 'liberty'),139 ('8.0', 'liberty'),
139 ]),140 ]),
140 'horizon-common': OrderedDict([141 'horizon-common': OrderedDict([
141 ('8.0.0', 'liberty'),142 ('8.0', 'liberty'),
142 ]),143 ]),
143 'ceilometer-common': OrderedDict([144 'ceilometer-common': OrderedDict([
144 ('5.0.0', 'liberty'),145 ('5.0', 'liberty'),
145 ]),146 ]),
146 'heat-common': OrderedDict([147 'heat-common': OrderedDict([
147 ('5.0.0', 'liberty'),148 ('5.0', 'liberty'),
148 ]),149 ]),
149 'glance-common': OrderedDict([150 'glance-common': OrderedDict([
150 ('11.0.0', 'liberty'),151 ('11.0', 'liberty'),
151 ]),152 ]),
152 'openstack-dashboard': OrderedDict([153 'openstack-dashboard': OrderedDict([
153 ('8.0.0', 'liberty'),154 ('8.0', 'liberty'),
154 ]),155 ]),
155}156}
156157
@@ -237,7 +238,14 @@
237 error_out(e)238 error_out(e)
238239
239 vers = apt.upstream_version(pkg.current_ver.ver_str)240 vers = apt.upstream_version(pkg.current_ver.ver_str)
240 match = re.match('^(\d+)\.(\d+)\.(\d+)', vers)241 if 'swift' in pkg.name:
242 # Fully x.y.z match for swift versions
243 match = re.match('^(\d+)\.(\d+)\.(\d+)', vers)
244 else:
245 # x.y match only for 20XX.X
246 # and ignore patch level for other packages
247 match = re.match('^(\d+)\.(\d+)', vers)
248
241 if match:249 if match:
242 vers = match.group(0)250 vers = match.group(0)
243251
@@ -249,13 +257,8 @@
249 # < Liberty co-ordinated project versions257 # < Liberty co-ordinated project versions
250 try:258 try:
251 if 'swift' in pkg.name:259 if 'swift' in pkg.name:
252 swift_vers = vers[:5]260 return SWIFT_CODENAMES[vers]
253 if swift_vers not in SWIFT_CODENAMES:
254 # Deal with 1.10.0 upward
255 swift_vers = vers[:6]
256 return SWIFT_CODENAMES[swift_vers]
257 else:261 else:
258 vers = vers[:6]
259 return OPENSTACK_CODENAMES[vers]262 return OPENSTACK_CODENAMES[vers]
260 except KeyError:263 except KeyError:
261 if not fatal:264 if not fatal:
@@ -858,7 +861,9 @@
858 if charm_state != 'active' and charm_state != 'unknown':861 if charm_state != 'active' and charm_state != 'unknown':
859 state = workload_state_compare(state, charm_state)862 state = workload_state_compare(state, charm_state)
860 if message:863 if message:
861 message = "{} {}".format(message, charm_message)864 charm_message = charm_message.replace("Incomplete relations: ",
865 "")
866 message = "{}, {}".format(message, charm_message)
862 else:867 else:
863 message = charm_message868 message = charm_message
864869
865870
=== modified file 'charmhelpers/core/host.py'
--- charmhelpers/core/host.py 2015-10-22 13:20:02 +0000
+++ charmhelpers/core/host.py 2016-01-07 14:17:04 +0000
@@ -566,7 +566,14 @@
566 os.chdir(cur)566 os.chdir(cur)
567567
568568
569def chownr(path, owner, group, follow_links=True):569def chownr(path, owner, group, follow_links=True, chowntopdir=False):
570 """
571 Recursively change user and group ownership of files and directories
572 in given path. Doesn't chown path itself by default, only its children.
573
574 :param bool follow_links: Also Chown links if True
575 :param bool chowntopdir: Also chown path itself if True
576 """
570 uid = pwd.getpwnam(owner).pw_uid577 uid = pwd.getpwnam(owner).pw_uid
571 gid = grp.getgrnam(group).gr_gid578 gid = grp.getgrnam(group).gr_gid
572 if follow_links:579 if follow_links:
@@ -574,6 +581,10 @@
574 else:581 else:
575 chown = os.lchown582 chown = os.lchown
576583
584 if chowntopdir:
585 broken_symlink = os.path.lexists(path) and not os.path.exists(path)
586 if not broken_symlink:
587 chown(path, uid, gid)
577 for root, dirs, files in os.walk(path):588 for root, dirs, files in os.walk(path):
578 for name in dirs + files:589 for name in dirs + files:
579 full = os.path.join(root, name)590 full = os.path.join(root, name)
580591
=== modified file 'charmhelpers/core/hugepage.py'
--- charmhelpers/core/hugepage.py 2015-10-22 13:20:02 +0000
+++ charmhelpers/core/hugepage.py 2016-01-07 14:17:04 +0000
@@ -46,6 +46,8 @@
46 group_info = add_group(group)46 group_info = add_group(group)
47 gid = group_info.gr_gid47 gid = group_info.gr_gid
48 add_user_to_group(user, group)48 add_user_to_group(user, group)
49 if max_map_count < 2 * nr_hugepages:
50 max_map_count = 2 * nr_hugepages
49 sysctl_settings = {51 sysctl_settings = {
50 'vm.nr_hugepages': nr_hugepages,52 'vm.nr_hugepages': nr_hugepages,
51 'vm.max_map_count': max_map_count,53 'vm.max_map_count': max_map_count,
5254
=== modified file 'tests/charmhelpers/contrib/openstack/amulet/deployment.py'
--- tests/charmhelpers/contrib/openstack/amulet/deployment.py 2015-10-22 13:20:02 +0000
+++ tests/charmhelpers/contrib/openstack/amulet/deployment.py 2016-01-07 14:17:04 +0000
@@ -14,12 +14,18 @@
14# You should have received a copy of the GNU Lesser General Public License14# You should have received a copy of the GNU Lesser General Public License
15# along with charm-helpers. If not, see <http://www.gnu.org/licenses/>.15# along with charm-helpers. If not, see <http://www.gnu.org/licenses/>.
1616
17import logging
18import re
19import sys
17import six20import six
18from collections import OrderedDict21from collections import OrderedDict
19from charmhelpers.contrib.amulet.deployment import (22from charmhelpers.contrib.amulet.deployment import (
20 AmuletDeployment23 AmuletDeployment
21)24)
2225
26DEBUG = logging.DEBUG
27ERROR = logging.ERROR
28
2329
24class OpenStackAmuletDeployment(AmuletDeployment):30class OpenStackAmuletDeployment(AmuletDeployment):
25 """OpenStack amulet deployment.31 """OpenStack amulet deployment.
@@ -28,9 +34,12 @@
28 that is specifically for use by OpenStack charms.34 that is specifically for use by OpenStack charms.
29 """35 """
3036
31 def __init__(self, series=None, openstack=None, source=None, stable=True):37 def __init__(self, series=None, openstack=None, source=None,
38 stable=True, log_level=DEBUG):
32 """Initialize the deployment environment."""39 """Initialize the deployment environment."""
33 super(OpenStackAmuletDeployment, self).__init__(series)40 super(OpenStackAmuletDeployment, self).__init__(series)
41 self.log = self.get_logger(level=log_level)
42 self.log.info('OpenStackAmuletDeployment: init')
34 self.openstack = openstack43 self.openstack = openstack
35 self.source = source44 self.source = source
36 self.stable = stable45 self.stable = stable
@@ -38,6 +47,22 @@
38 # out.47 # out.
39 self.current_next = "trusty"48 self.current_next = "trusty"
4049
50 def get_logger(self, name="deployment-logger", level=logging.DEBUG):
51 """Get a logger object that will log to stdout."""
52 log = logging
53 logger = log.getLogger(name)
54 fmt = log.Formatter("%(asctime)s %(funcName)s "
55 "%(levelname)s: %(message)s")
56
57 handler = log.StreamHandler(stream=sys.stdout)
58 handler.setLevel(level)
59 handler.setFormatter(fmt)
60
61 logger.addHandler(handler)
62 logger.setLevel(level)
63
64 return logger
65
41 def _determine_branch_locations(self, other_services):66 def _determine_branch_locations(self, other_services):
42 """Determine the branch locations for the other services.67 """Determine the branch locations for the other services.
4368
@@ -45,6 +70,8 @@
45 stable or next (dev) branch, and based on this, use the corresonding70 stable or next (dev) branch, and based on this, use the corresonding
46 stable or next branches for the other_services."""71 stable or next branches for the other_services."""
4772
73 self.log.info('OpenStackAmuletDeployment: determine branch locations')
74
48 # Charms outside the lp:~openstack-charmers namespace75 # Charms outside the lp:~openstack-charmers namespace
49 base_charms = ['mysql', 'mongodb', 'nrpe']76 base_charms = ['mysql', 'mongodb', 'nrpe']
5077
@@ -82,6 +109,8 @@
82109
83 def _add_services(self, this_service, other_services):110 def _add_services(self, this_service, other_services):
84 """Add services to the deployment and set openstack-origin/source."""111 """Add services to the deployment and set openstack-origin/source."""
112 self.log.info('OpenStackAmuletDeployment: adding services')
113
85 other_services = self._determine_branch_locations(other_services)114 other_services = self._determine_branch_locations(other_services)
86115
87 super(OpenStackAmuletDeployment, self)._add_services(this_service,116 super(OpenStackAmuletDeployment, self)._add_services(this_service,
@@ -111,9 +140,79 @@
111140
112 def _configure_services(self, configs):141 def _configure_services(self, configs):
113 """Configure all of the services."""142 """Configure all of the services."""
143 self.log.info('OpenStackAmuletDeployment: configure services')
114 for service, config in six.iteritems(configs):144 for service, config in six.iteritems(configs):
115 self.d.configure(service, config)145 self.d.configure(service, config)
116146
147 def _auto_wait_for_status(self, message=None, exclude_services=None,
148 include_only=None, timeout=1800):
149 """Wait for all units to have a specific extended status, except
150 for any defined as excluded. Unless specified via message, any
151 status containing any case of 'ready' will be considered a match.
152
153 Examples of message usage:
154
155 Wait for all unit status to CONTAIN any case of 'ready' or 'ok':
156 message = re.compile('.*ready.*|.*ok.*', re.IGNORECASE)
157
158 Wait for all units to reach this status (exact match):
159 message = re.compile('^Unit is ready and clustered$')
160
161 Wait for all units to reach any one of these (exact match):
162 message = re.compile('Unit is ready|OK|Ready')
163
164 Wait for at least one unit to reach this status (exact match):
165 message = {'ready'}
166
167 See Amulet's sentry.wait_for_messages() for message usage detail.
168 https://github.com/juju/amulet/blob/master/amulet/sentry.py
169
170 :param message: Expected status match
171 :param exclude_services: List of juju service names to ignore,
172 not to be used in conjuction with include_only.
173 :param include_only: List of juju service names to exclusively check,
174 not to be used in conjuction with exclude_services.
175 :param timeout: Maximum time in seconds to wait for status match
176 :returns: None. Raises if timeout is hit.
177 """
178 self.log.info('Waiting for extended status on units...')
179
180 all_services = self.d.services.keys()
181
182 if exclude_services and include_only:
183 raise ValueError('exclude_services can not be used '
184 'with include_only')
185
186 if message:
187 if isinstance(message, re._pattern_type):
188 match = message.pattern
189 else:
190 match = message
191
192 self.log.debug('Custom extended status wait match: '
193 '{}'.format(match))
194 else:
195 self.log.debug('Default extended status wait match: contains '
196 'READY (case-insensitive)')
197 message = re.compile('.*ready.*', re.IGNORECASE)
198
199 if exclude_services:
200 self.log.debug('Excluding services from extended status match: '
201 '{}'.format(exclude_services))
202 else:
203 exclude_services = []
204
205 if include_only:
206 services = include_only
207 else:
208 services = list(set(all_services) - set(exclude_services))
209
210 self.log.debug('Waiting up to {}s for extended status on services: '
211 '{}'.format(timeout, services))
212 service_messages = {service: message for service in services}
213 self.d.sentry.wait_for_messages(service_messages, timeout=timeout)
214 self.log.info('OK')
215
117 def _get_openstack_release(self):216 def _get_openstack_release(self):
118 """Get openstack release.217 """Get openstack release.
119218
120219
=== modified file 'tests/charmhelpers/contrib/openstack/amulet/utils.py'
--- tests/charmhelpers/contrib/openstack/amulet/utils.py 2015-10-22 13:20:02 +0000
+++ tests/charmhelpers/contrib/openstack/amulet/utils.py 2016-01-07 14:17:04 +0000
@@ -18,6 +18,7 @@
18import json18import json
19import logging19import logging
20import os20import os
21import re
21import six22import six
22import time23import time
23import urllib24import urllib
@@ -604,7 +605,22 @@
604 '{}'.format(sample_type, samples))605 '{}'.format(sample_type, samples))
605 return None606 return None
606607
607# rabbitmq/amqp specific helpers:608 # rabbitmq/amqp specific helpers:
609
610 def rmq_wait_for_cluster(self, deployment, init_sleep=15, timeout=1200):
611 """Wait for rmq units extended status to show cluster readiness,
612 after an optional initial sleep period. Initial sleep is likely
613 necessary to be effective following a config change, as status
614 message may not instantly update to non-ready."""
615
616 if init_sleep:
617 time.sleep(init_sleep)
618
619 message = re.compile('^Unit is ready and clustered$')
620 deployment._auto_wait_for_status(message=message,
621 timeout=timeout,
622 include_only=['rabbitmq-server'])
623
608 def add_rmq_test_user(self, sentry_units,624 def add_rmq_test_user(self, sentry_units,
609 username="testuser1", password="changeme"):625 username="testuser1", password="changeme"):
610 """Add a test user via the first rmq juju unit, check connection as626 """Add a test user via the first rmq juju unit, check connection as
@@ -805,7 +821,10 @@
805 if port:821 if port:
806 config['ssl_port'] = port822 config['ssl_port'] = port
807823
808 deployment.configure('rabbitmq-server', config)824 deployment.d.configure('rabbitmq-server', config)
825
826 # Wait for unit status
827 self.rmq_wait_for_cluster(deployment)
809828
810 # Confirm829 # Confirm
811 tries = 0830 tries = 0
@@ -832,7 +851,10 @@
832851
833 # Disable RMQ SSL852 # Disable RMQ SSL
834 config = {'ssl': 'off'}853 config = {'ssl': 'off'}
835 deployment.configure('rabbitmq-server', config)854 deployment.d.configure('rabbitmq-server', config)
855
856 # Wait for unit status
857 self.rmq_wait_for_cluster(deployment)
836858
837 # Confirm859 # Confirm
838 tries = 0860 tries = 0

Subscribers

People subscribed via source and target branches