3 files changed, 26 insertions, 1 deletions
diff --git a/ansible/roles/barbican/tasks/config.yml b/ansible/roles/barbican/tasks/config.yml
index 9bbceb42b..638563473 100644
--- a/ansible/roles/barbican/tasks/config.yml
+++ b/ansible/roles/barbican/tasks/config.yml
@@ -5,7 +5,7 @@
     state: "directory"
     recurse: yes
   with_items:
-    - "barbican-api"
+    - "barbican-api/vassals"
     - "barbican-keystone-listener"
     - "barbican-worker"
 
@@ -18,6 +18,14 @@
     - "barbican-worker"
     - "barbican-keystone-listener"
 
+- name: Copying over barbican-api.ini
+  merge_configs:
+    sources:
+      - "{{ role_path }}/templates/barbican-api.ini.j2"
+      - "{{ node_custom_config }}/barbican-api/barbican-api.ini"
+      - "{{ node_custom_config }}/barbican-api/{{ inventory_hostname }}/barbican-api.ini"
+    dest: "{{ node_config_directory }}/barbican-api/vassals/barbican-api.ini"
+
 - name: Copying over barbican.conf
   merge_configs:
     vars:
diff --git a/ansible/roles/barbican/templates/barbican-api.ini.j2 b/ansible/roles/barbican/templates/barbican-api.ini.j2
new file mode 100644
index 000000000..3e1fc65bb
--- /dev/null
+++ b/ansible/roles/barbican/templates/barbican-api.ini.j2
@@ -0,0 +1,11 @@
+[uwsgi]
+socket = {{ hostvars[inventory_hostname]['ansible_' + api_interface]['ipv4']['address'] }}:{{ barbican_api_port }}
+protocol = http
+processes = {{ openstack_service_workers }}
+lazy = true
+vacuum = true
+no-default-app = true
+memory-report = true
+plugins = python
+paste = config:/etc/barbican/barbican-api-paste.ini
+add-header = Connection: close
diff --git a/ansible/roles/barbican/templates/barbican-api.json.j2 b/ansible/roles/barbican/templates/barbican-api.json.j2
index 2b022690d..843f46e65 100644
--- a/ansible/roles/barbican/templates/barbican-api.json.j2
+++ b/ansible/roles/barbican/templates/barbican-api.json.j2
@@ -6,6 +6,12 @@
             "dest": "/etc/barbican/barbican.conf",
             "owner": "barbican",
             "perm": "0600"
+        },
+        {
+            "source": "{{ container_config_directory }}/vassals/barbican-api.ini",
+            "dest": "/etc/barbican/vassals/barbican-api.ini",
+            "owner": "barbican",
+            "perm": "0600"
         }
     ]
 }