vars: Do not install build dependencies for distro installs

The glance_distro_packages contain packages which are build dependencies
to the 'PIP' ones so we don't need to install them when we are using the
Glance distribution packages. This also renames the '*glance_wsgi_bin'
to '*glance_uwsgi_bin' since it refers to the actual uwsgi package.
Finally, we add the missing 'install_method' conditional when recording
the local facts.

Implements: blueprint openstack-distribution-packages
Change-Id: I063a73ca7d50a0ad0bee57ccc42604802ab08220

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

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:

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 }}"

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'

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 }}"

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'

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'

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: