Move readycheck;Fix template value
All checks were successful
continuous-integration/drone/push Build is passing

This commit is contained in:
Danny Bessems 2023-01-17 15:08:20 +01:00
parent 8e2df51993
commit f2dadb3e47

View File

@ -20,7 +20,7 @@
resourcepool: "{{ vcenter_info.resourcepool }}" resourcepool: "{{ vcenter_info.resourcepool }}"
folder: "{{ vcenter_info.folder }}" folder: "{{ vcenter_info.folder }}"
cluster: cluster:
nodetemplate: "{{ (components.clusterapi.workload.node_template.name | split('.'))[:-1] | join('.') }}" nodetemplate: "{{ (components.clusterapi.workload.node_template.url | basename | split('.'))[:-1] | join('.') }}"
publickey: "{{ vapp['guestinfo.rootsshkey'] }}" publickey: "{{ vapp['guestinfo.rootsshkey'] }}"
version: "{{ components.clusterapi.workload.version.k8s }}" version: "{{ components.clusterapi.workload.version.k8s }}"
vip: "{{ vapp['workloadcluster.vip'] }}" vip: "{{ vapp['workloadcluster.vip'] }}"
@ -120,6 +120,17 @@
kubeconfig: "{{ kubeconfig.path }}" kubeconfig: "{{ kubeconfig.path }}"
# TODO: move to git repo # TODO: move to git repo
- name: Wait for cluster to be available
ansible.builtin.shell:
cmd: >-
kubectl wait clusters.cluster.x-k8s.io/{{ vapp['workloadcluster.name'] | lower }} \
--for=condition=Ready \
--timeout 0s
register: cluster_readycheck
until: cluster_readycheck is succeeded
retries: "{{ playbook.retries }}"
delay: "{{ playbook.delays.long }}"
- name: Initialize tempfile - name: Initialize tempfile
ansible.builtin.tempfile: ansible.builtin.tempfile:
state: file state: file
@ -140,17 +151,6 @@
mode: 0600 mode: 0600
no_log: true no_log: true
- name: Wait for cluster to be available
ansible.builtin.shell:
cmd: >-
kubectl wait clusters.cluster.x-k8s.io/{{ vapp['workloadcluster.name'] | lower }} \
--for=condition=Ready \
--timeout 0s
register: cluster_readycheck
until: cluster_readycheck is succeeded
retries: "{{ playbook.retries }}"
delay: "{{ playbook.delays.long }}"
# TODO: move to git repo # TODO: move to git repo
- name: Apply cni plugin manifest - name: Apply cni plugin manifest
kubernetes.core.k8s: kubernetes.core.k8s: