Merge "octavia: pass container cli to external deploy tasks"

deployment/octavia/octavia-deployment-config.j2.yaml

@@ -156,6 +156,12 @@ parameters:
     description: The project name for the keystone Octavia account.
     type: string
     default: 'service'
+  ContainerCli:
+    type: string
+    default: 'podman'
+    description: CLI tool used to manage containers.
+    constraints:
+      - allowed_values: ['docker', 'podman']
 
 resources:
 {% if not octavia_standalone %}
@@ -204,6 +210,7 @@ resources:
           os_auth_url: { get_param: [EndpointMap, KeystoneV3Public, uri] }
           octavia_local_tmpdir: "{{playbook_dir}}/octavia-ansible/local_dir"
           octavia_group_vars_dir: "{{playbook_dir}}/octavia-ansible/group_vars"
+          container_cli: { get_param: ContainerCli }
 
 outputs:
   role_data: