diff options
author | Zuul <zuul@review.openstack.org> | 2019-02-12 23:19:27 +0000 |
---|---|---|
committer | Gerrit Code Review <review@openstack.org> | 2019-02-12 23:19:27 +0000 |
commit | be5b02d08fc32cf019f804ebe194f599ff3737d7 (patch) | |
tree | 286cdcafbc9883ce40048f0673c9ac8a743870ae | |
parent | d3e554e306f6f02df6b596d2e00041ed78dc8484 (diff) | |
parent | 1f1f358c038b090b2009f2c6b410ee790e12a694 (diff) |
Merge "Fix gitea playbooks"
-rw-r--r-- | kubernetes/rook/rook-playbook.yaml | 15 | ||||
-rwxr-xr-x | 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 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 | ||
@@ -94,15 +94,15 @@ send_timer base | |||
94 | 94 | ||
95 | # These playbooks run on the gitea k8s cluster | 95 | # These playbooks run on the gitea k8s cluster |
96 | start_timer | 96 | start_timer |
97 | timeout -k 2m 120m ansible-playbook -f 50 -e /etc/ansible/hosts/gitea-cluster.yaml ${SYSTEM_CONFIG}/kubernetes/rook/rook-playbook.yaml | 97 | timeout -k 2m 120m ansible-playbook -f 50 -e @/etc/ansible/hosts/gitea-cluster.yaml ${SYSTEM_CONFIG}/kubernetes/rook/rook-playbook.yaml |
98 | send_timer gitea_rook | 98 | send_timer gitea_rook |
99 | 99 | ||
100 | start_timer | 100 | start_timer |
101 | timeout -k 2m 120m ansible-playbook -f 50 -e /etc/ansible/hosts/gitea-cluster.yaml ${SYSTEM_CONFIG}/kubernetes/percona-xtradb-cluster/pxc-playbook.yaml | 101 | timeout -k 2m 120m ansible-playbook -f 50 -e @/etc/ansible/hosts/gitea-cluster.yaml ${SYSTEM_CONFIG}/kubernetes/percona-xtradb-cluster/pxc-playbook.yaml |
102 | send_timer gitea_pxc | 102 | send_timer gitea_pxc |
103 | 103 | ||
104 | start_timer | 104 | start_timer |
105 | timeout -k 2m 120m ansible-playbook -f 50 -e /etc/ansible/hosts/gitea-cluster.yaml ${SYSTEM_CONFIG}/kubernetes/gitea/gitea-playbook.yaml | 105 | timeout -k 2m 120m ansible-playbook -f 50 -e @/etc/ansible/hosts/gitea-cluster.yaml ${SYSTEM_CONFIG}/kubernetes/gitea/gitea-playbook.yaml |
106 | send_timer gitea_gitea | 106 | send_timer gitea_gitea |
107 | 107 | ||
108 | # Update the puppet version | 108 | # Update the puppet version |