From 2f9b98b3cd67a761209a35e417cb1766311cdf1a Mon Sep 17 00:00:00 2001 From: Monty Taylor Date: Mon, 30 Nov 2015 17:28:41 -0600 Subject: [PATCH] Use the puppet role to copy the puppet code When we do it as a second playbook, the failure to copy updated code cannot prevent puppet from running. Change-Id: I94b06988a20da4c0c2cf492485997ec49c3dca13 Depends-On: I22b7a21778d514a0a1ab04a76f03fdc9c58a05b3 --- playbooks/group_vars/all.yaml | 2 ++ playbooks/update_puppet.yaml | 19 ------------------- 2 files changed, 2 insertions(+), 19 deletions(-) diff --git a/playbooks/group_vars/all.yaml b/playbooks/group_vars/all.yaml index b18094f9d7..e76db31aa5 100644 --- a/playbooks/group_vars/all.yaml +++ b/playbooks/group_vars/all.yaml @@ -1,2 +1,4 @@ puppetmaster: puppetmaster.openstack.org copy_hieradata: true +copy_puppet: true +manifest_base: /etc/system-config diff --git a/playbooks/update_puppet.yaml b/playbooks/update_puppet.yaml index f00f02b3e0..e026d1239b 100644 --- a/playbooks/update_puppet.yaml +++ b/playbooks/update_puppet.yaml @@ -13,22 +13,3 @@ - shell: ansible-galaxy install --force -r roles.yaml args: chdir: /opt/system-config/production -- hosts: '!puppetmaster.openstack.org:!disabled' - gather_facts: false - tasks: - - synchronize: - src: /opt/system-config/production - dest: /opt/system-config - - synchronize: - src: /etc/puppet/modules - dest: /etc/puppet - - file: - path: /etc/puppet/hieradata - state: directory - mode: 0700 - owner: root - group: root - - file: - src: /etc/puppet/hieradata - dest: /opt/system-config/hieradata - state: link