Merge "docker: wire SELinuxMode with Ansible vars"

This commit is contained in:
Zuul 2018-12-13 18:07:58 +00:00 committed by Gerrit Code Review
commit d34892be63
1 changed files with 12 additions and 0 deletions

View File

@ -74,6 +74,12 @@ parameters:
description: Flag to disable docker reconfiguration during stack update.
tags:
- role_specific
SELinuxMode:
default: 'enforcing'
description: Configures SELinux mode
type: string
constraints:
- allowed_values: [ 'enforcing', 'permissive', 'disabled' ]
parameter_groups:
- label: deprecated
description: |
@ -102,6 +108,7 @@ resources:
conditions:
insecure_registry_is_empty: {equals : [{get_param: DockerInsecureRegistryAddress}, []]}
service_debug_unset: {equals : [{get_param: DockerDebug}, '']}
selinux_enforcing: {equals : [{get_param: SELinuxMode}, 'enforcing']}
outputs:
role_data:
@ -131,6 +138,11 @@ outputs:
container_registry_mirror: {get_param: DockerRegistryMirror}
container_registry_network_options: {get_param: DockerNetworkOptions}
container_registry_skip_reconfiguration: {get_attr: [RoleParametersValue, value, DockerSkipUpdateReconfiguration]}
container_registry_selinux:
if:
- selinux_enforcing
- true
- false
- include_role:
name: container-registry
tasks_from: docker