openstack/openstack-ansible
Code Issues Proposed changes

Remove use of venv_enabled variables

Browse Source 
Disabling the use of service venvs is no longer an option. Remove the
venv_enabled conditional from the cinder, glance, and nova playbooks.

Change-Id: I5020c9c515c56d24ba8282199586654080e92235
This commit is contained in:
Jimmy McCrory 2016-09-22 16:04:52 -07:00
parent 792dda93a6
commit 51a134d1e8
3 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -139,9 +139,8 @@
cinder_glance_host: "{{ internal_lb_vip_address }}"
cinder_glance_service_port: "{{ glance_service_port }}"
- 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)|bool else None }}"
openstack_service_venv_bin: "/openstack/venvs/cinder-{{ openstack_release }}/bin"
tags:
- ceph
- role: "rsyslog_client"

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

@ -72,9 +72,8 @@
tags:
- openrc
- 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)|bool else None }}"
openstack_service_venv_bin: "/openstack/venvs/glance-{{ openstack_release }}/bin"
tags:
- ceph
- role: "rsyslog_client"

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

@ -155,9 +155,8 @@
nova_venv_tag: "{{ openstack_release }}"
nova_venv_download_url: "{{ openstack_repo_url }}/venvs/{{ openstack_release }}/{{ ansible_distribution | lower }}/nova-{{ openstack_release }}-{{ ansible_architecture | lower }}.tgz"
- 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)|bool else None }}"
openstack_service_venv_bin: "/openstack/venvs/nova-{{ openstack_release }}/bin"
tags:
- ceph
- role: "openstack_openrc"