Merge "Conditionalize docker socket bind-mount"
This commit is contained in:
commit
d747625b82
|
@ -56,9 +56,16 @@ parameters:
|
||||||
default: ''
|
default: ''
|
||||||
description: Configuration file for Undercloud, needed by TripleO Validations.
|
description: Configuration file for Undercloud, needed by TripleO Validations.
|
||||||
type: string
|
type: string
|
||||||
|
ContainerCli:
|
||||||
|
type: string
|
||||||
|
default: 'docker'
|
||||||
|
description: CLI tool used to manage containers.
|
||||||
|
constraints:
|
||||||
|
- allowed_values: ['docker', 'podman']
|
||||||
|
|
||||||
conditions:
|
conditions:
|
||||||
undercloud_config_file_path_unset: {equals : [{get_param: UndercloudConfigFilePath}, '']}
|
undercloud_config_file_path_unset: {equals : [{get_param: UndercloudConfigFilePath}, '']}
|
||||||
|
docker_enabled: {equals: [{get_param: ContainerCli}, 'docker']}
|
||||||
|
|
||||||
resources:
|
resources:
|
||||||
|
|
||||||
|
@ -104,7 +111,12 @@ outputs:
|
||||||
- {get_attr: [MySQLClient, role_data, step_config]}
|
- {get_attr: [MySQLClient, role_data, step_config]}
|
||||||
config_image: {get_param: DockerMistralConfigImage}
|
config_image: {get_param: DockerMistralConfigImage}
|
||||||
volumes:
|
volumes:
|
||||||
- /var/run/docker.sock:/var/run/docker.sock:rw
|
list_concat:
|
||||||
|
-
|
||||||
|
if:
|
||||||
|
- docker_enabled
|
||||||
|
- - /var/run/docker.sock:/var/run/docker.sock:rw
|
||||||
|
- null
|
||||||
kolla_config:
|
kolla_config:
|
||||||
/var/lib/kolla/config_files/mistral_executor.json:
|
/var/lib/kolla/config_files/mistral_executor.json:
|
||||||
command: /usr/bin/mistral-server --config-file=/etc/mistral/mistral.conf --log-file=/var/log/mistral/executor.log --server=executor
|
command: /usr/bin/mistral-server --config-file=/etc/mistral/mistral.conf --log-file=/var/log/mistral/executor.log --server=executor
|
||||||
|
|
|
@ -68,7 +68,15 @@ parameters:
|
||||||
type: number
|
type: number
|
||||||
description: The number of seconds sensu-plugin-aware handlers should wait before taking second action.
|
description: The number of seconds sensu-plugin-aware handlers should wait before taking second action.
|
||||||
default: 90
|
default: 90
|
||||||
|
ContainerCli:
|
||||||
|
type: string
|
||||||
|
default: 'docker'
|
||||||
|
description: CLI tool used to manage containers.
|
||||||
|
constraints:
|
||||||
|
- allowed_values: ['docker', 'podman']
|
||||||
|
|
||||||
|
conditions:
|
||||||
|
docker_enabled: {equals: [{get_param: ContainerCli}, 'docker']}
|
||||||
|
|
||||||
resources:
|
resources:
|
||||||
ContainersCommon:
|
ContainersCommon:
|
||||||
|
@ -145,10 +153,13 @@ outputs:
|
||||||
list_concat:
|
list_concat:
|
||||||
- {get_attr: [ContainersCommon, volumes]}
|
- {get_attr: [ContainersCommon, volumes]}
|
||||||
-
|
-
|
||||||
- /var/run/docker.sock:/var/run/docker.sock:rw
|
if:
|
||||||
- /var/lib/kolla/config_files/sensu-client.json:/var/lib/kolla/config_files/config.json:ro
|
- docker_enabled
|
||||||
- /var/lib/config-data/puppet-generated/sensu/:/var/lib/kolla/config_files/src:ro
|
- - /var/run/docker.sock:/var/run/docker.sock:rw
|
||||||
- /var/log/containers/sensu:/var/log/sensu:rw
|
- null
|
||||||
|
- /var/lib/kolla/config_files/sensu-client.json:/var/lib/kolla/config_files/config.json:ro
|
||||||
|
- /var/lib/config-data/puppet-generated/sensu/:/var/lib/kolla/config_files/src:ro
|
||||||
|
- /var/log/containers/sensu:/var/log/sensu:rw
|
||||||
environment:
|
environment:
|
||||||
- KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
|
- KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
|
||||||
host_prep_tasks:
|
host_prep_tasks:
|
||||||
|
|
Loading…
Reference in New Issue