Merge "Switch ContainerCli to podman by default"

common/deploy-steps.j2

@@ -75,7 +75,7 @@ parameters:
     description: Number of concurrent processes to use when running container-puppet to generate config files.
   ContainerCli:
     type: string
-    default: 'docker'
+    default: 'podman'
     description: CLI tool used to manage containers.
     constraints:
       - allowed_values: ['docker', 'podman']

deployment/cinder/cinder-backup-pacemaker-puppet.yaml

@@ -59,7 +59,7 @@ parameters:
     type: number
   ContainerCli:
     type: string
-    default: 'docker'
+    default: 'podman'
     description: CLI tool used to manage containers.
     constraints:
       - allowed_values: ['docker', 'podman']

deployment/cinder/cinder-volume-pacemaker-puppet.yaml

@@ -47,7 +47,7 @@ parameters:
     type: number
   ContainerCli:
     type: string
-    default: 'docker'
+    default: 'podman'
     description: CLI tool used to manage containers.
     constraints:
       - allowed_values: ['docker', 'podman']

deployment/database/mysql-pacemaker-puppet.yaml

@@ -74,7 +74,7 @@ parameters:
     type: number
   ContainerCli:
     type: string
-    default: 'docker'
+    default: 'podman'
     description: CLI tool used to manage containers.
     constraints:
       - allowed_values: ['docker', 'podman']

deployment/database/redis-pacemaker-puppet.yaml

@@ -54,7 +54,7 @@ parameters:
     type: number
   ContainerCli:
     type: string
-    default: 'docker'
+    default: 'podman'
     description: CLI tool used to manage containers.
     constraints:
       - allowed_values: ['docker', 'podman']

deployment/deprecated/monitoring/sensu-client-container-puppet.yaml

@@ -70,7 +70,7 @@ parameters:
     default: 90
   ContainerCli:
     type: string
-    default: 'docker'
+    default: 'podman'
     description: CLI tool used to manage containers.
     constraints:
       - allowed_values: ['docker', 'podman']

deployment/haproxy/haproxy-pacemaker-puppet.yaml

@@ -89,7 +89,7 @@ parameters:
     type: number
   ContainerCli:
     type: string
-    default: 'docker'
+    default: 'podman'
     description: CLI tool used to manage containers.
     constraints:
       - allowed_values: ['docker', 'podman']

deployment/manila/manila-share-pacemaker-puppet.yaml

@@ -47,7 +47,7 @@ parameters:
     type: number
   ContainerCli:
     type: string
-    default: 'docker'
+    default: 'podman'
     description: CLI tool used to manage containers.
     constraints:
       - allowed_values: ['docker', 'podman']

deployment/mistral/mistral-executor-container-puppet.yaml

@@ -58,7 +58,7 @@ parameters:
     type: string
   ContainerCli:
     type: string
-    default: 'docker'
+    default: 'podman'
     description: CLI tool used to manage containers.
     constraints:
       - allowed_values: ['docker', 'podman']

deployment/neutron/neutron-dhcp-container-puppet.yaml

@@ -33,7 +33,7 @@ parameters:
     description: Controls debugging for the wrapper scripts.
   ContainerCli:
     type: string
-    default: 'docker'
+    default: 'podman'
     description: CLI tool used to manage containers.
     constraints:
       - allowed_values: ['docker', 'podman']

deployment/neutron/neutron-l3-container-puppet.yaml

@@ -50,7 +50,7 @@ parameters:
     description: Controls debugging for the wrapper scripts.
   ContainerCli:
     type: string
-    default: 'docker'
+    default: 'podman'
     description: CLI tool used to manage containers.
     constraints:
       - allowed_values: ['docker', 'podman']

deployment/nova/nova-libvirt-container-puppet.yaml

@@ -165,7 +165,7 @@ parameters:
 
   ContainerCli:
     type: string
-    default: 'docker'
+    default: 'podman'
     description: CLI tool used to manage containers.
     constraints:
       - allowed_values: ['docker', 'podman']

deployment/rabbitmq/rabbitmq-messaging-notify-pacemaker-puppet.yaml

@@ -51,7 +51,7 @@ parameters:
     type: number
   ContainerCli:
     type: string
-    default: 'docker'
+    default: 'podman'
     description: CLI tool used to manage containers.
     constraints:
       - allowed_values: ['docker', 'podman']

deployment/rabbitmq/rabbitmq-messaging-pacemaker-puppet.yaml

@@ -51,7 +51,7 @@ parameters:
     type: number
   ContainerCli:
     type: string
-    default: 'docker'
+    default: 'podman'
     description: CLI tool used to manage containers.
     constraints:
       - allowed_values: ['docker', 'podman']

deployment/rabbitmq/rabbitmq-messaging-rpc-pacemaker-puppet.yaml

@@ -51,7 +51,7 @@ parameters:
     type: number
   ContainerCli:
     type: string
-    default: 'docker'
+    default: 'podman'
     description: CLI tool used to manage containers.
     constraints:
       - allowed_values: ['docker', 'podman']

docker/services/ovn-metadata.yaml

@@ -29,7 +29,7 @@ parameters:
     description: Controls debugging for the wrapper scripts.
   ContainerCli:
     type: string
-    default: 'docker'
+    default: 'podman'
     description: CLI tool used to manage containers.
     constraints:
       - allowed_values: ['docker', 'podman']

docker/services/pacemaker/ovn-dbs.yaml

@@ -55,7 +55,7 @@ parameters:
     type: number
   ContainerCli:
     type: string
-    default: 'docker'
+    default: 'podman'
     description: CLI tool used to manage containers.
     constraints:
       - allowed_values: ['docker', 'podman']

puppet/all-nodes-config.j2.yaml

@@ -78,7 +78,7 @@ parameters:
 {%- endfor %}
   ContainerCli:
     type: string
-    default: 'docker'
+    default: 'podman'
     description: CLI tool used to manage containers.
     constraints:
       - allowed_values: ['docker', 'podman']

releasenotes/notes/container_cli-64a217e8abb508c4.yaml

@@ -0,0 +1,5 @@
+---
+features:
+  - |
+    Podman is now the default ContainerCli unless you deploy Pacemaker.
+    then you must run Docker when deploying on CentOS7.