summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames E. Blair <jeblair@redhat.com>2019-02-12 14:20:02 -0800
committerJames E. Blair <jeblair@redhat.com>2019-02-12 14:20:02 -0800
commit1f1f358c038b090b2009f2c6b410ee790e12a694 (patch)
treee4034028d9d42cdc9f0a1946407a25da37f97e44
parenta79e6dd6bc1d792143a99c590cfd827cee3df146 (diff)
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
Notes
Notes (review): Code-Review+2: Clark Boylan <cboylan@sapwetik.org> Code-Review+2: Monty Taylor <mordred@inaugust.com> Workflow+1: Monty Taylor <mordred@inaugust.com> Verified+2: Zuul Submitted-by: Zuul Submitted-at: Tue, 12 Feb 2019 23:19:27 +0000 Reviewed-on: https://review.openstack.org/636452 Project: openstack-infra/system-config Branch: refs/heads/master
-rw-r--r--kubernetes/rook/rook-playbook.yaml15
-rwxr-xr-xrun_all.sh6
2 files changed, 11 insertions, 10 deletions
diff --git a/kubernetes/rook/rook-playbook.yaml b/kubernetes/rook/rook-playbook.yaml
index 692e5b9..61b4368 100644
--- a/kubernetes/rook/rook-playbook.yaml
+++ b/kubernetes/rook/rook-playbook.yaml
@@ -1,14 +1,15 @@
1- hosts: localhost 1- hosts: localhost
2 tasks: 2 tasks:
3
4 # Using kubectl rather than k8s module because the 3 # Using kubectl rather than k8s module because the
5 # k8s module only allows single document files and 4 # k8s module only allows single document files and
6 # the majority of these files are pretty straight 5 # the majority of these files are pretty straight
7 # copies from upstream rook, so reorganizing them 6 # copies from upstream rook, so reorganizing them
8 # into single document files is lame. 7 # into single document files is lame.
9 - name: Set up cinder storage class 8 - name: Set up Rook operator
10 command: | 9 command: kubectl --context gitea apply -f rook-operator.yaml
11 kubectl --context gitea apply -f rook-operator.yaml 10 - name: Set up Rook cluster
12 kubectl --context gitea apply -f rook-cluster.yaml 11 command: kubectl --context gitea apply -f rook-cluster.yaml
13 kubectl --context gitea apply -f rook-toolbox.yaml 12 - name: Set up Rook toolbox
14 kubectl --context gitea apply -f rook-filesystem.yaml 13 command: kubectl --context gitea apply -f rook-toolbox.yaml
14 - name: Set up Rook filesystem
15 command: kubectl --context gitea apply -f rook-filesystem.yaml
diff --git a/run_all.sh b/run_all.sh
index 11f9e55..84fe848 100755
--- a/run_all.sh
+++ b/run_all.sh
@@ -89,15 +89,15 @@ send_timer k8s
89 89
90# These playbooks run on the gitea k8s cluster 90# These playbooks run on the gitea k8s cluster
91start_timer 91start_timer
92timeout -k 2m 120m ansible-playbook -f 50 -e /etc/ansible/hosts/gitea-cluster.yaml ${SYSTEM_CONFIG}/kubernetes/rook/rook-playbook.yaml 92timeout -k 2m 120m ansible-playbook -f 50 -e @/etc/ansible/hosts/gitea-cluster.yaml ${SYSTEM_CONFIG}/kubernetes/rook/rook-playbook.yaml
93send_timer gitea_rook 93send_timer gitea_rook
94 94
95start_timer 95start_timer
96timeout -k 2m 120m ansible-playbook -f 50 -e /etc/ansible/hosts/gitea-cluster.yaml ${SYSTEM_CONFIG}/kubernetes/percona-xtradb-cluster/pxc-playbook.yaml 96timeout -k 2m 120m ansible-playbook -f 50 -e @/etc/ansible/hosts/gitea-cluster.yaml ${SYSTEM_CONFIG}/kubernetes/percona-xtradb-cluster/pxc-playbook.yaml
97send_timer gitea_pxc 97send_timer gitea_pxc
98 98
99start_timer 99start_timer
100timeout -k 2m 120m ansible-playbook -f 50 -e /etc/ansible/hosts/gitea-cluster.yaml ${SYSTEM_CONFIG}/kubernetes/gitea/gitea-playbook.yaml 100timeout -k 2m 120m ansible-playbook -f 50 -e @/etc/ansible/hosts/gitea-cluster.yaml ${SYSTEM_CONFIG}/kubernetes/gitea/gitea-playbook.yaml
101send_timer gitea_gitea 101send_timer gitea_gitea
102 102
103# Update the puppet version 103# Update the puppet version