Compare commits
3 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
53e3388873 | ||
|
|
c377bde924 | ||
| 853ae2b390 |
@@ -2,4 +2,4 @@
|
||||
host=review.opendev.org
|
||||
port=29418
|
||||
project=openstack/devstack-plugin-container.git
|
||||
defaultbranch=stable/zed
|
||||
defaultbranch=stable/yoga
|
||||
|
||||
@@ -78,8 +78,6 @@ function configure_crio {
|
||||
|
||||
# We're wrapping values in \"<val>\" because that's the format cri-o wants.
|
||||
iniset -sudo ${CRIO_CONF} crio.api listen \"${CRIO_ENGINE_SOCKET_FILE}\"
|
||||
iniset -sudo ${CRIO_CONF} crio.image pause_image \"${CRIO_PAUSE_IMAGE}\"
|
||||
iniset -sudo ${CRIO_CONF} crio.image pause_command \"${CRIO_PAUSE_COMMAND}\"
|
||||
if [[ "$ENABLE_DEBUG_LOG_LEVEL" == "True" ]]; then
|
||||
# debug is way too verbose, info will be enough
|
||||
iniset -sudo ${CRIO_CONF} crio.runtime log_level \"info\"
|
||||
|
||||
@@ -56,12 +56,9 @@ function install_docker {
|
||||
|
||||
local lsb_dist=${os_VENDOR,,}
|
||||
local dist_version=${os_CODENAME}
|
||||
if [[ "$lsb_dist" != "centosstream" ]]; then
|
||||
local arch
|
||||
arch=$(dpkg --print-architecture)
|
||||
fi
|
||||
local arch
|
||||
arch=$(dpkg --print-architecture)
|
||||
if is_ubuntu; then
|
||||
apt_get install apparmor
|
||||
if [[ ${dist_version} == 'trusty' ]]; then
|
||||
if uname -r | grep -q -- '-generic' && dpkg -l 'linux-image-*-generic' | grep -qE '^ii|^hi' 2>/dev/null; then
|
||||
apt_get install linux-image-extra-$(uname -r) linux-image-extra-virtual
|
||||
@@ -86,17 +83,6 @@ function install_docker {
|
||||
sudo yum-config-manager \
|
||||
--add-repo \
|
||||
https://download.docker.com/linux/centos/docker-ce.repo
|
||||
elif [[ "$lsb_dist" = "centosstream" ]]; then
|
||||
sudo yum-config-manager \
|
||||
--add-repo \
|
||||
https://download.docker.com/linux/centos/docker-ce.repo
|
||||
sudo yum-config-manager \
|
||||
--add-repo \
|
||||
https://packages.cloud.google.com/yum/repos/kubernetes-el7-x86_64 #noqa
|
||||
sudo yum-config-manager \
|
||||
--enable \
|
||||
packages.cloud.google.com_yum_repos_kubernetes-el7-x86_64
|
||||
sudo dnf -y install kubeadm --nogpgcheck
|
||||
elif [[ "$lsb_dist" = "fedora" ]]; then
|
||||
sudo dnf config-manager \
|
||||
--add-repo \
|
||||
|
||||
@@ -29,7 +29,3 @@ fi
|
||||
|
||||
# Customize kubeadm container images repository
|
||||
KUBEADMIN_IMAGE_REPOSITORY=${KUBEADMIN_IMAGE_REPOSITORY:-"k8s.gcr.io"}
|
||||
|
||||
# Configure crio pause image
|
||||
CRIO_PAUSE_IMAGE=${CRIO_PAUSE_IMAGE:-"k8s.gcr.io/pause:3.6"}
|
||||
CRIO_PAUSE_COMMAND=${CRIO_PAUSE_COMMAND:-"/pause"}
|
||||
|
||||
Reference in New Issue
Block a user