Use playbooks from collection for add-compute.sh

noonedeadpunk · noonedeadpunk · commit d7a3261d1f27 · 2025-07-22T21:01:58.000+02:00
This simplifies logic and removes necessity to know openstack-ansible
clone location

Change-Id: I44b1234e20fde3b835a5194ab5f3ed60121b19cc
Signed-off-by: Dmitriy Rabotyagov &lt;dmitriy@adria-cloud.com&gt;
diff --git a/scripts/add-compute.sh b/scripts/add-compute.sh
@@ -14,7 +14,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-export OSA_REPO_PATH=${OSA_REPO_PATH:-"/opt/openstack-ansible"}
 export OSA_CONFIG_DIR=${OSA_CONFIG_DIR:-"/etc/openstack_deploy"}
 export HOSTS=${1:-""}
 
@@ -37,10 +36,10 @@ function define_tasks {
         done
     fi
 
-    RUN_TASKS+=("${OSA_REPO_PATH}/playbooks/setup-hosts.yml --limit ${HOSTS}")
-    RUN_TASKS+=("${OSA_REPO_PATH}/playbooks/openstack-hosts-setup.yml -e openstack_hosts_group=nova_compute --tags openstack_hosts-file")
-    RUN_TASKS+=("${OSA_REPO_PATH}/playbooks/setup-openstack.yml --limit ${HOSTS}")
-    RUN_TASKS+=("${OSA_REPO_PATH}/playbooks/unbound-install.yml --tags unbound-config")
+    RUN_TASKS+=("openstack.osa.setup_hosts --limit ${HOSTS}")
+    RUN_TASKS+=("openstack.osa.openstack_hosts_setup -e openstack_hosts_group=nova_compute --tags openstack_hosts-file")
+    RUN_TASKS+=("openstack.osa.setup_openstack --limit ${HOSTS}")
+    RUN_TASKS+=("openstack.osa.unbound --tags unbound-config")
 
     if [[ ! -z ${POST_OSA_TASKS} ]]; then
         if [ "${BASH_VERSINFO[0]}" -ge 4 ] && [ "${BASH_VERSINFO[1]}" -ge 4 ]; then
@@ -82,9 +81,6 @@ function main {
     if [[ -z ${HOSTS} ]]; then
         echo "Hosts to setup are not provided"
         exit 1
-    elif [[ ! -d ${OSA_REPO_PATH} ]]; then
-        echo "OSA repo is not found: ${OSA_REPO_PATH}. Define OSA_REPO_PATH to set another directory"
-        exit 1
     fi
 
     define_tasks
