Make Ansible's docker_install_role overridable.
Currently: - there is no easy way to change the way we install Docker from Net - if build-tools' default was to change, Net could break. This change addresses this situation.
This commit is contained in:
1 parent
90575278b0
commit
d2ebaf3ab7
1 file changed
+2
-1
@@ -26,6 +26,7 @@ NAME=${NAME:-"$(whoami | sed -e 's/[\.\_]*//g' | cut -c 1-4)"}
|
|||||||
PROVIDER=${PROVIDER:-gcp} # Provision using provided provider, or Google Cloud Platform by default.
|
PROVIDER=${PROVIDER:-gcp} # Provision using provided provider, or Google Cloud Platform by default.
|
||||||
NUM_HOSTS=${NUM_HOSTS:-3}
|
NUM_HOSTS=${NUM_HOSTS:-3}
|
||||||
PLAYBOOK=${PLAYBOOK:-setup_weave-net_test.yml}
|
PLAYBOOK=${PLAYBOOK:-setup_weave-net_test.yml}
|
||||||
|
PLAYBOOK_DOCKER_INSTALL_ROLE=${PLAYBOOK_DOCKER_INSTALL_ROLE:-docker-from-get.docker.com}
|
||||||
TESTS=${TESTS:-}
|
TESTS=${TESTS:-}
|
||||||
RUNNER_ARGS=${RUNNER_ARGS:-""}
|
RUNNER_ARGS=${RUNNER_ARGS:-""}
|
||||||
# Dependencies' versions:
|
# Dependencies' versions:
|
||||||
@@ -269,7 +270,7 @@ function provision() {
|
|||||||
function configure_with_ansible() {
|
function configure_with_ansible() {
|
||||||
ansible-playbook -u "$1" -i "$2" --private-key="$3" --forks="${4:-$NUM_HOSTS}" \
|
ansible-playbook -u "$1" -i "$2" --private-key="$3" --forks="${4:-$NUM_HOSTS}" \
|
||||||
--ssh-extra-args="-o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null" \
|
--ssh-extra-args="-o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null" \
|
||||||
--extra-vars "docker_version=$DOCKER_VERSION kubernetes_version=$KUBERNETES_VERSION kubernetes_cni_version=$KUBERNETES_CNI_VERSION" \
|
--extra-vars "docker_version=$DOCKER_VERSION kubernetes_version=$KUBERNETES_VERSION kubernetes_cni_version=$KUBERNETES_CNI_VERSION docker_install_role=$PLAYBOOK_DOCKER_INSTALL_ROLE" \
|
||||||
"$DIR/../tools/config_management/$PLAYBOOK"
|
"$DIR/../tools/config_management/$PLAYBOOK"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in new issue
Block a user