From 6b0f54c07ae8d0dd372f16684c863efa064079da Mon Sep 17 00:00:00 2001
From: Emilien Macchi <emilien@redhat.com>
Date: Thu, 6 Sep 2018 14:23:56 -0400
Subject: [PATCH] Introduce container_cli parameter for undercloud.conf

This parameter, default to 'docker' for now, can be changed to 'podman'
if we want to deploy an Undercloud with Podman instead of Docker.

blueprint podman-support

Change-Id: I8e83a3903f6c67087d4e18734a61661dbd597185
---
 tripleoclient/config/standalone.py                   | 4 ++++
 tripleoclient/tests/config/test_config_standalone.py | 2 ++
 tripleoclient/tests/config/test_config_undercloud.py | 2 ++
 tripleoclient/v1/undercloud_config.py                | 2 ++
 4 files changed, 10 insertions(+)

diff --git a/tripleoclient/config/standalone.py b/tripleoclient/config/standalone.py
index 51b989a06..103c8ab7e 100644
--- a/tripleoclient/config/standalone.py
+++ b/tripleoclient/config/standalone.py
@@ -188,6 +188,10 @@ class StandaloneConfig(BaseConfig):
                         help=_('Used to add custom insecure registries in '
                                '/etc/sysconfig/docker.')
                         ),
+            cfg.StrOpt('container_cli',
+                       default='docker',
+                       help=_('Container CLI used for deployment; '
+                              'Can be docker or podman.')),
         ]
         return self.sort_opts(_base_opts + _opts)
 
diff --git a/tripleoclient/tests/config/test_config_standalone.py b/tripleoclient/tests/config/test_config_standalone.py
index c1d9b54c5..5f7cdde7d 100644
--- a/tripleoclient/tests/config/test_config_standalone.py
+++ b/tripleoclient/tests/config/test_config_standalone.py
@@ -26,6 +26,7 @@ class TestStandaloneConfig(base.TestCase):
     def test_get_base_opts(self):
         ret = self.config.get_base_opts()
         expected = ['cleanup',
+                    'container_cli',
                     'container_images_file',
                     'custom_env_files',
                     'deployment_user',
@@ -84,6 +85,7 @@ class TestStandaloneConfig(base.TestCase):
     def test_get_opts(self):
         ret = self.config.get_opts()
         expected = ['cleanup',
+                    'container_cli',
                     'container_images_file',
                     'custom_env_files',
                     'deployment_user',
diff --git a/tripleoclient/tests/config/test_config_undercloud.py b/tripleoclient/tests/config/test_config_undercloud.py
index a0d7fedc9..6243675c5 100644
--- a/tripleoclient/tests/config/test_config_undercloud.py
+++ b/tripleoclient/tests/config/test_config_undercloud.py
@@ -29,6 +29,7 @@ class TestUndercloudConfig(base.TestCase):
                     'certificate_generation_ca',
                     'clean_nodes',
                     'cleanup',
+                    'container_cli',
                     'container_images_file',
                     'custom_env_files',
                     'deployment_user',
@@ -79,6 +80,7 @@ class TestUndercloudConfig(base.TestCase):
                     'certificate_generation_ca',
                     'clean_nodes',
                     'cleanup',
+                    'container_cli',
                     'container_images_file',
                     'custom_env_files',
                     'deployment_user',
diff --git a/tripleoclient/v1/undercloud_config.py b/tripleoclient/v1/undercloud_config.py
index c713aa995..43a62088e 100644
--- a/tripleoclient/v1/undercloud_config.py
+++ b/tripleoclient/v1/undercloud_config.py
@@ -321,6 +321,8 @@ def prepare_undercloud_deploy(upgrade=False, no_validations=False,
     env_data['DockerInsecureRegistryAddress'].extend(
         CONF['docker_insecure_registries'])
 
+    env_data['ContainerCli'] = CONF['container_cli']
+
     if CONF.get('docker_registry_mirror', None):
         env_data['DockerRegistryMirror'] = CONF['docker_registry_mirror']