From 1e862a9aded68d098d9ebb296a2dbe69e182cc84 Mon Sep 17 00:00:00 2001 From: Monty Taylor Date: Wed, 11 Mar 2015 13:04:42 -0400 Subject: [PATCH] Add some in-tree ansible group vars As we're using these roles, we'll want to pass potentially different values to different of our hosts over time. For instance, we may want to set the jenkins servers to start using puppet apply before we get all the hosts there. Since we run most of the hosts in a big matching mechanism, the way we can pass different input values to each host. Change-Id: I5698355df0c13cd11fe5987787e65ee85a384256 --- playbooks/group_vars/all.yaml | 1 + playbooks/remote_puppet_afs.yaml | 2 +- playbooks/remote_puppet_else.yaml | 5 ++--- playbooks/remote_puppet_git.yaml | 2 -- 4 files changed, 4 insertions(+), 6 deletions(-) create mode 100644 playbooks/group_vars/all.yaml diff --git a/playbooks/group_vars/all.yaml b/playbooks/group_vars/all.yaml new file mode 100644 index 0000000000..931507e997 --- /dev/null +++ b/playbooks/group_vars/all.yaml @@ -0,0 +1 @@ +puppetmaster: puppetmaster.openstack.org diff --git a/playbooks/remote_puppet_afs.yaml b/playbooks/remote_puppet_afs.yaml index d8f75f7d12..5c1e5fded6 100644 --- a/playbooks/remote_puppet_afs.yaml +++ b/playbooks/remote_puppet_afs.yaml @@ -2,4 +2,4 @@ - hosts: "afs*" gather_facts: false roles: - - { role: puppet, puppetmaster: puppetmaster.openstack.org } + - role: puppet diff --git a/playbooks/remote_puppet_else.yaml b/playbooks/remote_puppet_else.yaml index 17318f1505..51da3aec85 100644 --- a/playbooks/remote_puppet_else.yaml +++ b/playbooks/remote_puppet_else.yaml @@ -1,5 +1,4 @@ ---- -- hosts: "!review.openstack.org:!git0*:!afs*" +- hosts: '!review.openstack.org:!git0*:!afs*' gather_facts: false roles: - - { role: puppet, puppetmaster: puppetmaster.openstack.org } + - role: puppet diff --git a/playbooks/remote_puppet_git.yaml b/playbooks/remote_puppet_git.yaml index a85c488f53..15fe96b464 100644 --- a/playbooks/remote_puppet_git.yaml +++ b/playbooks/remote_puppet_git.yaml @@ -12,13 +12,11 @@ max_fail_percentage: 1 roles: - role: puppet - puppetmaster: puppetmaster.openstack.org facts: project_config_ref: "{{ hostvars.localhost.gitinfo.after }}" - hosts: review.openstack.org gather_facts: false roles: - role: puppet - puppetmaster: puppetmaster.openstack.org facts: project_config_ref: "{{ hostvars.localhost.gitinfo.after }}"