Merge "Add some in-tree ansible group vars"

This commit is contained in:
Jenkins 2015-11-03 14:12:54 +00:00 committed by Gerrit Code Review
commit 3493be1916
4 changed files with 4 additions and 6 deletions

View File

@ -0,0 +1 @@
puppetmaster: puppetmaster.openstack.org

View File

@ -2,4 +2,4 @@
- hosts: "afs*" - hosts: "afs*"
gather_facts: false gather_facts: false
roles: roles:
- { role: puppet, puppetmaster: puppetmaster.openstack.org } - role: puppet

View File

@ -1,5 +1,4 @@
--- - hosts: '!review.openstack.org:!git0*:!afs*'
- hosts: "!review.openstack.org:!git0*:!afs*"
gather_facts: false gather_facts: false
roles: roles:
- { role: puppet, puppetmaster: puppetmaster.openstack.org } - role: puppet

View File

@ -12,13 +12,11 @@
max_fail_percentage: 1 max_fail_percentage: 1
roles: roles:
- role: puppet - role: puppet
puppetmaster: puppetmaster.openstack.org
facts: facts:
project_config_ref: "{{ hostvars.localhost.gitinfo.after }}" project_config_ref: "{{ hostvars.localhost.gitinfo.after }}"
- hosts: review.openstack.org - hosts: review.openstack.org
gather_facts: false gather_facts: false
roles: roles:
- role: puppet - role: puppet
puppetmaster: puppetmaster.openstack.org
facts: facts:
project_config_ref: "{{ hostvars.localhost.gitinfo.after }}" project_config_ref: "{{ hostvars.localhost.gitinfo.after }}"