Merge "Convert Docker*Image parameters"

deployment/barbican/barbican-api-container-puppet.yaml

@@ -4,16 +4,16 @@ description: >
   OpenStack containerized Barbican API service
 
 parameters:
-  DockerBarbicanApiImage:
+  ContainerBarbicanApiImage:
     description: image
     type: string
-  DockerBarbicanConfigImage:
+  ContainerBarbicanConfigImage:
     description: The container image to use for the barbican config_volume
     type: string
-  DockerBarbicanKeystoneListenerImage:
+  ContainerBarbicanKeystoneListenerImage:
     description: image
     type: string
-  DockerBarbicanWorkerImage:
+  ContainerBarbicanWorkerImage:
     description: image
     type: string
   EndpointMap:
@@ -281,7 +281,7 @@ outputs:
             - "\n"
             - - "include ::tripleo::profile::base::barbican::api"
               - {get_attr: [MySQLClient, role_data, step_config]}
-        config_image: {get_param: DockerBarbicanConfigImage}
+        config_image: {get_param: ContainerBarbicanConfigImage}
       kolla_config:
         /var/lib/kolla/config_files/barbican_api.json:
           command: /usr/sbin/httpd -DFOREGROUND
@@ -432,7 +432,7 @@ outputs:
           - if:
             - atos_hsm_enabled
             - barbican_init_atos_directory:
-                image: &barbican_api_image {get_param: DockerBarbicanApiImage}
+                image: &barbican_api_image {get_param: ContainerBarbicanApiImage}
                 user: root
                 volumes:
                   - /etc/proteccio:/etc/proteccio
@@ -681,7 +681,7 @@ outputs:
                   - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
             - barbican_keystone_listener:
                 start_order: 6
-                image: {get_param: DockerBarbicanKeystoneListenerImage}
+                image: {get_param: ContainerBarbicanKeystoneListenerImage}
                 net: host
                 privileged: false
                 restart: always
@@ -697,7 +697,7 @@ outputs:
                 environment: *kolla_env
             - barbican_worker:
                 start_order: 7
-                image: {get_param: DockerBarbicanWorkerImage}
+                image: {get_param: ContainerBarbicanWorkerImage}
                 net: host
                 privileged: false
                 restart: always