Merge pull request #40 from antonym/barbican

Adds support for using Barbican

build.sh

@@ -62,6 +62,7 @@ ansible-playbook -vv \
                  -e enable_octavia=${ENABLE_OCTAVIA:-"true"} \
                  -e enable_sahara=${ENABLE_SAHARA:-"true"} \
                  -e enable_manila=${ENABLE_MANILA:-"true"} \
+                 -e enable_barbican=${ENABLE_BARBICAN:-"true"} \
                  -e ipxe_path_url=${IPXE_PATH_URL:-""} ${MNAIO_ANSIBLE_PARAMETERS} \
                  --force-handlers \
                  --flush-cache \

playbooks/deploy-osp.yml

@@ -200,6 +200,9 @@
         - src: "osp/{{ redhat_osp_version }}/overcloud/storage-environment.yaml.j2"
           dest: "/home/stack/templates/storage-environment.yaml"
           mode: "0644"
+        - src: "osp/{{ redhat_osp_version }}/overcloud/configure-barbican.yaml.j2"
+          dest: "/home/stack/templates/configure-barbican.yaml"
+          mode: "0644"
 
     - name: Introspect servers
       shell: |

playbooks/osp/13/overcloud/configure-barbican.yaml.j2

@@ -0,0 +1,4 @@
+# More params can be set here:
+# https://access.redhat.com/documentation/en-us/red_hat_openstack_platform/13/html/manage_secrets_with_openstack_key_manager/installing_barbican
+parameter_defaults:
+  BarbicanSimpleCryptoGlobalDefault: true

playbooks/osp/13/overcloud/overcloud-deploy.sh.j2

@@ -7,7 +7,6 @@ set -evx
 source /home/stack/stackrc
 openstack overcloud deploy --templates \
    -e /home/stack/templates/node-info.yaml \
-   -e /home/stack/templates/overcloud_images.yaml \
    -e /home/stack/templates/undercloud_ssl_camap.yaml \
 {% if redhat_overcloud_register | bool %}
    -e /home/stack/templates/rhel-registration/environment-rhel-registration.yaml \
@@ -31,6 +30,14 @@ openstack overcloud deploy --templates \
    -e /usr/share/openstack-tripleo-heat-templates/environments/manila-cephfsnative-config.yaml \
    -e /usr/share/openstack-tripleo-heat-templates/environments/services/ceph-mds.yaml \
    -e /home/stack/templates/manila-cephfsnative-config.yaml \
+{% endif %}
+{% if enable_barbican | bool %}
+   -e /usr/share/openstack-tripleo-heat-templates/environments/services/barbican.yaml \
+   -e /usr/share/openstack-tripleo-heat-templates/environments/barbican-backend-simple-crypto.yaml \
+   -e /home/stack/templates/configure-barbican.yaml \
+   -e /home/stack/templates/container-parameters-with-barbican.yaml \
+{% else %}
+   -e /home/stack/templates/overcloud_images.yaml \
 {% endif %}
    -e /usr/share/openstack-tripleo-heat-templates/environments/services-docker/neutron-ovn-ha.yaml \
    --ntp-server pool.ntp.org \

playbooks/osp/13/undercloud/undercloud_post_install_osp.sh.j2

@@ -42,15 +42,27 @@ openstack overcloud container image prepare \
   -e /usr/share/openstack-tripleo-heat-templates/environments/ceph-ansible/ceph-ansible.yaml \
   --set ceph_namespace=registry.access.redhat.com/rhceph \
   --set ceph_image=rhceph-3-rhel7 \
+{% endif %}
+{% if enable_barbican | bool %}
+  -e /usr/share/openstack-tripleo-heat-templates/environments/services/barbican.yaml \
+  -e /usr/share/openstack-tripleo-heat-templates/environments/barbican-backend-simple-crypto.yaml \
+  -e /home/stack/templates/configure-barbican.yaml \
+  --output-images-file /home/stack/container-images-with-barbican.yaml \
+  --output-env-file /home/stack/templates/container-parameters-with-barbican.yaml \
+{% else %}
+  --output-images-file /home/stack/local_registry_images.yaml \
+  --output-env-file /home/stack/templates/overcloud_images.yaml \
 {% endif %}
   -e /usr/share/openstack-tripleo-heat-templates/environments/services-docker/neutron-ovn-ha.yaml \
   --namespace=registry.access.redhat.com/rhosp13 \
   --push-destination=192.168.24.1:8787 \
   --prefix=openstack- \
-  --tag-from-label {version}-{release} \
-  --output-env-file=/home/stack/templates/overcloud_images.yaml \
-  --output-images-file /home/stack/local_registry_images.yaml
+  --tag-from-label {version}-{release}
 
 sudo openstack overcloud container image upload \
-  --config-file  /home/stack/local_registry_images.yaml \
+{% if enable_barbican | bool %}
+  --config-file /home/stack/container-images-with-barbican.yaml \
+{% else %}
+  --config-file /home/stack/local_registry_images.yaml \
+{% endif %}
   --verbose