Merge "Fix gitea playbooks"

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 @@
 - 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 8f162ef..83b8888 100755
--- a/run_all.sh
+++ b/run_all.sh
@@ -94,15 +94,15 @@ send_timer base
 
 # 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