diff --git a/defaults/main.yml b/defaults/main.yml
index da9d23cf..5c34181a 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -258,12 +258,12 @@ glance_services:
     execstarts: >-
        {{ glance_enable_v1_api | ternary(
           glance_bin ~ '/glance-api',
-          _glance_wsgi_bin ~ '/uwsgi --autoload --ini /etc/uwsgi/glance-api.ini')
+          glance_uwsgi_bin ~ '/uwsgi --autoload --ini /etc/uwsgi/glance-api.ini')
        }}
     execreloads: >-
        {{ glance_enable_v1_api | ternary(
           '/bin/kill -HUP $MAINPID',
-          _glance_wsgi_bin ~ '/uwsgi --reload /var/run/glance-api/glance-api.pid')
+          glance_uwsgi_bin ~ '/uwsgi --reload /var/run/glance-api/glance-api.pid')
        }}
   glance-registry:
     group: glance_registry
diff --git a/tasks/glance_install.yml b/tasks/glance_install.yml
index c4bca696..da2235fe 100644
--- a/tasks/glance_install.yml
+++ b/tasks/glance_install.yml
@@ -116,7 +116,8 @@
         (ansible_local is not defined) or
         ('openstack_ansible' not in ansible_local) or
         ('glance' not in ansible_local['openstack_ansible']) or
-        ('need_service_restart' not in ansible_local['openstack_ansible']['glance'])
+        ('need_service_restart' not in ansible_local['openstack_ansible']['glance']) or
+        ('install_method' not in ansible_local['openstack_ansible']['glance'])
 
 - name: Run the systemd service role
   include_role:
diff --git a/vars/distro_install.yml b/vars/distro_install.yml
index 13a4389b..44187d0c 100644
--- a/vars/distro_install.yml
+++ b/vars/distro_install.yml
@@ -13,8 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-glance_package_list: "{{ glance_distro_packages + glance_service_distro_packages }}"
+glance_package_list: "{{ glance_service_distro_packages }}"
 
 _glance_bin: "/usr/bin"
 _glance_etc: "/etc"
-_glance_wsgi_bin: "{{ glance_wsgi_bin }}"
diff --git a/vars/redhat-7.yml b/vars/redhat-7.yml
index 4febb90b..e45bbbf9 100644
--- a/vars/redhat-7.yml
+++ b/vars/redhat-7.yml
@@ -24,4 +24,4 @@ glance_service_distro_packages:
   - uwsgi
   - uwsgi-plugin-python
 
-glance_wsgi_bin: '/usr/sbin'
+glance_uwsgi_bin: '/usr/sbin'
diff --git a/vars/source_install.yml b/vars/source_install.yml
index d66521ba..6d908eae 100644
--- a/vars/source_install.yml
+++ b/vars/source_install.yml
@@ -17,4 +17,4 @@ glance_package_list: "{{ glance_distro_packages }}"
 
 _glance_bin: "/openstack/venvs/glance-{{ glance_venv_tag }}/bin"
 _glance_etc: "{{ _glance_bin | dirname + '/etc' }}"
-_glance_wsgi_bin: "{{ _glance_bin }}"
+glance_uwsgi_bin: "{{ _glance_bin }}"
diff --git a/vars/suse-42.yml b/vars/suse-42.yml
index ef254199..390489bb 100644
--- a/vars/suse-42.yml
+++ b/vars/suse-42.yml
@@ -26,4 +26,4 @@ glance_service_distro_packages:
   - uwsgi
   - uwsgi-python
 
-glance_wsgi_bin: '/usr/sbin'
+glance_uwsgi_bin: '/usr/sbin'
diff --git a/vars/ubuntu-16.04.yml b/vars/ubuntu-16.04.yml
index ebe0206b..139db395 100644
--- a/vars/ubuntu-16.04.yml
+++ b/vars/ubuntu-16.04.yml
@@ -29,4 +29,4 @@ glance_service_distro_packages:
   - uwsgi
   - uwsgi-plugin-python
 
-glance_wsgi_bin: '/usr/bin'
+glance_uwsgi_bin: '/usr/bin'
diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml
index 72b97fd1..60b2e752 100644
--- a/zuul.d/project.yaml
+++ b/zuul.d/project.yaml
@@ -25,7 +25,9 @@
         - openstack-ansible-v2_registry_enabled
         - openstack-ansible-glance-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: