From 955ce20d747eb159cd014e7ecc2a1c1ab01ebbd4 Mon Sep 17 00:00:00 2001 From: Mohammed Naser Date: Sat, 16 Jun 2018 21:41:44 -0400 Subject: [PATCH] Clean-up un-used variables which were used for clean-up Change-Id: I5875c3ca9785e881e289a437db25e7ae637696ee --- tasks/keystone_install.yml | 2 +- vars/redhat-7.yml | 7 ------- vars/suse-42.yml | 3 --- vars/ubuntu-16.04.yml | 7 ------- 4 files changed, 1 insertion(+), 18 deletions(-) diff --git a/tasks/keystone_install.yml b/tasks/keystone_install.yml index 0099e08e..876fec3d 100644 --- a/tasks/keystone_install.yml +++ b/tasks/keystone_install.yml @@ -77,7 +77,7 @@ - name: Remove other web server distro packages and mod_wsgi package: - name: "{{ ((keystone_web_server == 'nginx') | ternary(keystone_apache_distro_packages, keystone_nginx_distro_packages)) + keystone_mod_wsgi_distro_packages }}" + name: "{{ (keystone_web_server == 'nginx') | ternary(keystone_apache_distro_packages, keystone_nginx_distro_packages) }}" state: absent autoremove: "{{ (ansible_pkg_mgr == 'apt') | ternary('yes', omit) }}" diff --git a/vars/redhat-7.yml b/vars/redhat-7.yml index d6b95c60..adf744ec 100644 --- a/vars/redhat-7.yml +++ b/vars/redhat-7.yml @@ -41,13 +41,6 @@ keystone_apache_distro_packages: - mod_ssl - mod_proxy_uwsgi -# TODO(odyssey4me): -# We can remove this in R because we only need this to -# handle upgrades from O->P in order to remove the -# package when switching to the new configuration. -keystone_mod_wsgi_distro_packages: - - mod_wsgi - keystone_nginx_repo: http://nginx.org/packages/centos/7/$basearch/ keystone_nginx_gpg_key: http://nginx.org/keys/nginx_signing.key keystone_nginx_distro_packages: diff --git a/vars/suse-42.yml b/vars/suse-42.yml index d7d2f6fa..99fe70b6 100644 --- a/vars/suse-42.yml +++ b/vars/suse-42.yml @@ -40,9 +40,6 @@ keystone_apache_distro_packages: - apache2-utils - apache2-mod_proxy_uwsgi -keystone_mod_wsgi_distro_packages: - - apache2-mod_wsgi - keystone_mod_proxy_uwsgi_distro_packages: - apache2-mod_uwsgi diff --git a/vars/ubuntu-16.04.yml b/vars/ubuntu-16.04.yml index aecc3c4e..fcad02fe 100644 --- a/vars/ubuntu-16.04.yml +++ b/vars/ubuntu-16.04.yml @@ -40,13 +40,6 @@ keystone_apache_distro_packages: - apache2-utils - libapache2-mod-proxy-uwsgi -# TODO(odyssey4me): -# We can remove this in R because we only need this to -# handle upgrades from O->P in order to remove the -# package when switching to the new configuration. -keystone_mod_wsgi_distro_packages: - - libapache2-mod-wsgi - keystone_nginx_distro_packages: - nginx-full