x
/
fuel-ccp-installer
Code Issues Proposed changes

Merge "Split master/etcd from non-master deployment and raise forks"

This commit is contained in:
Jenkins 2016-10-27 20:09:27 +00:00 committed by Gerrit Code Review
parent b2f6e40e72 fa23319995
commit 8bdf587368
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
utils/jenkins/kargo_deploy.sh
View File

@ -137,6 +137,7 @@ function with_ansible {
retry_opt="--limit @${retryfile}"
fi
done
rm -f "$retryfile" || true
}
mkdir -p tmp logs
@ -312,6 +313,7 @@ fi
# Stop trapping pre-setup tasks
set +e
echo "Running pre-setup steps on nodes via ansible..."
with_ansible $ADMIN_WORKSPACE/utils/kargo/preinstall.yml -e "ansible_ssh_pass=${ADMIN_PASSWORD}"
@ -320,10 +322,18 @@ with_ansible $ADMIN_WORKSPACE/kargo/cluster.yml --tags preinstall
echo "Configuring DNS settings on nodes via ansible..."
# FIXME(bogdando) a hack to w/a https://github.com/kubespray/kargo/issues/452
with_ansible $ADMIN_WORKSPACE/kargo/cluster.yml --tags dnsmasq -e inventory_hostname=skip_k8s_part
with_ansible $ADMIN_WORKSPACE/kargo/cluster.yml --tags dnsmasq -e skip_dnsmasq=yes -e inventory-hostname=skip_k8s_part
echo "Deploying k8s via ansible..."
with_ansible $ADMIN_WORKSPACE/kargo/cluster.yml
echo "Deploying k8s masters/etcds first via ansible..."
with_ansible $ADMIN_WORKSPACE/kargo/cluster.yml --limit kube-master:etcd
# Only run non-master deployment if there are non-masters in inventory.
if admin_node_command ansible-playbook -i $ADMIN_WORKSPACE/inventory/inventory.cfg \
$ADMIN_WORKSPACE/kargo/cluster.yml --limit kube-node:!kube-master:!etcd \
--list-hosts &>/dev/null; then
echo "Deploying k8s non-masters via ansible..."
with_ansible $ADMIN_WORKSPACE/kargo/cluster.yml --limit kube-node:!kube-master:!etcd
fi
echo "Initial deploy succeeded. Proceeding with post-install tasks..."
with_ansible $ADMIN_WORKSPACE/utils/kargo/postinstall.yml