Support installing specific version of docker

Change-Id: I12015c28f6f8ffc125097a14514a6a90a20cf35b (cherry picked from commit f8e786f0d5)
Install apparmor tools also for Ubuntu Focal.
2023-06-12 02:29:44 +00:00 · 2023-03-13 16:33:38 +01:00 · 2022-09-28 10:52:34 +00:00 · 2022-03-28 09:00:53 +00:00 · 2022-03-22 12:39:51 +08:00 · 2022-03-20 11:54:26 +08:00
5 changed files with 25 additions and 3 deletions
--- a/.gitreview
+++ b/.gitreview
@@ -2,4 +2,4 @@
 host=review.opendev.org
 port=29418
 project=openstack/devstack-plugin-container.git
-defaultbranch=unmaintained/yoga
+defaultbranch=stable/zed
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -7,6 +7,7 @@
    timeout: 4200
    required-projects:
      - openstack/devstack
+      - openstack/devstack-gate
      - openstack/devstack-plugin-container
    vars:
      devstack_localrc:
@@ -24,6 +25,7 @@
    timeout: 7200
    required-projects:
      - openstack/devstack
+      - openstack/devstack-gate
      - openstack/devstack-plugin-container
    vars:
      devstack_services:
--- a/devstack/lib/crio
+++ b/devstack/lib/crio
@@ -78,6 +78,8 @@ 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\"
--- a/devstack/lib/docker
+++ b/devstack/lib/docker
@@ -56,9 +56,12 @@ function install_docker {

    local lsb_dist=${os_VENDOR,,}
    local dist_version=${os_CODENAME}
-    local arch
-    arch=$(dpkg --print-architecture)
+    if [[ "$lsb_dist" != "centosstream" ]]; then
+        local arch
+        arch=$(dpkg --print-architecture)
+    fi
    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
@@ -83,6 +86,17 @@ 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 \
--- a/devstack/settings
+++ b/devstack/settings
@@ -29,3 +29,7 @@ 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"}
Author	SHA1	Message	Date
Hongbin Lu	7fc56c721c	Support installing specific version of docker Change-Id: I12015c28f6f8ffc125097a14514a6a90a20cf35b (cherry picked from commit `f8e786f0d5`)	2023-06-12 02:29:44 +00:00
Roman Dobosz	c5a9212aa8	Install apparmor tools also for Ubuntu Focal. k8s gate is still on focal, so patch which unblock the apparmor for jammy does not affect it. Here is the fix for focal as well. Change-Id: I2a9bc69a59e7d6d21d61e79115d5a3c726c73ab0 (cherry picked from commit `bdc0b49ce3`)	2023-03-13 16:33:38 +01:00
OpenStack Release Bot	9c45195172	Update .gitreview for stable/zed Change-Id: I7661795d066dbfc7d733aeae07a720aefb708f30	2022-09-28 10:52:34 +00:00
Zuul	b323f5b71a	Merge "Docker and kubernetes package installation on CentosStream"	2022-03-28 09:00:53 +00:00
yangjianfeng	f935202d39	Support config pause image for crio In some places of which network environment was limited, ciro can't pull images from k8s.gcr.io. This patch add a variable `CRIO_PAUSE_IMAGE` in order to the developer who located in these places can set the ciro to pull pause container images from repository that they can access. The `CRIO_PAUSE_COMMAND` used to configure crio's `pause_command` (the pause container's bootstrap command), in order to the developer can use the special pause image the they customized. Change-Id: Ib0d4c42870d40ef583546758513a36b906c7663b	2022-03-22 12:39:51 +08:00
yangjianfeng	90b4089cda	Support config image repository for kubeadm In some places of which network environment was limited, kubeadm can't pull images from k8s.gcr.io. This patch add a variable `KUBEADMIN_IMAGE_REPOSITORY` in order to the developer who located in these places can set the kubeadm to pull container images from repository that they can access. Change-Id: I14aed50077ef0760635e575770fd2274cb759c53	2022-03-20 11:54:26 +08:00
Ashutosh	f09c5c9342	Docker and kubernetes package installation on CentosStream Change-Id: Icafab048c43c6591c6cdafb13f34ed1f40258f22	2022-03-04 04:36:29 +00:00