summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorClark Boylan <clark.boylan@gmail.com>2015-02-09 16:55:48 -0800
committerMonty Taylor <mordred@inaugust.com>2015-03-11 13:14:49 -0400
commit0441e7c7f058eb26f0d8e356cb4dc972f5244f88 (patch)
treeee7fa9543ca21be7f5809a8f88b44cbf86390a93
parent2b0a960ad3d97f6d9f04161bee6c61179ade187e (diff)
Pass in a ref for the project_config repo
When running ansible we need to pass a specific version of project-config through to puppet from ansible. Do this via the project_config_ref fact that the puppet role in ansible understands. Depends-On: Id99c3c2c20764ed4ba4259bd53f8067289374403 Change-Id: I88995c81c13080d913bac239a7635619cdc34441
Notes
Notes (review): Code-Review+2: Monty Taylor <mordred@inaugust.com> Verified+2: Jenkins Code-Review+2: Jeremy Stanley <fungi@yuggoth.org> Workflow+1: Jeremy Stanley <fungi@yuggoth.org> Code-Review+1: Joshua Hesketh <joshua.hesketh@rackspace.com> Code-Review+1: greghaynes <greg@greghaynes.net> Submitted-by: Jenkins Submitted-at: Wed, 11 Mar 2015 19:57:17 +0000 Reviewed-on: https://review.openstack.org/154305 Project: openstack-infra/system-config Branch: refs/heads/master
-rw-r--r--modules/openstack_project/files/ansible/playbooks/remote_puppet_git.yaml18
1 files changed, 16 insertions, 2 deletions
diff --git a/modules/openstack_project/files/ansible/playbooks/remote_puppet_git.yaml b/modules/openstack_project/files/ansible/playbooks/remote_puppet_git.yaml
index 6e84306..a85c488 100644
--- a/modules/openstack_project/files/ansible/playbooks/remote_puppet_git.yaml
+++ b/modules/openstack_project/files/ansible/playbooks/remote_puppet_git.yaml
@@ -1,10 +1,24 @@
1--- 1---
2- hosts: localhost
3 gather_facts: false
4 connection: local
5 tasks:
6 # Note that git module does ls-remote if clone is set to no and places
7 # the remote_head value in returndict.after
8 - git: repo=https://git.openstack.org/openstack-infra/project-config clone=no
9 register: gitinfo
2- hosts: git0* 10- hosts: git0*
3 gather_facts: false 11 gather_facts: false
4 max_fail_percentage: 1 12 max_fail_percentage: 1
5 roles: 13 roles:
6 - { role: puppet, puppetmaster: puppetmaster.openstack.org } 14 - role: puppet
15 puppetmaster: puppetmaster.openstack.org
16 facts:
17 project_config_ref: "{{ hostvars.localhost.gitinfo.after }}"
7- hosts: review.openstack.org 18- hosts: review.openstack.org
8 gather_facts: false 19 gather_facts: false
9 roles: 20 roles:
10 - { role: puppet, puppetmaster: puppetmaster.openstack.org } 21 - role: puppet
22 puppetmaster: puppetmaster.openstack.org
23 facts:
24 project_config_ref: "{{ hostvars.localhost.gitinfo.after }}"