From b9bb04063c4424182f7c8a293683e1376214ca27 Mon Sep 17 00:00:00 2001 From: Christian Berendt Date: Fri, 19 Jul 2024 18:11:26 +0200 Subject: [PATCH] Remove 330-openstack-services-additional.sh scripts (#2321) Signed-off-by: Christian Berendt --- scripts/deploy/310-openstack-services-extended.sh | 3 +++ scripts/deploy/330-openstack-services-additional.sh | 7 ------- scripts/upgrade/310-openstack-services-extended.sh | 3 +++ scripts/upgrade/330-openstack-services-additional.sh | 7 ------- 4 files changed, 6 insertions(+), 14 deletions(-) delete mode 100755 scripts/deploy/330-openstack-services-additional.sh delete mode 100755 scripts/upgrade/330-openstack-services-additional.sh diff --git a/scripts/deploy/310-openstack-services-extended.sh b/scripts/deploy/310-openstack-services-extended.sh index 2c5ab9a59..bd6436cb6 100755 --- a/scripts/deploy/310-openstack-services-extended.sh +++ b/scripts/deploy/310-openstack-services-extended.sh @@ -24,3 +24,6 @@ fi # if [[ $MANAGER_VERSION =~ ^7\.[0-9]\.[0-9]?$ || $MANAGER_VERSION == "latest" ]]; then # osism apply senlin # fi + +osism apply aodh +osism apply manila diff --git a/scripts/deploy/330-openstack-services-additional.sh b/scripts/deploy/330-openstack-services-additional.sh deleted file mode 100755 index bbcf54dc1..000000000 --- a/scripts/deploy/330-openstack-services-additional.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/usr/bin/env bash -set -e - -source /opt/configuration/scripts/include.sh - -osism apply aodh -osism apply manila diff --git a/scripts/upgrade/310-openstack-services-extended.sh b/scripts/upgrade/310-openstack-services-extended.sh index 0cc84f731..c3f22f678 100755 --- a/scripts/upgrade/310-openstack-services-extended.sh +++ b/scripts/upgrade/310-openstack-services-extended.sh @@ -20,3 +20,6 @@ fi # if [[ $MANAGER_VERSION =~ ^7\.[0-9]\.[0-9]?$ || $MANAGER_VERSION == "latest" ]]; then # osism apply -a upgrade senlin # fi + +osism apply -a upgrade aodh +osism apply -a upgrade manila diff --git a/scripts/upgrade/330-openstack-services-additional.sh b/scripts/upgrade/330-openstack-services-additional.sh deleted file mode 100755 index f9b5e7ea3..000000000 --- a/scripts/upgrade/330-openstack-services-additional.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/usr/bin/env bash -set -e - -source /opt/configuration/scripts/include.sh - -osism apply -a upgrade aodh -osism apply -a upgrade manila