From d7453b1d649650ae1c38812c8af054bf15a4e916 Mon Sep 17 00:00:00 2001 From: Spencer Krum Date: Sat, 28 Nov 2015 12:48:33 -0800 Subject: [PATCH] Don't manage hieradata on Puppetmaster Puppet the puppetmaster first Change-Id: I2ecd63c73de6f9eb915900418c5656eb5d6a2816 --- playbooks/remote_puppet_else.yaml | 2 +- playbooks/remote_puppet_git.yaml | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/playbooks/remote_puppet_else.yaml b/playbooks/remote_puppet_else.yaml index 748a831b6d..ecbaa6e646 100644 --- a/playbooks/remote_puppet_else.yaml +++ b/playbooks/remote_puppet_else.yaml @@ -1,4 +1,4 @@ -- hosts: '!review.openstack.org:!git0*:!afs*' +- hosts: '!review.openstack.org:!git0*:!afs*:!puppetmaster*' gather_facts: true roles: - role: puppet diff --git a/playbooks/remote_puppet_git.yaml b/playbooks/remote_puppet_git.yaml index b2b9305b13..e0c6db57ef 100644 --- a/playbooks/remote_puppet_git.yaml +++ b/playbooks/remote_puppet_git.yaml @@ -7,6 +7,9 @@ # the remote_head value in returndict.after - git: repo=https://git.openstack.org/openstack-infra/project-config clone=no register: gitinfo + roles: + - role: puppet + copy_hieradata: False - hosts: git0* gather_facts: true max_fail_percentage: 1