From 60351bc2b6c6dfb8fad7f3992da90ad3f306e8db Mon Sep 17 00:00:00 2001 From: Jimmy McCrory Date: Mon, 30 Jan 2017 17:42:18 -0800 Subject: [PATCH] Add group vars to enable integration with barbican Add group variables, 'nova_barbican_enabled' and 'cinder_barbican_enabled', that will be set dependent on the availability of barbican hosts within an environment and enable integration of barbican with nova and cinder. Change-Id: I52dd6dc5f83d2e1288f565c03c0337cf0ae00ace Depends-On: If9aaa19bff5be25c46df067387ef83ce81d14ca1 Depends-On: I61eddc831825a9274ff26caf62da44798336e99d --- playbooks/inventory/group_vars/all.yml | 2 ++ playbooks/inventory/group_vars/cinder_all.yml | 3 +++ 2 files changed, 5 insertions(+) diff --git a/playbooks/inventory/group_vars/all.yml b/playbooks/inventory/group_vars/all.yml index 0e1f9d4a8b..1233797b24 100644 --- a/playbooks/inventory/group_vars/all.yml +++ b/playbooks/inventory/group_vars/all.yml @@ -388,6 +388,8 @@ nova_rabbitmq_telemetry_host_group: "{{ nova_rabbitmq_host_group }}" nova_designate_enabled: "{{ (groups['designate_all'] is defined) and (groups['designate_all'] | length > 0) }}" # If there are any Ceilometer hosts in the environment, then enable its usage nova_ceilometer_enabled: "{{ (groups['ceilometer_all'] is defined) and (groups['ceilometer_all'] | length > 0) }}" +# If there are any Barbican hosts in the environment, then enable its usage +nova_barbican_enabled: "{{ (groups['barbican_all'] is defined) and (groups['barbican_all'] | length > 0) }}" ## Sahara #RPC diff --git a/playbooks/inventory/group_vars/cinder_all.yml b/playbooks/inventory/group_vars/cinder_all.yml index cb8a3002a6..3c690bfc8c 100644 --- a/playbooks/inventory/group_vars/cinder_all.yml +++ b/playbooks/inventory/group_vars/cinder_all.yml @@ -36,3 +36,6 @@ cinder_package_state: "{{ package_state }}" 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" + +# If there are any Barbican hosts in the environment, then enable its usage +cinder_barbican_enabled: "{{ (groups['barbican_all'] is defined) and (groups['barbican_all'] | length > 0) }}"