Skip to content

Commit 5fc0261

Browse files
authored
allow overriding default vars (#16)
needed to set the `vrrp_nic` variable without it being overwritten by the loaded extra vars file. Signed-off-by: jbpratt <jbpratt78@gmail.com>
1 parent 70d3945 commit 5fc0261

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

containers/kubespray/rootfs/entrypoint.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ sleep 1
1515

1616
/root/kubespray/contrib/inventory_builder/inventory.py ${IPS[@]}
1717

18-
ansible-playbook $@ --extra-vars @/etc/ansible/vars.yml --become /root/.ansible/playbooks/kubespray-prep.yml || exit 1
19-
ansible-playbook $@ --extra-vars @/etc/ansible/vars.yml --become ./cluster.yml || ansible-playbook $@ --extra-vars @/etc/ansible/vars.yml --become ./cluster.yml
18+
ansible-playbook --extra-vars @/etc/ansible/vars.yml --become $@ /root/.ansible/playbooks/kubespray-prep.yml || exit 1
19+
ansible-playbook --extra-vars @/etc/ansible/vars.yml --become $@ ./cluster.yml || ansible-playbook $@ --extra-vars @/etc/ansible/vars.yml --become ./cluster.yml
2020

2121
cat /etc/ansible/artifacts/admin.conf > /root/.kube/config
2222
kubectl scale deployment --replicas=0 dns-autoscaler --namespace=kube-system
@@ -26,4 +26,4 @@ kubectl apply -f /root/patch/multus-daemonset.yml
2626
sleep 7
2727
kubectl apply -f /root/patch/multus-daemonset.yml || kubectl apply -f /root/patch/multus-daemonset.yml
2828
cat /etc/ansible/artifacts/admin.conf > /config
29-
kubectl get po -A
29+
kubectl get po -A

0 commit comments

Comments
 (0)