Merge "Update Barbican HSM ansible roles"

docker/services/barbican-api.yaml

@@ -101,12 +101,12 @@ parameters:
     default: 'internal_api'
   ThalesVars:
     default: {}
-    description: Hash of tripleo-barbican-thales variables used to
+    description: Hash of thales-hsm role variables used to
                  install Thales client software.
     type: json
   ATOSVars:
     default: {}
-    description: Hash of tripleo-barbican-atos variables used to
+    description: Hash of atos-hsm role variables used to
                  install ATOS client software.
     type: json
 
@@ -247,12 +247,13 @@ outputs:
                     - hosts: all
                       remote_user: "{{thales_rfs_user}}"
                       vars:
+                        thales_configure_rfs: true
                         thales_client_ips: "{{thales_client_ips}}"
                         thales_hsm_ip_address: "{{thales_hsm_ip_address}}"
                         thales_hsm_config_location: "{{thales_hsm_config_location}}"
                         thales_bootstrap_client_ip: "{{thales_bootstrap_client_ip}}"
                       roles:
-                        - tripleo-barbican-thales-rfs
+                        - thales-hsm
 
               - name: call ansible on rfs server
                 shell: ANSIBLE_HOST_KEY_CHECKING=False ansible-playbook -i "{{thales_rfs_inventory}}" --key-file "{{thales_rfs_keyfile}}" --ssh-extra-args "-o StrictHostKeyChecking=no" "{{thales_rfs_playbook}}"
@@ -281,9 +282,11 @@ outputs:
                              params:
                                $NETWORK: {get_param: ThalesHSMNetworkName}
                     - include_role:
-                        name: tripleo-barbican-thales
+                        name: thales-hsm
                       vars:
-                        {get_param: ThalesVars}
+                        map_merge:
+                          - thales_install_client: true
+                          - {get_param: ThalesVars}
               - null
           -
             if:
@@ -293,7 +296,7 @@ outputs:
                   when: step == '2'
                   block:
                   - include_role:
-                      name: tripleo-barbican-atos
+                      name: atos-hsm
                     vars:
                       {get_param: ATOSVars}
               - null