Merge remote-tracking branch 'origin/main' into HEAD

docker/kayobe/Dockerfile

@@ -23,13 +23,20 @@ ENV container docker
 
 # CMD ["/usr/sbin/init"]
 
-RUN dnf update -y --nobest && \
+RUN dnf install epel-release -y && \
+    dnf update -y --nobest && \
     dnf install -y gcc git vim python3-pyyaml python3-virtualenv \
         libffi-devel sudo which openssh-server e2fsprogs rsync \
-        diffstat diffutils procps-ng debootstrap gdisk util-linux \
-        dosfstools bash-completion && \
+        diffstat diffutils debootstrap procps-ng gdisk util-linux \
+        dosfstools lvm2 kpartx systemd-udev bash-completion && \
     dnf clean all
 
+# Configure lvm not to use udev for device discovery. This allows you to use
+# lvm in docker.
+# https://serverfault.com/questions/802766/calling-lvcreate-from-inside-the-container-hangs
+RUN sed -i 's/# udev_rules = 1/udev_rules = 0/g' /etc/lvm/lvm.conf && \
+    sed  -i 's/# udev_sync = 1/udev_sync = 0/g' /etc/lvm/lvm.conf
+
 # Workaround: rsync: --sparse-block=1024: unknown option
 # Hoepfully they have fixed this issue before this old
 # package is removed.

pipeline

@@ -0,0 +1 @@
+scripts/

pipeline/infra-vm-host-configure.sh → scripts/infra-vm-host-configure.sh

@@ -9,10 +9,10 @@ source "${PARENT}/../functions"
 
 function main {
     kayobe_init
-    run_kayobe infra vm host configure
+    run_kayobe infra vm host configure "${@}"
     pull_request "${KAYOBE_AUTOMATION_CONTEXT_ENV_PATH}/src/kayobe-config"
 }
 
 if [[ "${BASH_SOURCE[0]}" == "${0}" ]]; then
-    main
+    main "${@:1}"
 fi

pipeline/infra-vm-host-package-update.sh → scripts/infra-vm-host-package-update.sh

