From 109bb65c3adba0fa2b43d10ed5a78768a198e99d Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Thu, 29 Feb 2024 17:06:51 +0900 Subject: [PATCH] Drop reference to dib-utils The dib-utils repository was retired when TripleO was retired. We decided to vendor the dib-run-parts script in os-refresh-config so we no longer need the separate tiny package for the dib-run-parts script. Depends-on: https://review.opendev.org/c/openstack/os-refresh-config/+/910574 Change-Id: Id35efa4b387bd0fa21c1d73a4fe59f88c197f500 --- .../templates/fragments/install_config_agent_pip.sh | 2 +- .../templates/fragments/install_config_agent_rdo.sh | 2 +- .../templates/fragments/install_config_agent_yum.sh | 2 +- .../boot-config/templates/install_config_agent_test_image.yaml | 2 +- hot/software-config/heat-container-agent/Dockerfile | 2 +- .../test-image/elements/heat-agent-pkg-requires/README.md | 3 +-- 6 files changed, 6 insertions(+), 7 deletions(-) diff --git a/hot/software-config/boot-config/templates/fragments/install_config_agent_pip.sh b/hot/software-config/boot-config/templates/fragments/install_config_agent_pip.sh index 1c1a849c..262cb73a 100644 --- a/hot/software-config/boot-config/templates/fragments/install_config_agent_pip.sh +++ b/hot/software-config/boot-config/templates/fragments/install_config_agent_pip.sh @@ -1,6 +1,6 @@ #!/bin/bash set -eux -pip install os-collect-config os-apply-config os-refresh-config dib-utils heat-cfntools +pip install os-collect-config os-apply-config os-refresh-config heat-cfntools cfn-create-aws-symlinks diff --git a/hot/software-config/boot-config/templates/fragments/install_config_agent_rdo.sh b/hot/software-config/boot-config/templates/fragments/install_config_agent_rdo.sh index bdec8b4c..3a907311 100644 --- a/hot/software-config/boot-config/templates/fragments/install_config_agent_rdo.sh +++ b/hot/software-config/boot-config/templates/fragments/install_config_agent_rdo.sh @@ -2,4 +2,4 @@ set -eux yum -y install https://www.rdoproject.org/repos/rdo-release.rpm -yum -y install python-zaqarclient os-collect-config os-apply-config os-refresh-config dib-utils +yum -y install python-zaqarclient os-collect-config os-apply-config os-refresh-config diff --git a/hot/software-config/boot-config/templates/fragments/install_config_agent_yum.sh b/hot/software-config/boot-config/templates/fragments/install_config_agent_yum.sh index dc76499e..29dd771b 100644 --- a/hot/software-config/boot-config/templates/fragments/install_config_agent_yum.sh +++ b/hot/software-config/boot-config/templates/fragments/install_config_agent_yum.sh @@ -1,4 +1,4 @@ #!/bin/bash set -eux -yum -y install os-collect-config os-apply-config os-refresh-config dib-utils +yum -y install os-collect-config os-apply-config os-refresh-config diff --git a/hot/software-config/boot-config/templates/install_config_agent_test_image.yaml b/hot/software-config/boot-config/templates/install_config_agent_test_image.yaml index 7fd7466b..d5ee3729 100644 --- a/hot/software-config/boot-config/templates/install_config_agent_test_image.yaml +++ b/hot/software-config/boot-config/templates/install_config_agent_test_image.yaml @@ -21,7 +21,7 @@ resources: pip freeze - pip install --index-url "$pip_mirror" --pre --no-deps os-collect-config os-apply-config os-refresh-config dib-utils heat-cfntools + pip install --index-url "$pip_mirror" --pre --no-deps os-collect-config os-apply-config os-refresh-config heat-cfntools pip freeze cfn-create-aws-symlinks --force diff --git a/hot/software-config/heat-container-agent/Dockerfile b/hot/software-config/heat-container-agent/Dockerfile index 92b60e01..a3f4060a 100644 --- a/hot/software-config/heat-container-agent/Dockerfile +++ b/hot/software-config/heat-container-agent/Dockerfile @@ -4,7 +4,7 @@ ENV container docker RUN dnf -y --setopt=tsflags=nodocs install \ findutils os-collect-config os-apply-config \ - os-refresh-config dib-utils python-pip python-docker-py \ + os-refresh-config python-pip python-docker-py \ python-yaml python-zaqarclient && \ dnf clean all diff --git a/hot/software-config/test-image/elements/heat-agent-pkg-requires/README.md b/hot/software-config/test-image/elements/heat-agent-pkg-requires/README.md index d254d6d9..5a288b72 100644 --- a/hot/software-config/test-image/elements/heat-agent-pkg-requires/README.md +++ b/hot/software-config/test-image/elements/heat-agent-pkg-requires/README.md @@ -6,5 +6,4 @@ heat agent tools - os-collect-config - os-apply-config - os-refresh-config -- dib-utils -- heat-cfntools \ No newline at end of file +- heat-cfntools