From 51a134d1e8ea659784e2bd9b5d8364ecf9eb0d0d Mon Sep 17 00:00:00 2001 From: Jimmy McCrory Date: Thu, 22 Sep 2016 16:04:52 -0700 Subject: [PATCH] Remove use of venv_enabled variables 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 --- playbooks/os-cinder-install.yml | 3 +-- playbooks/os-glance-install.yml | 3 +-- playbooks/os-nova-install.yml | 3 +-- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/playbooks/os-cinder-install.yml b/playbooks/os-cinder-install.yml index 3f792b6827..7df682214c 100644 --- a/playbooks/os-cinder-install.yml +++ b/playbooks/os-cinder-install.yml @@ -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" diff --git a/playbooks/os-glance-install.yml b/playbooks/os-glance-install.yml index 4e762507ac..66727751b5 100644 --- a/playbooks/os-glance-install.yml +++ b/playbooks/os-glance-install.yml @@ -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" diff --git a/playbooks/os-nova-install.yml b/playbooks/os-nova-install.yml index 1cb0d52e2c..8892895eef 100644 --- a/playbooks/os-nova-install.yml +++ b/playbooks/os-nova-install.yml @@ -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"