diff --git a/defaults/main.yml b/defaults/main.yml
index 5efa86ae..399a44b7 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -307,7 +307,7 @@ cinder_services:
     wsgi_name: cinder-wsgi
     uwsgi_port: "{{ cinder_service_port }}"
     uwsgi_bind_address: "{{ cinder_uwsgi_bind_address }}"
-    program_override: "{{ _cinder_wsgi_bin }}/uwsgi --autoload --ini /etc/uwsgi/cinder-api.ini"
+    program_override: "{{ cinder_uwsgi_bin }}/uwsgi --autoload --ini /etc/uwsgi/cinder-api.ini"
     start_order: 4
 
 # Cinder uWSGI settings
diff --git a/tasks/cinder_install.yml b/tasks/cinder_install.yml
index e1f49e0e..da7e5cfd 100644
--- a/tasks/cinder_install.yml
+++ b/tasks/cinder_install.yml
@@ -32,8 +32,8 @@
   ini_file:
     dest: "/etc/ansible/facts.d/openstack_ansible.fact"
     section: cinder
-    option: "{{ item }}"
-    value: "True"
+    option: "{{ item.name }}"
+    value: "{{ item.state }}"
   with_items:
     - name: "need_online_data_migrations"
       state: "True"
@@ -49,4 +49,5 @@
         ('openstack_ansible' not in ansible_local) or
         ('cinder' not in ansible_local['openstack_ansible']) or
         ('need_online_data_migrations' not in ansible_local['openstack_ansible']['cinder']) or
-        ('need_service_restart' not in ansible_local['openstack_ansible']['cinder'])
+        ('need_service_restart' not in ansible_local['openstack_ansible']['cinder']) or
+        ('install_method' not in ansible_local['openstack_ansible']['cinder'])
diff --git a/vars/distro_install.yml b/vars/distro_install.yml
index f5fbb737..ba7de323 100644
--- a/vars/distro_install.yml
+++ b/vars/distro_install.yml
@@ -19,7 +19,7 @@
 # enabled.
 #
 cinder_package_list: |-
-  {% set packages = cinder_distro_packages %}
+  {% set packages = cinder_service_distro_packages %}
   {% if cinder_services['cinder-volume']['group'] in group_names %}
   {%   set _ = packages.extend(cinder_volume_distro_packages) %}
   {%   if cinder_backend_lvm_inuse | bool %}
@@ -29,8 +29,6 @@ cinder_package_list: |-
   {% if cinder_developer_mode | bool %}
   {%   set _ = packages.extend(cinder_developer_mode_distro_packages) %}
   {% endif %}
-  {% set _ = packages.extend(cinder_service_distro_packages) %}
   {{ packages }}
 
 _cinder_bin: "/usr/bin"
-_cinder_wsgi_bin: "{{ cinder_wsgi_bin }}"
diff --git a/vars/redhat-7.yml b/vars/redhat-7.yml
index a238935d..55bc2826 100644
--- a/vars/redhat-7.yml
+++ b/vars/redhat-7.yml
@@ -47,4 +47,4 @@ cinder_lvm_volume_distro_packages:
   - parted
   - scsi-target-utils
 
-cinder_wsgi_bin: '/usr/sbin'
+cinder_uwsgi_bin: '/usr/sbin'
diff --git a/vars/source_install.yml b/vars/source_install.yml
index 852bdbdf..35a1a45d 100644
--- a/vars/source_install.yml
+++ b/vars/source_install.yml
@@ -32,4 +32,4 @@ cinder_package_list: |-
   {{ packages }}
 
 _cinder_bin: "/openstack/venvs/cinder-{{ cinder_venv_tag }}/bin"
-_cinder_wsgi_bin: "{{ _cinder_bin }}"
+cinder_uwsgi_bin: "{{ _cinder_bin }}"
diff --git a/vars/suse-42.yml b/vars/suse-42.yml
index 5b45276f..922d3af9 100644
--- a/vars/suse-42.yml
+++ b/vars/suse-42.yml
@@ -52,4 +52,4 @@ cinder_lvm_volume_distro_packages:
   - parted
   - tgt
 
-cinder_wsgi_bin: '/usr/sbin'
+cinder_uwsgi_bin: '/usr/sbin'
diff --git a/vars/ubuntu-16.04.yml b/vars/ubuntu-16.04.yml
index f0012ac5..bcf4c763 100644
--- a/vars/ubuntu-16.04.yml
+++ b/vars/ubuntu-16.04.yml
@@ -58,4 +58,4 @@ cinder_lvm_volume_distro_packages:
   - tgt
   - thin-provisioning-tools
 
-cinder_wsgi_bin: '/usr/bin'
+cinder_uwsgi_bin: '/usr/bin'
diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml
index ac437179..cfc60958 100644
--- a/zuul.d/project.yaml
+++ b/zuul.d/project.yaml
@@ -22,7 +22,9 @@
         - openstack-ansible-upgrade-ubuntu-xenial
         - openstack-ansible-cinder-ssl-nv
         - openstack-ansible-functional-distro_install-ubuntu-xenial
-        - openstack-ansible-functional-distro_install-centos-7
+          # NOTE(hwoarang) Centos7 is having some troubles with repo dependencies
+          # so disabling until it's investigated.
+        - openstack-ansible-functional-distro_install-centos-7-nv
         - openstack-ansible-functional-distro_install-opensuse-423
     experimental:
       jobs: