Merge "Validate the container_cli option"

releasenotes/notes/container_cli-803238248de9c60a.yaml

@@ -0,0 +1,5 @@
+---
+upgrade:
+  - |
+    The ``container_cli`` parameter no longer accepts ``docker``. Now only
+    ``podman`` is accepted as a valid value.

tripleoclient/config/standalone.py

@@ -124,8 +124,7 @@ class StandaloneConfig(BaseConfig):
             cfg.StrOpt('deployment_user',
                        help=_(
                            'User used to run openstack undercloud install '
-                           'command which will be used to add the user to the '
+                           'command.')
-                           'docker group, required to upload containers'),
                        ),
             cfg.StrOpt('hieradata_override',
                        default='',
@@ -217,7 +216,7 @@ class StandaloneConfig(BaseConfig):
                                'configuration and can be used to override '
                                'any derived values. This should be used '
                                'only by advanced users.')),
-            # docker config bits
+            # container config bits
             cfg.StrOpt('container_registry_mirror',
                        deprecated_name='docker_registry_mirror',
                        default='',
@@ -233,8 +232,9 @@ class StandaloneConfig(BaseConfig):
                         ),
             cfg.StrOpt('container_cli',
                        default='podman',
+                       choices=('podman',),
                        help=_('Container CLI used for deployment; '
-                              'Can be docker or podman.')),
+                              'Only podman is allowed.')),
             cfg.BoolOpt('container_healthcheck_disabled',
                         default=False,
                         help=_(

tripleoclient/v1/undercloud_config.py

@@ -522,12 +522,9 @@ def prepare_undercloud_deploy(upgrade=False, no_validations=True,
         env_data['DockerInsecureRegistryAddress'].append(
             CONF['undercloud_admin_host'])
     else:
-        env_data['DockerInsecureRegistryAddress'] = [
+        msg = ('Unsupported container_cli: %s' % CONF['container_cli'])
-            '%s:8787' % local_registry_name]
+        raise exceptions.InvalidConfiguration(msg)
-        env_data['DockerInsecureRegistryAddress'].append(
+
-            '%s:8787' % CONF['local_ip'].split('/')[0])
-        env_data['DockerInsecureRegistryAddress'].append(
-            '%s:8787' % CONF['undercloud_admin_host'])
     env_data['DockerInsecureRegistryAddress'].extend(
         CONF['container_insecure_registries'])