From 6b6bb6c4a4a016b3e894150e862b49f4a13120e0 Mon Sep 17 00:00:00 2001 From: Paul Belanger Date: Mon, 24 Apr 2017 11:35:45 -0400 Subject: [PATCH] Split infracloud baremetal into separate playbook run Currently puppet fails to run on our baremetal servers for infracloud. While this is an issue, it should not block puppet from running on our controller or compute nodes. Change-Id: I190af6cfc63006cb03686cd501998e4e06d350b1 Signed-off-by: Paul Belanger --- playbooks/remote_puppet_infracloud.yaml | 4 ---- playbooks/remote_puppet_infracloud_baremetal.yaml | 5 +++++ run_infracloud.sh | 1 + 3 files changed, 6 insertions(+), 4 deletions(-) create mode 100644 playbooks/remote_puppet_infracloud_baremetal.yaml diff --git a/playbooks/remote_puppet_infracloud.yaml b/playbooks/remote_puppet_infracloud.yaml index 522cac3394..d49d8dcb45 100644 --- a/playbooks/remote_puppet_infracloud.yaml +++ b/playbooks/remote_puppet_infracloud.yaml @@ -1,8 +1,4 @@ --- -- hosts: "baremetal*.ic.openstack.org:!disabled" - gather_facts: true - roles: - - role: puppet - hosts: "controller*.ic.openstack.org:!disabled" gather_facts: true roles: diff --git a/playbooks/remote_puppet_infracloud_baremetal.yaml b/playbooks/remote_puppet_infracloud_baremetal.yaml new file mode 100644 index 0000000000..ac025e577e --- /dev/null +++ b/playbooks/remote_puppet_infracloud_baremetal.yaml @@ -0,0 +1,5 @@ +--- +- hosts: "baremetal*.ic.openstack.org:!disabled" + gather_facts: true + roles: + - role: puppet diff --git a/run_infracloud.sh b/run_infracloud.sh index 7626684a79..8f9cec91dd 100755 --- a/run_infracloud.sh +++ b/run_infracloud.sh @@ -30,4 +30,5 @@ set +e # Run all the ansible playbooks under timeout to prevent them from getting # stuck if they are oomkilled +timeout -k 2m 120m ansible-playbook -f 10 ${ANSIBLE_PLAYBOOKS}/remote_puppet_infracloud_baremetal.yaml timeout -k 2m 120m ansible-playbook -f 10 ${ANSIBLE_PLAYBOOKS}/remote_puppet_infracloud.yaml