diff --git a/roles/mount-extra-volume/tasks/main.yaml b/roles/mount-extra-volume/tasks/main.yaml index 6d6b3348f8..f271bd9378 100644 --- a/roles/mount-extra-volume/tasks/main.yaml +++ b/roles/mount-extra-volume/tasks/main.yaml @@ -33,20 +33,4 @@ EXTRA_VOLUME_MOUNT_POINT: "{{ extra_volume.mount_point }}" EXTRA_VOLUME_SIZE: "{{ extra_volume.size }}" EXTRA_VOLUME_TYPE: "{{ extra_volume.type }}" - -- name: Print configured docker root path - debug: - msg: "Docker root_path: {{ docker.root_path }}" - -- name: Print configured containerd root path - debug: - msg: "containerd root_path: {{ containerd.root_path }}" - -- name: Create mountpoints - shell: | - sudo mkdir -pv "${DOCKER_ROOT_PATH}" - sudo mkdir -pv "${CONTAINERD_ROOT_PATH}" - environment: - DOCKER_ROOT_PATH: "{{ docker.root_path }}" - CONTAINERD_ROOT_PATH: "{{ containerd.root_path }}" ... diff --git a/roles/osh-run-script-set/defaults/main.yaml b/roles/osh-run-script-set/defaults/main.yaml index 8563883234..20896a4677 100644 --- a/roles/osh-run-script-set/defaults/main.yaml +++ b/roles/osh-run-script-set/defaults/main.yaml @@ -11,6 +11,8 @@ # limitations under the License. --- +ceph: + loopback_path: "/var/lib/openstack-helm" osh_params: container_distro_name: ubuntu container_distro_version: focal diff --git a/roles/osh-run-script-set/tasks/main.yaml b/roles/osh-run-script-set/tasks/main.yaml index 726f62cd8d..6ae8c6e2b2 100644 --- a/roles/osh-run-script-set/tasks/main.yaml +++ b/roles/osh-run-script-set/tasks/main.yaml @@ -23,6 +23,7 @@ args: chdir: "{{ zuul.project.src_dir }}/{{ gate_scripts_relative_path }}" environment: + CEPH_LOOPBACK_PATH: "{{ ceph.loopback_path }}" zuul_site_mirror_fqdn: "{{ zuul_site_mirror_fqdn }}" OSH_EXTRA_HELM_ARGS: "{{ zuul_osh_extra_helm_args_relative_path | default('') }}" OSH_PATH: "{{ zuul_osh_relative_path | default('../openstack-helm/') }}" diff --git a/roles/osh-run-script/defaults/main.yaml b/roles/osh-run-script/defaults/main.yaml index 8563883234..20896a4677 100644 --- a/roles/osh-run-script/defaults/main.yaml +++ b/roles/osh-run-script/defaults/main.yaml @@ -11,6 +11,8 @@ # limitations under the License. --- +ceph: + loopback_path: "/var/lib/openstack-helm" osh_params: container_distro_name: ubuntu container_distro_version: focal diff --git a/roles/osh-run-script/tasks/main.yaml b/roles/osh-run-script/tasks/main.yaml index 26c1d46d22..8789c7a073 100644 --- a/roles/osh-run-script/tasks/main.yaml +++ b/roles/osh-run-script/tasks/main.yaml @@ -20,6 +20,7 @@ args: chdir: "{{ zuul.project.src_dir }}/{{ gate_scripts_relative_path }}" environment: + CEPH_LOOPBACK_PATH: "{{ ceph.loopback_path }}" zuul_site_mirror_fqdn: "{{ zuul_site_mirror_fqdn }}" OSH_EXTRA_HELM_ARGS: "{{ zuul_osh_extra_helm_args_relative_path | default('') }}" OSH_PATH: "{{ zuul_osh_relative_path | default('../openstack-helm/') }}" diff --git a/tools/deployment/common/setup-ceph-loopback-device.sh b/tools/deployment/common/setup-ceph-loopback-device.sh index bc5810247f..d021aea033 100755 --- a/tools/deployment/common/setup-ceph-loopback-device.sh +++ b/tools/deployment/common/setup-ceph-loopback-device.sh @@ -2,13 +2,15 @@ set -ex +: ${CEPH_LOOPBACK_PATH:="/var/lib/openstack-helm"} + function setup_loopback_devices() { osd_data_device="$1" osd_wal_db_device="$2" namespace=${CEPH_NAMESPACE} - sudo mkdir -p /var/lib/openstack-helm/$namespace - sudo truncate -s 10G /var/lib/openstack-helm/$namespace/ceph-osd-data-loopbackfile.img - sudo truncate -s 8G /var/lib/openstack-helm/$namespace/ceph-osd-db-wal-loopbackfile.img + sudo mkdir -p ${CEPH_LOOPBACK_PATH}/$namespace + sudo truncate -s 10G ${CEPH_LOOPBACK_PATH}/$namespace/ceph-osd-data-loopbackfile.img + sudo truncate -s 8G ${CEPH_LOOPBACK_PATH}/$namespace/ceph-osd-db-wal-loopbackfile.img sudo -E bash -c "cat < /etc/systemd/system/loops-setup.service [Unit] Description=Setup loop devices @@ -20,8 +22,8 @@ Requires=systemd-udevd.service [Service] Type=oneshot -ExecStart=/sbin/losetup $osd_data_device '/var/lib/openstack-helm/$namespace/ceph-osd-data-loopbackfile.img' -ExecStart=/sbin/losetup $osd_wal_db_device '/var/lib/openstack-helm/$namespace/ceph-osd-db-wal-loopbackfile.img' +ExecStart=/sbin/losetup $osd_data_device '${CEPH_LOOPBACK_PATH}/$namespace/ceph-osd-data-loopbackfile.img' +ExecStart=/sbin/losetup $osd_wal_db_device '${CEPH_LOOPBACK_PATH}/$namespace/ceph-osd-db-wal-loopbackfile.img' ExecStop=/sbin/losetup -d $osd_data_device ExecStop=/sbin/losetup -d $osd_wal_db_device TimeoutSec=60 diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml index 00d53720e7..c38fbe1d7c 100644 --- a/zuul.d/jobs.yaml +++ b/zuul.d/jobs.yaml @@ -91,6 +91,8 @@ root_path: "/opt/ext_vol/docker" containerd: root_path: "/opt/ext_vol/containerd" + ceph: + loopback_path: "/opt/ext_vol/openstack-helm" # the k8s package versions are available here # https://packages.cloud.google.com/apt/dists/kubernetes-xenial/main/binary-amd64/Packages kube_version: "1.26.3-00"