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
This commit is contained in:
Monty Taylor 2015-11-30 17:28:41 -06:00
parent f1b9b864f7
commit 2f9b98b3cd
2 changed files with 2 additions and 19 deletions

View File

@ -1,2 +1,4 @@
puppetmaster: puppetmaster.openstack.org
copy_hieradata: true
copy_puppet: true
manifest_base: /etc/system-config

View File

@ -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