x/stackube
Code Issues Proposed changes

Merge "Add multiple container runtime support."

Browse Source
This commit is contained in:
Jenkins 2017-08-01 05:10:08 +00:00 committed by Gerrit Code Review
commit c260194511
3 changed files with 30 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
devstack/local.conf.node.sample
View File

@ -1,4 +1,6 @@
[[local|localrc]] [[local|localrc]]
# Supported container runtimes: frakti, docker
CONTAINER_RUNTIME=frakti
# Set to local host's IP # Set to local host's IP
HOST_IP=10.0.0.3 HOST_IP=10.0.0.3
# Set to master node's IP # Set to master node's IP

2
devstack/local.conf.sample
View File

@ -1,4 +1,6 @@
[[local|localrc]] [[local|localrc]]
# Supported container runtimes: frakti, docker
CONTAINER_RUNTIME=frakti
ADMIN_PASSWORD=password ADMIN_PASSWORD=password
DATABASE_PASSWORD=$ADMIN_PASSWORD DATABASE_PASSWORD=$ADMIN_PASSWORD
RABBIT_PASSWORD=$ADMIN_PASSWORD RABBIT_PASSWORD=$ADMIN_PASSWORD

37
devstack/plugin.sh
View File

@ -124,7 +124,7 @@ gpgkey=https://packages.cloud.google.com/yum/doc/yum-key.gpg
EOF' EOF'
sudo setenforce 0 sudo setenforce 0
sudo sed -i 's/SELINUX=enforcing/SELINUX=disabled/g' /etc/selinux/config sudo sed -i 's/SELINUX=enforcing/SELINUX=disabled/g' /etc/selinux/config
sudo yum install -y kubernetes-cni kubelet kubeadm kubectl sudo yum install -y kubernetes-cni kubelet=1.7.0-0 kubeadm=1.7.0-0 kubectl=1.7.0-0
elif is_ubuntu; then elif is_ubuntu; then
sudo apt-get update && sudo apt-get install -y apt-transport-https sudo apt-get update && sudo apt-get install -y apt-transport-https
sudo curl -s https://packages.cloud.google.com/apt/doc/apt-key.gpg | sudo apt-key add - sudo curl -s https://packages.cloud.google.com/apt/doc/apt-key.gpg | sudo apt-key add -
@ -132,7 +132,7 @@ EOF'
deb http://apt.kubernetes.io/ kubernetes-xenial main deb http://apt.kubernetes.io/ kubernetes-xenial main
EOF' EOF'
sudo apt-get update sudo apt-get update
sudo apt-get install -y kubernetes-cni kubelet kubeadm kubectl sudo apt-get install -y kubernetes-cni kubelet=1.7.0-00 kubeadm=1.7.0-00 kubectl=1.7.0-00
else else
exit_distro_not_supported exit_distro_not_supported
fi fi
@ -157,8 +157,10 @@ function install_node {
} }
function configure_kubelet { function configure_kubelet {
sudo sed -i '2 i\Environment="KUBELET_EXTRA_ARGS=--container-runtime=remote --container-runtime-endpoint=/var/run/frakti.sock --feature-gates=AllAlpha=true"' /etc/systemd/system/kubelet.service.d/10-kubeadm.conf if [ "${CONTAINER_RUNTIME}" = "frakti" ]; then
sudo systemctl daemon-reload sudo sed -i '2 i\Environment="KUBELET_EXTRA_ARGS=--container-runtime=remote --container-runtime-endpoint=/var/run/frakti.sock --feature-gates=AllAlpha=true"' /etc/systemd/system/kubelet.service.d/10-kubeadm.conf
sudo systemctl daemon-reload
fi
} }
function remove_kubernetes { function remove_kubernetes {
@ -166,10 +168,14 @@ function remove_kubernetes {
sudo systemctl stop kubelet sudo systemctl stop kubelet
if is_fedora; then if is_fedora; then
sudo yum remove -y qemu-hyper hyperstart hyper-container libvirt if [ "${CONTAINER_RUNTIME}" = "frakti" ]; then
sudo yum remove -y qemu-hyper hyperstart hyper-container libvirt
fi
sudo yum remove -y kubernetes-cni kubelet kubeadm kubectl docker sudo yum remove -y kubernetes-cni kubelet kubeadm kubectl docker
elif is_ubuntu; then elif is_ubuntu; then
sudo apt-get remove -y hyperstart hyper-container qemu libvirt-bin if [ "${CONTAINER_RUNTIME}" = "frakti" ]; then
sudo apt-get remove -y hyperstart hyper-container qemu libvirt-bin
fi
sudo apt-get remove -y kubernetes-cni kubelet kubeadm kubectl docker sudo apt-get remove -y kubernetes-cni kubelet kubeadm kubectl docker
fi fi
@ -177,18 +183,27 @@ function remove_kubernetes {
} }
function install_stackube { function install_stackube {
if [ "${CONTAINER_RUNTIME}" != "frakti" ] && [ "${CONTAINER_RUNTIME}" != "docker" ]; then
echo "Container runtime ${CONTAINER_RUNTIME} not supported"
exit 1
fi
install_docker install_docker
install_hyper if [ "${CONTAINER_RUNTIME}" = "frakti" ]; then
install_frakti install_hyper
install_frakti
fi
install_kubelet install_kubelet
} }
function init_stackube { function init_stackube {
sudo systemctl daemon-reload sudo systemctl daemon-reload
sudo systemctl restart docker sudo systemctl restart docker
sudo systemctl restart libvirtd if [ "${CONTAINER_RUNTIME}" = "frakti" ]; then
sudo systemctl restart hyperd sudo systemctl restart libvirtd
sudo systemctl restart frakti sudo systemctl restart hyperd
sudo systemctl restart frakti
fi
if is_service_enabled kubernetes_master; then if is_service_enabled kubernetes_master; then
install_master install_master