From 1f1f358c038b090b2009f2c6b410ee790e12a694 Mon Sep 17 00:00:00 2001 From: "James E. Blair" Date: Tue, 12 Feb 2019 14:20:02 -0800 Subject: [PATCH] Fix gitea playbooks First, we need an @ before the extra vars files. Why? Because an @ is needed. Second, the rook playbook was stringing all 4 commands on to one exec call which was working poorly. Instead, make 4 tasks so that it's slightly better represented in ansible output, each of which has a (presumably) valid command. Change-Id: I30efe84d2041237a00da0c0aac02afa92d29c0fb --- kubernetes/rook/rook-playbook.yaml | 15 ++++++++------- run_all.sh | 6 +++--- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/kubernetes/rook/rook-playbook.yaml b/kubernetes/rook/rook-playbook.yaml index 692e5b99aa..61b436868f 100644 --- a/kubernetes/rook/rook-playbook.yaml +++ b/kubernetes/rook/rook-playbook.yaml @@ -1,14 +1,15 @@ - hosts: localhost tasks: - # Using kubectl rather than k8s module because the # k8s module only allows single document files and # the majority of these files are pretty straight # copies from upstream rook, so reorganizing them # into single document files is lame. - - name: Set up cinder storage class - command: | - kubectl --context gitea apply -f rook-operator.yaml - kubectl --context gitea apply -f rook-cluster.yaml - kubectl --context gitea apply -f rook-toolbox.yaml - kubectl --context gitea apply -f rook-filesystem.yaml + - name: Set up Rook operator + command: kubectl --context gitea apply -f rook-operator.yaml + - name: Set up Rook cluster + command: kubectl --context gitea apply -f rook-cluster.yaml + - name: Set up Rook toolbox + command: kubectl --context gitea apply -f rook-toolbox.yaml + - name: Set up Rook filesystem + command: kubectl --context gitea apply -f rook-filesystem.yaml diff --git a/run_all.sh b/run_all.sh index 11f9e55ca3..84fe848789 100755 --- a/run_all.sh +++ b/run_all.sh @@ -89,15 +89,15 @@ send_timer k8s # These playbooks run on the gitea k8s cluster start_timer -timeout -k 2m 120m ansible-playbook -f 50 -e /etc/ansible/hosts/gitea-cluster.yaml ${SYSTEM_CONFIG}/kubernetes/rook/rook-playbook.yaml +timeout -k 2m 120m ansible-playbook -f 50 -e @/etc/ansible/hosts/gitea-cluster.yaml ${SYSTEM_CONFIG}/kubernetes/rook/rook-playbook.yaml send_timer gitea_rook start_timer -timeout -k 2m 120m ansible-playbook -f 50 -e /etc/ansible/hosts/gitea-cluster.yaml ${SYSTEM_CONFIG}/kubernetes/percona-xtradb-cluster/pxc-playbook.yaml +timeout -k 2m 120m ansible-playbook -f 50 -e @/etc/ansible/hosts/gitea-cluster.yaml ${SYSTEM_CONFIG}/kubernetes/percona-xtradb-cluster/pxc-playbook.yaml send_timer gitea_pxc start_timer -timeout -k 2m 120m ansible-playbook -f 50 -e /etc/ansible/hosts/gitea-cluster.yaml ${SYSTEM_CONFIG}/kubernetes/gitea/gitea-playbook.yaml +timeout -k 2m 120m ansible-playbook -f 50 -e @/etc/ansible/hosts/gitea-cluster.yaml ${SYSTEM_CONFIG}/kubernetes/gitea/gitea-playbook.yaml send_timer gitea_gitea # Update the puppet version