diff --git a/vars/redhat-7.yml b/vars/redhat-7.yml index 1545f188..bec91889 100644 --- a/vars/redhat-7.yml +++ b/vars/redhat-7.yml @@ -103,7 +103,4 @@ nova_compute_powervm_distro_packages: [] novalink_gpg_keys: [] -# Needed for nginx cleanup for O -> P upgrades. Remove in Q -nova_nginx_conf_path: "conf.d" - nova_uwsgi_bin: '/usr/sbin' diff --git a/vars/suse.yml b/vars/suse.yml index a24ee6c1..a8c15f52 100644 --- a/vars/suse.yml +++ b/vars/suse.yml @@ -111,7 +111,4 @@ nova_compute_powervm_distro_packages: [] novalink_gpg_keys: [] -# Needed for nginx cleanup for O -> P upgrades. Remove in Q -nova_nginx_conf_path: "conf.d" - nova_uwsgi_bin: '/usr/sbin' diff --git a/vars/ubuntu.yml b/vars/ubuntu.yml index 08399a9c..358740cf 100644 --- a/vars/ubuntu.yml +++ b/vars/ubuntu.yml @@ -149,7 +149,4 @@ novalink_gpg_keys: - url: "http://public.dhe.ibm.com/systems/virtualization/Novalink/debian/novalink-gpg-pub.key" state: "present" -# Needed for nginx cleanup for O -> P upgrades. Remove in Q -nova_nginx_conf_path: "sites-available" - nova_uwsgi_bin: '/usr/bin'