Change: improve roles string split
This change has been requested by Dmitrii Kabanov dkabanov@mirantis.com. Now if roles is a string, it does not have to have spaces after commas. Change-Id: I8b7bae1e1f2a4955dda9440b629393f18edc6fac
This commit is contained in:
parent
377f3bb085
commit
883dca4cf0
@ -107,6 +107,9 @@ popd
|
|||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Tue Oct 24 2017 Dmitry Sutyagin <dsutyagin@mirantis.com> - 1.26.13
|
||||||
|
- Change: improve roles string split
|
||||||
|
|
||||||
* Fri Oct 20 2017 Dmitry Sutyagin <dsutyagin@mirantis.com> - 1.26.12
|
* Fri Oct 20 2017 Dmitry Sutyagin <dsutyagin@mirantis.com> - 1.26.12
|
||||||
- Fix: scripts_all_pairs does not trigger archive
|
- Fix: scripts_all_pairs does not trigger archive
|
||||||
|
|
||||||
|
@ -16,7 +16,7 @@
|
|||||||
# under the License.
|
# under the License.
|
||||||
|
|
||||||
project_name = 'timmy'
|
project_name = 'timmy'
|
||||||
version = '1.26.12'
|
version = '1.26.13'
|
||||||
|
|
||||||
if __name__ == '__main__':
|
if __name__ == '__main__':
|
||||||
import sys
|
import sys
|
||||||
|
@ -59,7 +59,7 @@ class Node(object):
|
|||||||
if type(roles) is list:
|
if type(roles) is list:
|
||||||
self.roles = roles
|
self.roles = roles
|
||||||
else:
|
else:
|
||||||
self.roles = roles.split(', ') if roles else []
|
self.roles = re.split(', *', roles) if roles else []
|
||||||
self.os_platform = os_platform
|
self.os_platform = os_platform
|
||||||
self.online = online
|
self.online = online
|
||||||
self.status = status
|
self.status = status
|
||||||
|
Loading…
x
Reference in New Issue
Block a user