Add aio host conf for barbican role

Adding this example conf file would guide user to set correct host
name in AIO case. An experimental test for barbican has been added
which uses the barbican tempest plugin.

Depends-On: https://review.openstack.org/596886
Depends-On: https://review.openstack.org/598210
Change-Id: I10a07d5e4b2b3fbf122a79f15e27a9ca34799221
(cherry picked from commit d65906c486)

ansible-role-requirements.yml

@@ -61,7 +61,7 @@
 - name: os_barbican
   scm: git
   src: https://git.openstack.org/openstack/openstack-ansible-os_barbican
-  version: c3ecdf093c9b21e1bbcafea3e2407cf1a62766bb
+  version: 0dbe12c8a4d5296c24edc1c85173fd1338db0cca
 - name: os_ceilometer
   scm: git
   src: https://git.openstack.org/openstack/openstack-ansible-os_ceilometer
@@ -105,7 +105,7 @@
 - name: os_neutron
   scm: git
   src: https://git.openstack.org/openstack/openstack-ansible-os_neutron
-  version: 337b86d0ad7efc52bdaa43ab6ca142193cfa7ad8
+  version: 017f9dde6a3735f72de6484b47f49f4c95d0e200
 - name: os_nova
   scm: git
   src: https://git.openstack.org/openstack/openstack-ansible-os_nova

etc/openstack_deploy/conf.d/barbican.yml.aio

@@ -0,0 +1,4 @@
+---
+key-manager_hosts:
+  aio1:
+    ip: 172.29.236.100

tests/roles/bootstrap-host/defaults/main.yml

@@ -56,6 +56,9 @@ bootstrap_user_variables_extra_templates:
   octavia:
     - src: user_variables_octavia.yml.j2
       dest: user_variables_octavia.yml
+  barbican:
+    - src: user_variables_barbican.yml.j2
+      dest: user_variables_barbican.yml
 
 ## Loopback volumes
 # Sparse loopback disks are used for the containers if there is no secondary

tests/roles/bootstrap-host/templates/user_variables_barbican.yml.j2

@@ -0,0 +1,22 @@
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+tempest_plugins:
+  - name: barbican-tempest-plugin
+    repo: https://git.openstack.org/openstack/barbican-tempest-plugin
+    branch: master
+
+tempest_test_whitelist:
+  - barbican_tempest_plugin.tests.api
+
+tempest_roles:
+  - key-manager:service-admin

tests/test_inventory.py

@@ -253,6 +253,7 @@ class TestAnsibleInventoryFormatConstraints(unittest.TestCase):
         'ironic-compute_hosts',
         'key-manager_containers',
         'key-manager_hosts',
+        'key-manager_all',
         'keystone',
         'keystone_all',
         'keystone_container',

tests/vars/bootstrap-aio-vars.yml

@@ -92,3 +92,7 @@ confd_overrides:
     - name: keystone.yml.aio
     - name: neutron.yml.aio
     - name: nova.yml.aio
+  barbican:
+    - name: haproxy.yml.aio
+    - name: keystone.yml.aio
+    - name: barbican.yml.aio

zuul.d/jobs.yaml

@@ -161,6 +161,13 @@
     vars:
       install_method: distro
 
+- job:
+    name: openstack-ansible-deploy-barbican-ubuntu-xenial
+    parent: openstack-ansible-deploy-aio_lxc-ubuntu-xenial
+    vars:
+      action: deploy
+      scenario: barbican
+
 # centos
 - job:
     name: openstack-ansible-deploy-aio_lxc-centos-7

zuul.d/project-templates.yaml

@@ -27,6 +27,7 @@
         - openstack-ansible-deploy-translations-ubuntu-xenial
     experimental:
       jobs:
+        - openstack-ansible-deploy-barbican-ubuntu-xenial
         - openstack-ansible-deploy-congress-ubuntu-xenial
         - openstack-ansible-deploy-octavia-ubuntu-xenial
         - openstack-ansible-deploy_with_ansible_devel-aio-ubuntu-xenial