From 53ee8293cd09716b935ec14df942af253add01c7 Mon Sep 17 00:00:00 2001
From: Doug Szumski <doug@stackhpc.com>
Date: Wed, 26 Sep 2018 15:05:31 +0100
Subject: [PATCH] Support custom config for Barbican

Story: 2003880
Task: 26741
Change-Id: Ia200a5b0de42963643980bdfd3677e3fca833850
---
 ansible/roles/kolla-openstack/defaults/main.yml             | 6 ++++++
 ansible/roles/kolla-openstack/vars/main.yml                 | 5 +++++
 ...d_support_for_custom_barbican_conf-b94272d73d53aa87.yaml | 3 +++
 3 files changed, 14 insertions(+)
 create mode 100644 releasenotes/notes/add_support_for_custom_barbican_conf-b94272d73d53aa87.yaml

diff --git a/ansible/roles/kolla-openstack/defaults/main.yml b/ansible/roles/kolla-openstack/defaults/main.yml
index 2214ff240..ae90e4223 100644
--- a/ansible/roles/kolla-openstack/defaults/main.yml
+++ b/ansible/roles/kolla-openstack/defaults/main.yml
@@ -5,6 +5,12 @@ kolla_extra_config_path:
 # Directory where Kolla custom configuration files will be installed.
 kolla_node_custom_config_path: /etc/kolla/config
 
+###############################################################################
+# Barbican configuration.
+
+# Whether to enable Barbican.
+kolla_enable_barbican:
+
 ###############################################################################
 # ceph configuration.
 
diff --git a/ansible/roles/kolla-openstack/vars/main.yml b/ansible/roles/kolla-openstack/vars/main.yml
index 90516962a..953612747 100644
--- a/ansible/roles/kolla-openstack/vars/main.yml
+++ b/ansible/roles/kolla-openstack/vars/main.yml
@@ -9,6 +9,11 @@
 #         the destination, and will not be removed from the destination, even
 #         if disabled or unexpected.
 kolla_openstack_custom_config:
+  # Barbican.
+  - src: "{{ kolla_extra_config_path }}/barbican"
+    dest: "{{ kolla_node_custom_config_path }}/barbican"
+    patterns: "*"
+    enabled: "{{ kolla_enable_barbican }}"
   # Ceph.
   - src: "{{ kolla_extra_config_path }}/ceph"
     dest: "{{ kolla_node_custom_config_path }}/ceph"
diff --git a/releasenotes/notes/add_support_for_custom_barbican_conf-b94272d73d53aa87.yaml b/releasenotes/notes/add_support_for_custom_barbican_conf-b94272d73d53aa87.yaml
new file mode 100644
index 000000000..dc74d6ca9
--- /dev/null
+++ b/releasenotes/notes/add_support_for_custom_barbican_conf-b94272d73d53aa87.yaml
@@ -0,0 +1,3 @@
+---
+features:
+  - Adds support for custom Barbican configuration.