@@ -13,9 +13,9 @@ function post_config_init {
 
 function main {
     kayobe_init
-    run_kayobe infra vm host package update --packages "$KAYOBE_AUTOMATION_PACKAGES"
+    run_kayobe infra vm host package update --packages "$KAYOBE_AUTOMATION_PACKAGES" "${@}"
 }
 
 if [[ "${BASH_SOURCE[0]}" == "${0}" ]]; then
-    main
+    main "${@:1}"
 fi

pipeline/infra-vm-provision.sh → scripts/infra-vm-provision.sh

@@ -9,10 +9,10 @@ source "${PARENT}/../functions"
 
 function main {
     kayobe_init
-    run_kayobe infra vm provision
+    run_kayobe infra vm provision "${@}"
     pull_request "${KAYOBE_AUTOMATION_CONTEXT_ENV_PATH}/src/kayobe-config"
 }
 
 if [[ "${BASH_SOURCE[0]}" == "${0}" ]]; then
-    main
+    main "${@:1}"
 fi

pipeline/infra-vm-service-deploy.sh → scripts/infra-vm-service-deploy.sh

@@ -9,10 +9,10 @@ source "${PARENT}/../functions"
 
 function main {
     kayobe_init
-    run_kayobe infra vm service deploy
+    run_kayobe infra vm service deploy "${@}"
     pull_request "${KAYOBE_AUTOMATION_CONTEXT_ENV_PATH}/src/kayobe-config"
 }
 
 if [[ "${BASH_SOURCE[0]}" == "${0}" ]]; then
-    main
+    main "${@:1}"
 fi

pipeline/network-connectivity-check.sh → scripts/network-connectivity-check.sh

@@ -9,10 +9,10 @@ source "${PARENT}/../functions"
 
 function main {
     kayobe_init
-    run_kayobe network connectivity check
+    run_kayobe network connectivity check "${@}"
     pull_request "${KAYOBE_AUTOMATION_CONTEXT_ENV_PATH}/src/kayobe-config"
 }
 
 if [[ "${BASH_SOURCE[0]}" == "${0}" ]]; then
-    main
+    main "${@:1}"
 fi

pipeline/overcloud-container-image-build.sh → scripts/overcloud-container-image-build.sh

@@ -22,5 +22,5 @@ function main {
 }
 
 if [[ "${BASH_SOURCE[0]}" == "${0}" ]]; then
-    main "$@"
+    main "${@:1}"
 fi

scripts/overcloud-container-image-pull.sh

@@ -0,0 +1,17 @@
+#!/bin/bash
+
+set -euE
+set -o pipefail
+
+PARENT="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+
+source "${PARENT}/../functions"
+
+function main {
+    kayobe_init
+    run_kayobe overcloud container image pull "${@}"
+}
+
+if [[ "${BASH_SOURCE[0]}" == "${0}" ]]; then
+    main "${@:1}"
+fi

pipeline/overcloud-database-backup.sh → scripts/overcloud-database-backup.sh

@@ -9,9 +9,9 @@ source "${PARENT}/../functions"
 
 function main {
     kayobe_init
-    run_kayobe overcloud database backup
+    run_kayobe overcloud database backup "${@}"
 }
 
 if [[ "${BASH_SOURCE[0]}" == "${0}" ]]; then
-    main
+    main "${@:1}"
 fi

pipeline/overcloud-deployment-image-build.sh → scripts/overcloud-deployment-image-build.sh

@@ -9,10 +9,10 @@ source "${PARENT}/../functions"
 
 function main {
     kayobe_init
-    run_kayobe overcloud deployment image build --force-rebuild
+    run_kayobe overcloud deployment image build --force-rebuild "${@}"
     pull_request "${KAYOBE_AUTOMATION_ENV_KAYOBE_CONFIG_PATH}"
 }
 
 if [[ "${BASH_SOURCE[0]}" == "${0}" ]]; then
-    main
+    main "${@:1}"
 fi

scripts/overcloud-host-command-run.sh

@@ -0,0 +1,17 @@
+#!/bin/bash
+
+set -euE
+set -o pipefail
+
+PARENT="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+
+source "${PARENT}/../functions"
+
+function main {
+    kayobe_init
+    run_kayobe overcloud host command run "${@}"
+}
+
+if [[ "${BASH_SOURCE[0]}" == "${0}" ]]; then
+    main "${@:1}"
+fi

pipeline/overcloud-host-configure.sh → scripts/overcloud-host-configure.sh

@@ -9,10 +9,10 @@ source "${PARENT}/../functions"
 
 function main {
     kayobe_init
-    run_kayobe overcloud host configure
+    run_kayobe overcloud host configure "${@}"
     pull_request "${KAYOBE_AUTOMATION_CONTEXT_ENV_PATH}/src/kayobe-config"
 }
 
 if [[ "${BASH_SOURCE[0]}" == "${0}" ]]; then
-    main
+    main "${@:1}"
 fi

pipeline/overcloud-host-image-build.sh → scripts/overcloud-host-image-build.sh

@@ -9,10 +9,10 @@ source "${PARENT}/../functions"
 
 function main {
     kayobe_init
-    run_kayobe overcloud host image build
+    run_kayobe overcloud host image build "${@}"
     pull_request "${KAYOBE_AUTOMATION_CONTEXT_ENV_PATH}/src/kayobe-config"
 }
 
 if [[ "${BASH_SOURCE[0]}" == "${0}" ]]; then
-    main
+    main "${@:1}"
 fi

pipeline/overcloud-host-package-update.sh → scripts/overcloud-host-package-update.sh

@@ -13,9 +13,9 @@ function post_config_init {
 
 function main {
     kayobe_init
-    run_kayobe overcloud host package update --packages "$KAYOBE_AUTOMATION_PACKAGES"
+    run_kayobe overcloud host package update --packages "$KAYOBE_AUTOMATION_PACKAGES" "${@}"
 }
 
 if [[ "${BASH_SOURCE[0]}" == "${0}" ]]; then
-    main
+    main "${@:1}"
 fi

scripts/overcloud-host-upgrade.sh

@@ -0,0 +1,17 @@
+#!/bin/bash
+
+set -euE
+set -o pipefail
+
+PARENT="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+
+source "${PARENT}/../functions"
+
+function main {
+    kayobe_init
+    run_kayobe overcloud host upgrade "${@}"
+}
+
+if [[ "${BASH_SOURCE[0]}" == "${0}" ]]; then
+    main "${@:1}"
+fi

pipeline/overcloud-inventory-discover.sh → scripts/overcloud-inventory-discover.sh

@@ -9,10 +9,10 @@ source "${PARENT}/../functions"
 
 function main {
     kayobe_init
-    run_kayobe overcloud inventory discover
+    run_kayobe overcloud inventory discover "${@}"
     pull_request "${KAYOBE_AUTOMATION_CONTEXT_ENV_PATH}/src/kayobe-config"
 }
 
 if [[ "${BASH_SOURCE[0]}" == "${0}" ]]; then
-    main
+    main "${@:1}"
 fi

pipeline/overcloud-provision.sh → scripts/overcloud-provision.sh

@@ -9,10 +9,10 @@ source "${PARENT}/../functions"
 
 function main {
     kayobe_init
-    run_kayobe overcloud provision
+    run_kayobe overcloud provision "${@}"
     pull_request "${KAYOBE_AUTOMATION_CONTEXT_ENV_PATH}/src/kayobe-config"
 }
 
 if [[ "${BASH_SOURCE[0]}" == "${0}" ]]; then
-    main
+    main "${@:1}"
 fi

pipeline/overcloud-service-deploy.sh → scripts/overcloud-service-deploy.sh

@@ -13,7 +13,7 @@ function main {
     if [ "${KAYOBE_AUTOMATION_SKIP_PRECHECKS}" -ne 0 ]; then
         args+=("--skip-prechecks")
     fi
-    run_kayobe overcloud service deploy "${args[@]}"
+    run_kayobe overcloud service deploy "${args[@]}" "${@}"
     pull_request "${KAYOBE_AUTOMATION_CONTEXT_ENV_PATH}/src/kayobe-config"
 }
 

pipeline/overcloud-service-reconfigure.sh → scripts/overcloud-service-reconfigure.sh

@@ -13,7 +13,7 @@ function main {
     if [ "${KAYOBE_AUTOMATION_SKIP_PRECHECKS}" -ne 0 ]; then
         args+=("--skip-prechecks")
     fi
-    run_kayobe overcloud service reconfigure "${args[@]}"
+    run_kayobe overcloud service reconfigure "${args[@]}" "${@}"
     pull_request "${KAYOBE_AUTOMATION_CONTEXT_ENV_PATH}/src/kayobe-config"
 }
 

pipeline/overcloud-service-upgrade.sh → scripts/overcloud-service-upgrade.sh

@@ -13,7 +13,7 @@ function main {
     if [ "${KAYOBE_AUTOMATION_SKIP_PRECHECKS}" -ne 0 ]; then
         args+=("--skip-prechecks")
     fi
-    run_kayobe overcloud service upgrade "${args[@]}"
+    run_kayobe overcloud service upgrade "${args[@]}" "${@}"
     pull_request "${KAYOBE_AUTOMATION_CONTEXT_ENV_PATH}/src/kayobe-config"
 }
 

pipeline/physical-network-configure.sh → scripts/physical-network-configure.sh

@@ -9,10 +9,10 @@ source "${PARENT}/../functions"
 
 function main {
     kayobe_init
-    run_kayobe physical network configure
+    run_kayobe physical network configure "${@}"
     pull_request "${KAYOBE_AUTOMATION_CONTEXT_ENV_PATH}/src/kayobe-config"
 }
 
 if [[ "${BASH_SOURCE[0]}" == "${0}" ]]; then
-    main
+    main "${@:1}"
 fi

pipeline/playbook-run.sh → scripts/playbook-run.sh

@@ -15,19 +15,23 @@ function pull_request_branch_name {
 }
 
 function main {
-    log_info "Running custom playbook: $1"
+    playbook=$1
+    args=("${@:2}")
+    shift $#
+    log_info "Running custom playbook: $playbook"
+    log_debug "Playbook args: ${args[@]}"
     kayobe_init
     # Use eval so we can do something like: playbook-run.sh '$KAYOBE_CONFIG_PATH/ansible/test.yml'
     # NOTE: KAYOBE_CONFIG_PATH gets defined by kayobe_init
-    local PLAYBOOK_PATH="$(eval echo $1)"
+    local PLAYBOOK_PATH="$(eval echo $playbook)"
     if ! is_absolute_path "$PLAYBOOK_PATH"; then
         # Default to a path relative to repository root
         PLAYBOOK_PATH="$KAYOBE_CONFIG_PATH/../../$PLAYBOOK_PATH"
     fi
     if [ ! -f "$PLAYBOOK_PATH" ]; then
         die $LINENO "Playbook path does not exist: $PLAYBOOK_PATH"
     fi
-    run_kayobe playbook run "$PLAYBOOK_PATH"
+    run_kayobe playbook run "$PLAYBOOK_PATH" "${args[@]}"
     pull_request "${KAYOBE_AUTOMATION_CONTEXT_ENV_PATH}/src/kayobe-config"
 }
 
@@ -36,5 +40,5 @@ if [[ "${BASH_SOURCE[0]}" == "${0}" ]]; then
         die $LINENO "Error: You must provide a playbook to run" \
             "Usage: playbook-run.sh <playbook>"
     fi
-    main "$1"
+    main "${@:1}"
 fi

scripts/runbook-overcloud-deploy.sh

@@ -0,0 +1,17 @@
+#!/bin/bash
+
+set -euE
+set -o pipefail
+
+PARENT="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+
+source "${PARENT}/../functions"
+
+function main {
+    ${PARENT}/overcloud-host-configure.sh
+    ${PARENT}/overcloud-service-deploy.sh
+}
+
+if [[ "${BASH_SOURCE[0]}" == "${0}" ]]; then
+    main
+fi

scripts/runbook-overcloud-prepare-snapshot.sh

@@ -0,0 +1,17 @@
+#!/bin/bash
+
+set -euE
+set -o pipefail
+
+PARENT="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+
+source "${PARENT}/../functions"
+
+function main {
+    ${PARENT}/overcloud-host-command-run.sh -b --command 'dnf clean all'
+    ${PARENT}/overcloud-host-command-run.sh -b --command 'docker system prune -af'
+}
+
+if [[ "${BASH_SOURCE[0]}" == "${0}" ]]; then
+    main
+fi

scripts/runbook-overcloud-upgrade-staged.sh

@@ -0,0 +1,22 @@
+#!/bin/bash
+
+set -euE
+set -o pipefail
+
+PARENT="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+
+source "${PARENT}/../functions"
+
+function main {
+    ${PARENT}/overcloud-host-configure.sh
+    ${PARENT}/overcloud-host-upgrade.sh
+    # Avoid services that could break VM connectivity
+    ${PARENT}/overcloud-service-upgrade.sh –kolla-skip-tags neutron,nova
+    # Upgrade the rest
+    ${PARENT}/overcloud-service-upgrade.sh
+    ${PARENT}/overcloud-host-command-run.sh -b --command 'docker system prune -af'
+}
+
+if [[ "${BASH_SOURCE[0]}" == "${0}" ]]; then
+    main
+fi

scripts/runbook-overcloud-upgrade.sh

@@ -0,0 +1,19 @@
+#!/bin/bash
+
+set -euE
+set -o pipefail
+
+PARENT="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+
+source "${PARENT}/../functions"
+
+function main {
+    ${PARENT}/overcloud-host-configure.sh
+    ${PARENT}/overcloud-host-upgrade.sh
+    ${PARENT}/overcloud-service-upgrade.sh
+    ${PARENT}/overcloud-host-command-run.sh -b --command 'docker system prune -af'
+}
+
+if [[ "${BASH_SOURCE[0]}" == "${0}" ]]; then
+    main
+fi