Revert "Add container engine authentication support"

Related-Bug: #1835657
This reverts commit 169f4ac837.

Change-Id: I8b77cce5bb6b40eb2cb27c0bdd2d95e9c1a0d227
This commit is contained in:
Emilien Macchi 2019-07-07 16:05:07 +00:00
parent 9a96723e07
commit ac5145c28d
3 changed files with 0 additions and 62 deletions

View File

@ -74,23 +74,6 @@ parameters:
description: Flag to disable docker reconfiguration during stack update.
tags:
- role_specific
ContainerImageRegistryLogin:
type: boolean
default: false
description: Flag to enable container registry login actions during the deployment.
Setting this to true will cause login calls to be performed during the
deployment.
ContainerImageRegistryCredentials:
type: json
hidden: true
default: {}
description: |
Mapping of image registry hosts to login credentials. Must be in the following example format
docker.io:
username: pa55word
'192.0.2.1:8787':
registry_username: password
SELinuxMode:
default: 'enforcing'
description: Configures SELinux mode
@ -160,15 +143,9 @@ outputs:
- selinux_enforcing
- true
- false
container_registry_login: {get_param: ContainerImageRegistryLogin}
container_registry_logins: {get_param: ContainerImageRegistryCredentials}
- include_role:
name: container-registry
tasks_from: docker
- include_role:
name: container-registry
tasks_from: docker-login
when: container_registry_login|bool
service_config_settings:
neutron_l3:
docker_additional_sockets: {get_param: DockerAdditionalSockets}

View File

@ -36,23 +36,6 @@ parameters:
default: {}
description: Parameters specific to the role
type: json
ContainerImageRegistryLogin:
type: boolean
default: false
description: Flag to enable container registry login actions during the deployment.
Setting this to true will cause login calls to be performed during the
deployment.
ContainerImageRegistryCredentials:
type: json
hidden: true
default: {}
description: |
Mapping of image registry hosts to login credentials. Must be in the following example format
docker.io:
username: pa55word
'192.0.2.1:8787':
registry_username: password
conditions:
insecure_registry_is_empty: {equals : [{get_param: DockerInsecureRegistryAddress}, []]}
@ -73,8 +56,6 @@ outputs:
- insecure_registry_is_empty
- []
- {get_param: DockerInsecureRegistryAddress}
container_registry_login: {get_param: ContainerImageRegistryLogin}
container_registry_logins: {get_param: ContainerImageRegistryCredentials}
- name: ensure podman and deps are installed
package:
name: podman
@ -95,16 +76,6 @@ outputs:
option: registries
value: "{{ container_registry_insecure_registries }}"
when: container_registry_insecure_registries | length > 0
- name: Perform container registry login(s)
shell: podman login --username=$REGISTRY_USERNAME --password=$REGISTRY_PASSWORD $REGISTRY
environment:
REGISTRY_USERNAME: "{{ lookup('dict', item.value).key }}"
REGISTRY_PASSWORD: "{{ lookup('dict', item.value).value }}"
REGISTRY: "{{ item.key }}"
loop: "{{ lookup('dict', container_registry_logins) }}"
when:
- container_registry_login | bool
- container_registry_logins | length > 0
service_config_settings: {}
upgrade_tasks:
- block:

View File

@ -1,10 +0,0 @@
---
features:
- |
`ContainerImageRegistryLogin` has been added to indicate if login calls
should be issued by the container engine on deployment. The default is
set to `false`.
- |
Values specified in `ContainerImageRegistryCredentials` will now be used to
issue a login call when deploying the container engine on the hosts if
`ContainerImageRegistryLogin` is set to `true`