Move playbooks out of the puppet module
/etc/ansible/playbooks isn't actually a thing, it was just a convenient place to put things. However, to enable puppet apply, we're going to want a group_vars directory adjacent to the playbooks, so having them be a subdirectory of the puppet module and installed by it is just extra complexity. Also, if we run out of system-config, then it'll be easier to work with things like what we do with puppet environments for testing things. Change-Id: I947521a73051a44036e7f4c45ce74a79637f5a8b
This commit is contained in:
parent
0e71561089
commit
d039a62045
@ -524,7 +524,7 @@ To rename a project:
|
|||||||
changing, gate jobs may fail due to outdated remote URLs. Clear
|
changing, gate jobs may fail due to outdated remote URLs. Clear
|
||||||
the workspaces on persistent Jenkins slaves to mitigate this::
|
the workspaces on persistent Jenkins slaves to mitigate this::
|
||||||
|
|
||||||
sudo ansible-playbook -f 10 /etc/ansible/playbooks/clean_workspaces.yaml --extra-vars "project=PROJECTNAME"
|
sudo ansible-playbook -f 10 /opt/system-config/production/playbooks/clean_workspaces.yaml --extra-vars "project=PROJECTNAME"
|
||||||
|
|
||||||
#. Submit a change that updates .gitreview with the new location of the
|
#. Submit a change that updates .gitreview with the new location of the
|
||||||
project.
|
project.
|
||||||
|
@ -176,10 +176,7 @@ class openstack_project::puppetmaster (
|
|||||||
# Playbooks
|
# Playbooks
|
||||||
#
|
#
|
||||||
file { '/etc/ansible/playbooks':
|
file { '/etc/ansible/playbooks':
|
||||||
ensure => directory,
|
ensure => absent,
|
||||||
recurse => true,
|
|
||||||
source => 'puppet:///modules/openstack_project/ansible/playbooks',
|
|
||||||
require => Class[ansible],
|
|
||||||
}
|
}
|
||||||
|
|
||||||
file { '/etc/ansible/remote_puppet.yaml':
|
file { '/etc/ansible/remote_puppet.yaml':
|
||||||
|
@ -19,9 +19,10 @@
|
|||||||
# expect.
|
# expect.
|
||||||
set -e
|
set -e
|
||||||
export ANSIBLE_LOG_PATH=/var/log/puppet_run_all.log
|
export ANSIBLE_LOG_PATH=/var/log/puppet_run_all.log
|
||||||
ANSIBLE_PLAYBOOKS=/etc/ansible/playbooks
|
SYSTEM_CONFIG=/opt/system-config/production
|
||||||
|
ANSIBLE_PLAYBOOKS=$SYSTEM_CONFIG/playbooks
|
||||||
|
|
||||||
cd /opt/system-config/production
|
cd $SYSTEM_CONFIG
|
||||||
git fetch -a && git reset -q --hard @{u}
|
git fetch -a && git reset -q --hard @{u}
|
||||||
./install_modules.sh
|
./install_modules.sh
|
||||||
ansible-galaxy install --force -r roles.yaml
|
ansible-galaxy install --force -r roles.yaml
|
||||||
|
Loading…
Reference in New Issue
Block a user