Pass correct venv paths to ceph_client

ceph_client was hard coded to use openstack_release as the venv tag.
Now it builds the venv path the same way the roles do to ensure the
vars match and the rbd libs are deployed to the correct venv path.

Also removes an extraneous var in the Gnocchi playbook that was
being passed to ceph_client but not used in the role.

Change-Id: I0a7bfe48bd86b8d7bc8dc344ba851c9493b00920

playbooks/inventory/group_vars/cinder_all.yml

@@ -34,4 +34,5 @@ cinder_package_state: "{{ package_state }}"
 
 # venv fetch configuration
 cinder_venv_tag: "{{ venv_tag }}"
+cinder_bin: "/openstack/venvs/cinder-{{ cinder_venv_tag }}/bin"
 cinder_venv_download_url: "{{ venv_base_download_url }}/cinder-{{ openstack_release }}-{{ ansible_architecture | lower }}.tgz"

playbooks/inventory/group_vars/glance_all.yml

@@ -24,4 +24,5 @@ glance_package_state: "{{ package_state }}"
 
 # venv fetch configuration
 glance_venv_tag: "{{ venv_tag }}"
+glance_bin: "/openstack/venvs/glance-{{ glance_venv_tag }}/bin"
 glance_venv_download_url: "{{ venv_base_download_url }}/glance-{{ openstack_release }}-{{ ansible_architecture | lower }}.tgz"

playbooks/inventory/group_vars/nova_all.yml

@@ -24,4 +24,5 @@ nova_package_state: "{{ package_state }}"
 
 # venv fetch configuration
 nova_venv_tag: "{{ venv_tag }}"
+nova_bin: "/openstack/venvs/nova-{{ nova_venv_tag }}/bin"
 nova_venv_download_url: "{{ venv_base_download_url }}/nova-{{ openstack_release }}-{{ ansible_architecture | lower }}.tgz"

playbooks/os-cinder-install.yml

@@ -123,7 +123,7 @@
       cinder_storage_address: "{{ storage_address }}"
     - role: "ceph_client"
       openstack_service_system_user: "{{ cinder_system_user_name }}"
-      openstack_service_venv_bin: "/openstack/venvs/cinder-{{ openstack_release }}/bin"
+      openstack_service_venv_bin: "{{ cinder_bin }}"
       tags:
         - ceph
     - role: "rsyslog_client"

playbooks/os-glance-install.yml

@@ -75,7 +75,7 @@
         - openrc
     - role: "ceph_client"
       openstack_service_system_user: "{{ glance_system_user_name }}"
-      openstack_service_venv_bin: "/openstack/venvs/glance-{{ openstack_release }}/bin"
+      openstack_service_venv_bin: "{{ glance_bin }}"
       tags:
         - ceph
     - role: "rsyslog_client"

playbooks/os-gnocchi-install.yml

@@ -46,7 +46,6 @@
     - include: common-tasks/package-cache-proxy.yml
   roles:
     - role: "ceph_client"
-      gnocchi_venv_bin: "/openstack/venvs/gnocchi-{{ openstack_release }}/bin"
       openstack_service_system_user: "{{ gnocchi_system_user_name }}"
       openstack_service_venv_bin: ""
       tags:

playbooks/os-nova-install.yml

@@ -158,7 +158,7 @@
       nova_management_address: "{{ management_address }}"
     - role: "ceph_client"
       openstack_service_system_user: "{{ nova_system_user_name }}"
-      openstack_service_venv_bin: "/openstack/venvs/nova-{{ openstack_release }}/bin"
+      openstack_service_venv_bin: "{{ nova_bin }}"
       tags:
         - ceph
     - role: "openstack_openrc"