From b515d895e1fc8abd910f01c65c9902154cbfaa88 Mon Sep 17 00:00:00 2001
From: Dmitriy Rabotyagov <dmitriy.rabotyagov@citynetwork.eu>
Date: Thu, 14 Apr 2022 11:24:34 +0200
Subject: [PATCH] Cleanup distro vars

Since we have introduced service_install_method variable across all
repos we can leverage it instead of defining dozen of other variables
for same purpose.

Depends-On: https://review.opendev.org/c/openstack/openstack-ansible-os_neutron/+/838729
Change-Id: Ie2e797de51a826b774e796a8e3fdc234e712f71b
---
 inventory/group_vars/all/all.yml      |  1 +
 playbooks/defaults/distro_install.yml | 44 +--------------------------
 2 files changed, 2 insertions(+), 43 deletions(-)

diff --git a/inventory/group_vars/all/all.yml b/inventory/group_vars/all/all.yml
index 787de21ecb..8954738f00 100644
--- a/inventory/group_vars/all/all.yml
+++ b/inventory/group_vars/all/all.yml
@@ -57,6 +57,7 @@ repo_server_port: 8181
 
 ## Default installation method for OpenStack services
 install_method: "source"
+service_install_method: "{{ install_method }}"
 
 ## DNS resolution (resolvconf) options
 #Group containing resolvers to configure
diff --git a/playbooks/defaults/distro_install.yml b/playbooks/defaults/distro_install.yml
index 1aee723dd1..1a449380b7 100644
--- a/playbooks/defaults/distro_install.yml
+++ b/playbooks/defaults/distro_install.yml
@@ -23,50 +23,8 @@
 # post deployment actions such as the playbooks/os-{cinder,keystone,nova}-install.yml
 # playbooks.
 #
-almanach_install_method: distro
-aodh_install_method: distro
-barbican_install_method: distro
-blazar_install_method: distro
-ceilometer_install_method: distro
-cinder_install_method: distro
-cinder_bin: /usr/bin
-cloudkitty_install_method: distro
-designate_install_method: distro
-glance_install_method: distro
-glance_bin: /usr/bin
-gnocchi_install_method: distro
-heat_install_method: distro
-horizon_install_method: distro
-ironic_install_method: distro
-karbor_install_method: distro
-keystone_install_method: distro
+
 keystone_bin: /usr/bin
-magnum_install_method: distro
-masakari_install_method: distro
-mistral_install_method: distro
-murano_install_method: distro
-monasca_install_method: distro
-monasca-agent_install_method: distro
-monasca-ui_install_method: distro
-neutron_install_method: distro
-neutron_bin: /usr/bin
-nova_install_method: distro
-nova_bin: /usr/bin
-octavia_install_method: distro
-octavia_bin: /usr/bin
-placement_install_method: distro
-rally_install_method: distro
-sahara_install_method: distro
-searchlight_install_method: distro
-senlin_install_method: distro
-swift_install_method: distro
-tacker_install_method: distro
-tempest_install_method: distro
-tempest_bin: /usr/bin
-trove_install_method: distro
-watcher_install_method: distro
-zaqar_install_method: distro
-zun_install_method: distro
 
 ## Delegate all database setup tasks to the utility host, and use the utility venv python interpreter
 openstack_db_setup_host: "{{ groups['utility_all'][0] }}"