Merge "Fix gitea playbooks"

This commit is contained in:
Zuul 2019-02-12 23:19:27 +00:00 committed by Gerrit Code Review
commit be5b02d08f
2 changed files with 11 additions and 10 deletions

View File

@ -1,14 +1,15 @@
- hosts: localhost - hosts: localhost
tasks: tasks:
# Using kubectl rather than k8s module because the # Using kubectl rather than k8s module because the
# k8s module only allows single document files and # k8s module only allows single document files and
# the majority of these files are pretty straight # the majority of these files are pretty straight
# copies from upstream rook, so reorganizing them # copies from upstream rook, so reorganizing them
# into single document files is lame. # into single document files is lame.
- name: Set up cinder storage class - name: Set up Rook operator
command: | command: kubectl --context gitea apply -f rook-operator.yaml
kubectl --context gitea apply -f rook-operator.yaml - name: Set up Rook cluster
kubectl --context gitea apply -f rook-cluster.yaml command: kubectl --context gitea apply -f rook-cluster.yaml
kubectl --context gitea apply -f rook-toolbox.yaml - name: Set up Rook toolbox
kubectl --context gitea apply -f rook-filesystem.yaml command: kubectl --context gitea apply -f rook-toolbox.yaml
- name: Set up Rook filesystem
command: kubectl --context gitea apply -f rook-filesystem.yaml

View File

@ -94,15 +94,15 @@ send_timer base
# These playbooks run on the gitea k8s cluster # These playbooks run on the gitea k8s cluster
start_timer 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 send_timer gitea_rook
start_timer 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 send_timer gitea_pxc
start_timer 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 send_timer gitea_gitea
# Update the puppet version # Update the puppet version