opendev/system-config
Code Issues Proposed changes

Use jinja match filter instead of regex_match

Browse Source 
regex_match seems to either not work or not exist or something. match,
otoh, works. Additionally, we get this:

  [DEPRECATION WARNING]: Using tests as filters is deprecated. Instead
   of using `result|match` use `result is match`. This feature will
   be removed in version 2.9.

when using the | syntax, so obey the warning and switch to is.

Change-Id: Ie201241a11c08b9fed58c0e1790e8187ee4cf474
This commit is contained in:
Monty Taylor 2018-08-16 14:14:15 -05:00
parent b8f4081c2e
commit 3e139891be
No known key found for this signature in database
GPG Key ID: 7BAE94BC7141A594
1 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
playbooks/roles/install-ansible/files/groups.yaml
View File

@ -1,36 +1,36 @@
plugin: constructed plugin: constructed
groups: groups:
adns: inventory_hostname.startswith('adns') adns: inventory_hostname.startswith('adns')
afs: inventory_hostname|regex_match('afs\d+.*openstack.org') afs: inventory_hostname is match('afs\d+.*openstack.org')
afsadmin: inventory_hostname|regex_match('mirror-update\d+\.openstack\.org') afsadmin: inventory_hostname is match('mirror-update\d+\.openstack\.org')
afsdb: inventory_hostname|regex_match('afsdb.*openstack.org') afsdb: inventory_hostname is match('afsdb.*openstack.org')
cacti: inventory_hostname|regex_match('cacti\d+\.openstack\.org') cacti: inventory_hostname is match('cacti\d+\.openstack\.org')
ci-backup: inventory_hostname|regex_match('backup\d+.*\ci\.openstack\.org') ci-backup: inventory_hostname is match('backup\d+.*\ci\.openstack\.org')
disabled: inventory_hostname.startswith('backup') or inventory_hostname.startswith('wiki') or inventory_hostname.startswith('puppetmaster') disabled: inventory_hostname.startswith('backup') or inventory_hostname.startswith('wiki') or inventory_hostname.startswith('puppetmaster')
eavesdrop: inventory_hostname.startswith('eavesdrop') eavesdrop: inventory_hostname.startswith('eavesdrop')
elasticsearch: inventory_hostname|regex_match('elasticsearch0[1-7]\.openstack\.org') elasticsearch: inventory_hostname is match('elasticsearch0[1-7]\.openstack\.org')
ethercalc: inventory_hostname.startswith('ethercalc') ethercalc: inventory_hostname.startswith('ethercalc')
files: inventory_hostname.startswith('files') files: inventory_hostname.startswith('files')
futureparser: inventory_hostname|regex_match('(review-dev\d*|groups\d*|groups-dev\d*|graphite\d*|etherpad-dev\d*|ask-staging\d*|codesearch\d*)\.openstack\.org') futureparser: inventory_hostname is match('(review-dev\d*|groups\d*|groups-dev\d*|graphite\d*|etherpad-dev\d*|ask-staging\d*|codesearch\d*)\.openstack\.org')
git-loadbalancer: inventory_hostname|regex_match('~git(-fe\d+)?\.openstack\.org') git-loadbalancer: inventory_hostname is match('git(-fe\d+)?\.openstack\.org')
git-server: inventory_hostname|regex_match('~git\d+\.openstack\.org') git-server: inventory_hostname is match('git\d+\.openstack\.org')
grafana: inventory_hostname.startswith('grafana') grafana: inventory_hostname.startswith('grafana')
logstash-worker: inventory_hostname.startswith('logstash-worker') logstash-worker: inventory_hostname.startswith('logstash-worker')
mailman: inventory_hostname.startswith('lists') mailman: inventory_hostname.startswith('lists')
nodepool: inventory_hostname|regex_match('^(nodepool|nb|nl)') nodepool: inventory_hostname is match('^(nodepool|nb|nl)')
ns: inventory_hostname.startswith('ns') ns: inventory_hostname.startswith('ns')
paste: inventory_hostname.startswith('paste') paste: inventory_hostname.startswith('paste')
puppet: not inventory_hostname.startswith('bridge') puppet: not inventory_hostname.startswith('bridge')
review-dev: inventory_hostname|regex_match('review-dev\d+\.openstack\.org') review-dev: inventory_hostname is match('review-dev\d+\.openstack\.org')
review: inventory_hostname|regex_match('review\d+\.openstack\.org') review: inventory_hostname is match('review\d+\.openstack\.org')
status: inventory_hostname.startswith('status') status: inventory_hostname.startswith('status')
storyboard: inventory_hostname.startswith('storyboard') storyboard: inventory_hostname.startswith('storyboard')
subunit-worker: inventory_hostname.startswith('subunit-worker') subunit-worker: inventory_hostname.startswith('subunit-worker')
survey: inventory_hostname.startswith('survey') survey: inventory_hostname.startswith('survey')
translate-dev: inventory_hostname|regex_match('translate-dev\d+\.openstack\.org') translate-dev: inventory_hostname is match('translate-dev\d+\.openstack\.org')
translate: inventory_hostname|regex_match('translate\d+\.openstack\.org') translate: inventory_hostname is match('translate\d+\.openstack\.org')
wiki-dev: inventory_hostname|regex_match('wiki-dev\d+\.openstack\.org') wiki-dev: inventory_hostname is match('wiki-dev\d+\.openstack\.org')
wiki: inventory_hostname|regex_match('wiki\d+\.openstack\.org') wiki: inventory_hostname is match('wiki\d+\.openstack\.org')
zuul-executor: inventory_hostname.startswith('ze') zuul-executor: inventory_hostname.startswith('ze')
zuul-merger: inventory_hostname|regex_match('z[lm](static)?\d+\.openstack\.org') zuul-merger: inventory_hostname is match('z[lm](static)?\d+\.openstack\.org')
zuul-scheduler: inventory_hostname.startswith('zuul') zuul-scheduler: inventory_hostname.startswith('zuul')