Rename update_puppet to update-system-config
The purpose of the playbook is to update the system-config checkout, as well as installing puppet modules and ansible roles. Rename it, so that it's clearer what it does. Also, clean it up a bit. We've gotten better at playbooks since we originally wrote this. Change-Id: I793914ca3fc7f89cf019cf4cdf52acb7e0c93e60
This commit is contained in:
parent
67376f4c4c
commit
815355bc83
21
playbooks/update-system-config.yaml
Normal file
21
playbooks/update-system-config.yaml
Normal file
@ -0,0 +1,21 @@
|
||||
---
|
||||
- hosts: "localhost:!disabled"
|
||||
connection: local
|
||||
gather_facts: false
|
||||
tasks:
|
||||
|
||||
- name: Make sure system-config repo is up to date
|
||||
git:
|
||||
repo: https://git.openstack.org/openstack-infra/system-config
|
||||
dest: /opt/system-config/production
|
||||
force: yes
|
||||
|
||||
- name: Clone puppet modules to /etc/puppet/modules
|
||||
command: ./install_modules.sh
|
||||
args:
|
||||
chdir: /opt/system-config/production
|
||||
|
||||
- name: Install ansible roles to /etc/ansible/roles
|
||||
command: ansible-galaxy install --force -r roles.yaml
|
||||
args:
|
||||
chdir: /opt/system-config/production
|
@ -1,15 +0,0 @@
|
||||
---
|
||||
- hosts: "localhost:!disabled"
|
||||
connection: local
|
||||
gather_facts: false
|
||||
tasks:
|
||||
- git:
|
||||
repo: https://git.openstack.org/openstack-infra/system-config
|
||||
dest: /opt/system-config/production
|
||||
force: yes
|
||||
- shell: ./install_modules.sh
|
||||
args:
|
||||
chdir: /opt/system-config/production
|
||||
- shell: ansible-galaxy install --force -r roles.yaml
|
||||
args:
|
||||
chdir: /opt/system-config/production
|
@ -31,7 +31,7 @@ set +e
|
||||
# stuck if they are oomkilled
|
||||
|
||||
# First, sync the puppet repos with all the machines
|
||||
timeout -k 2m 120m ansible-playbook -f 10 ${ANSIBLE_PLAYBOOKS}/update_puppet.yaml
|
||||
timeout -k 2m 120m ansible-playbook -f 10 ${ANSIBLE_PLAYBOOKS}/update-system-config.yaml
|
||||
# Update the puppet version
|
||||
timeout -k 2m 120m ansible-playbook -f 10 ${ANSIBLE_PLAYBOOKS}/update_puppet_version.yaml
|
||||
# Run the git/gerrit/zuul sequence, since it's important that they all work together
|
||||
|
Loading…
x
Reference in New Issue
Block a user