From 32f956f268e10af5fb6fc9ee3aff3b7a3d230621 Mon Sep 17 00:00:00 2001 From: Colleen Murphy Date: Tue, 13 Oct 2015 20:43:13 -0700 Subject: [PATCH] Add infracloud playbook Add separate playbook for infacloud nodes to ensure they run in the correct order - baremetal -> controller -> compute. Baremetal is intentionally left out, it is not ready yet. All 'disabled' flags on infracloud hosts are turned off. This patch landing turns on management of the infracloud. Co-Authored-By: Yolanda Robla Co-Authored-By: Spencer Krum Change-Id: Ieeda072d45f7454d6412295c2c6a0cf7ce61d952 --- .../openstack_project/files/puppetmaster/infracloud | 6 ++---- playbooks/remote_puppet_else.yaml | 2 +- playbooks/remote_puppet_infracloud.yaml | 10 ++++++++++ run_all.sh | 1 + 4 files changed, 14 insertions(+), 5 deletions(-) create mode 100644 playbooks/remote_puppet_infracloud.yaml diff --git a/modules/openstack_project/files/puppetmaster/infracloud b/modules/openstack_project/files/puppetmaster/infracloud index 869f8e177a..0d3130c4ef 100644 --- a/modules/openstack_project/files/puppetmaster/infracloud +++ b/modules/openstack_project/files/puppetmaster/infracloud @@ -1,7 +1,3 @@ -# this disables infracloud until we are ready -[disabled:children] -infracloud - [infracloud] controller00.hpuswest.ic.openstack.org compute000.hpuswest.ic.openstack.org @@ -49,3 +45,5 @@ compute038.hpuswest.ic.openstack.org compute041.hpuswest.ic.openstack.org compute042.hpuswest.ic.openstack.org compute043.hpuswest.ic.openstack.org + +#TODO Add baremetal controller host here diff --git a/playbooks/remote_puppet_else.yaml b/playbooks/remote_puppet_else.yaml index 2191e1acac..5d5d4117ee 100644 --- a/playbooks/remote_puppet_else.yaml +++ b/playbooks/remote_puppet_else.yaml @@ -1,4 +1,4 @@ -- hosts: '!review.openstack.org:!git0*:!afs*:!puppetmaster*:!disabled' +- hosts: '!review.openstack.org:!git0*:!afs*:!baremetal*:!controller:!compute:!puppetmaster*:!disabled' gather_facts: true roles: - role: puppet diff --git a/playbooks/remote_puppet_infracloud.yaml b/playbooks/remote_puppet_infracloud.yaml new file mode 100644 index 0000000000..7da639e4ef --- /dev/null +++ b/playbooks/remote_puppet_infracloud.yaml @@ -0,0 +1,10 @@ +--- +# TODO add baremetal controller here +- hosts: "controller*.ic.openstack.org:!disabled" + gather_facts: true + roles: + - role: puppet +- hosts: "compute*.ic.openstack.org:!disabled" + gather_facts: true + roles: + - role: puppet diff --git a/run_all.sh b/run_all.sh index 8482d93e23..6ac903026c 100755 --- a/run_all.sh +++ b/run_all.sh @@ -34,5 +34,6 @@ ansible-playbook -f 10 ${ANSIBLE_PLAYBOOKS}/remote_puppet_git.yaml # Run AFS changes separately so we can make sure to only do one at a time # (turns out quorum is nice to have) ansible-playbook -f 1 ${ANSIBLE_PLAYBOOKS}/remote_puppet_afs.yaml +ansible-playbook -f 10 ${ANSIBLE_PLAYBOOKS}/remote_puppet_infracloud.yaml # Run everything else. We do not care if the other things worked ansible-playbook -f 20 ${ANSIBLE_PLAYBOOKS}/remote_puppet_else.yaml