opendev/system-config
Code Issues Proposed changes

Merge "Fix some little ansible issues"

Browse Source
This commit is contained in:
Zuul 2018-08-07 22:52:52 +00:00 committed by Gerrit Code Review
commit f66b2db0bf
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
playbooks/roles/base-server/tasks/main.yaml
View File

@ -35,10 +35,11 @@
authorized_key:
state: present
user: root
exclusive: yes
key: |
ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDSLlN41ftgxkNeUi/kATYPwMPjJdMaSbgokSb9PSkRPZE7GeNai60BCfhu+ky8h5eMe70Bpwb7mQ7GAtHGXPNU1SRBPhMuVN9EYrQbt5KSiwuiTXtQHsWyYrSKtB+XGbl2PhpMQ/TPVtFoL5usxu/MYaakVkCEbt5IbPYNg88/NKPixicJuhi0qsd+l1X1zoc1+Fn87PlwMoIgfLIktwaL8hw9mzqr+pPcDIjCFQQWnjqJVEObOcMstBT20XwKj/ymiH+6p123nnlIHilACJzXhmIZIZO+EGkNF7KyXpcBSfv9efPI+VCE2TOv/scJFdEHtDFkl2kdUBYPC0wQ92rp puppet-remote-2014-09-15
key_options: |
from="{{ bastion_ipv4 }}:{{ bastion_ipv6 }},localhost"
from="{{ bastion_ipv4 }},{{ bastion_ipv6 }},localhost"
- name: Disable byobu
file:

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

@ -29,6 +29,6 @@ groups:
translate: inventory_hostname|regex_match('translate\d+\.openstack\.org')
wiki-dev: inventory_hostname|regex_match('wiki-dev\d+\.openstack\.org')
wiki: inventory_hostname|regex_match('wiki\d+\.openstack\.org')
zuul-executor: inventory_hostname.startswith('ze')
zuul-merger: inventory_hostname|regex_match('z[lm](static)?\d+\.openstack\.org')
zuul-scheduler: inventory_hostname.startswith('ze')
zuul-scheduler: inventory_hostname.startswith('zuul')