openstack/openstack-ansible
Code Issues Proposed changes

Fix skipping Ceph client linking

Browse Source 
When *_venv_enabled is set to False, the plays fail to set
openstack_service_venv_bin correctly (empty string) and instead
populate it with the venv path anyway.

Change-Id: I598d3c7d7261098d4b7a6cca00acdfcbb5dc066a
This commit is contained in:
Logan V 2016-07-08 10:28:28 -05:00
parent 363016aff6
commit 8fb6a3bb00
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
playbooks/os-cinder-install.yml
View File

@ -224,7 +224,7 @@
- role: "ceph_client"
cinder_venv_bin: "/openstack/venvs/cinder-{{ openstack_release }}/bin"
openstack_service_system_user: "{{ cinder_system_user_name }}"
openstack_service_venv_bin: "{{ cinder_venv_bin if cinder_venv_enabled|default(True) else None }}"
openstack_service_venv_bin: "{{ cinder_venv_bin if cinder_venv_enabled|default(True)|bool else None }}"
tags:
- "cinder-ceph-client"
- "ceph-client"

2
playbooks/os-glance-install.yml
View File

@ -158,7 +158,7 @@
- role: "ceph_client"
glance_venv_bin: "/openstack/venvs/glance-{{ openstack_release }}/bin"
openstack_service_system_user: "{{ glance_system_user_name }}"
openstack_service_venv_bin: "{{ glance_venv_bin if glance_venv_enabled|default(True) else None }}"
openstack_service_venv_bin: "{{ glance_venv_bin if glance_venv_enabled|default(True)|bool else None }}"
tags:
- "glance-ceph-client"
- "ceph-client"

2
playbooks/os-nova-install.yml
View File

@ -257,7 +257,7 @@
- role: "ceph_client"
nova_venv_bin: "/openstack/venvs/nova-{{ openstack_release }}/bin"
openstack_service_system_user: "{{ nova_system_user_name }}"
openstack_service_venv_bin: "{{ nova_venv_bin if nova_venv_enabled|default(True) else None }}"
openstack_service_venv_bin: "{{ nova_venv_bin if nova_venv_enabled|default(True)|bool else None }}"
tags:
- "nova-ceph-client"
- "ceph-client"