Add toggle to enable/disable Paunch for a deployment
Default is True for backward compatibility. For now, only Paunch is supported but there are some alternatives under development: I2f88caa8e1c230dfe846a8a0dd9f939b98992cd5 Change-Id: Iceff88c6f4710c8023541314ac08c1ea4100cee7
This commit is contained in:
parent
30bb654b1b
commit
474d3d3a55
@ -236,7 +236,7 @@
|
||||
# Note container-puppet.py generates the hashed-*.json file, which is a copy of
|
||||
# the *step_n.json with a hash of the generated external config added
|
||||
# This acts as a salt to enable restarting the container if config changes
|
||||
- name: Start containers for step {{ step }}
|
||||
- name: Start containers for step {{ step }} using paunch
|
||||
environment:
|
||||
TRIPLEO_MINOR_UPDATE: '{{ tripleo_minor_update | default(false) }}'
|
||||
paunch:
|
||||
@ -250,6 +250,7 @@
|
||||
debug: "{{ enable_debug | bool }}"
|
||||
register: outputs
|
||||
failed_when: false
|
||||
when: enable_paunch|default(true)
|
||||
tags:
|
||||
- container_startup_configs
|
||||
|
||||
@ -258,6 +259,7 @@
|
||||
var: outputs.stdout_lines | default([]) | union(outputs.stderr_lines | default([]))
|
||||
when: outputs.rc is defined
|
||||
failed_when: outputs.rc != 0
|
||||
when: enable_paunch|default(true)
|
||||
tags:
|
||||
- container_startup_configs
|
||||
|
||||
|
@ -66,6 +66,10 @@ parameters:
|
||||
default: true
|
||||
description: Whether to run the puppet (baremetal) deployment tasks.
|
||||
type: boolean
|
||||
EnablePaunch:
|
||||
default: true
|
||||
description: Whether to run paunch during container deployment tasks.
|
||||
type: boolean
|
||||
DockerPuppetDebug:
|
||||
type: boolean
|
||||
default: false
|
||||
@ -335,6 +339,7 @@ outputs:
|
||||
deploy_identifier: {get_param: DeployIdentifier}
|
||||
stack_update_type: {get_param: StackUpdateType}
|
||||
container_cli: {get_param: ContainerCli}
|
||||
enable_paunch: {get_param: EnablePaunch}
|
||||
enabled_services: {get_param: EnabledServices}
|
||||
control_virtual_ip: {get_param: ControlVirtualIP}
|
||||
enabled_networks: {get_param: EnabledNetworks}
|
||||
@ -382,6 +387,7 @@ outputs:
|
||||
DEPLOY_IDENTIFIER: {get_param: DeployIdentifier}
|
||||
ENABLE_DEBUG: {get_param: ConfigDebug}
|
||||
ENABLE_PUPPET: {get_param: EnablePuppet}
|
||||
ENABLE_PAUNCH: {get_param: EnablePaunch}
|
||||
CONTAINER_CLI: {get_param: ContainerCli}
|
||||
CONTAINER_LOG_STDOUT_PATH: {get_param: ContainerLogStdoutPath}
|
||||
CONTAINER_HEALTHCHECK_DISABLED: {get_param: ContainerHealthcheckDisabled}
|
||||
@ -877,6 +883,7 @@ outputs:
|
||||
BOOTSTRAP_SERVER_ID: {get_attr: [BootstrapServerId, value]}
|
||||
ENABLE_DEBUG: {get_param: ConfigDebug}
|
||||
ENABLE_PUPPET: {get_param: EnablePuppet}
|
||||
ENABLE_PAUNCH: {get_param: EnablePaunch}
|
||||
DOCKER_PUPPET_DEBUG: {get_param: DockerPuppetDebug}
|
||||
DOCKER_PUPPET_PROCESS_COUNT: {get_param: DockerPuppetProcessCount}
|
||||
DOCKER_PUPPET_MOUNT_HOST_PUPPET: {get_param: DockerPuppetMountHostPuppet}
|
||||
@ -967,6 +974,7 @@ outputs:
|
||||
BOOTSTRAP_SERVER_ID: {get_attr: [BootstrapServerId, value]}
|
||||
ENABLE_DEBUG: {get_param: ConfigDebug}
|
||||
ENABLE_PUPPET: {get_param: EnablePuppet}
|
||||
ENABLE_PAUNCH: {get_param: EnablePaunch}
|
||||
DOCKER_PUPPET_DEBUG: {get_param: DockerPuppetDebug}
|
||||
DOCKER_PUPPET_PROCESS_COUNT: {get_param: DockerPuppetProcessCount}
|
||||
DOCKER_PUPPET_MOUNT_HOST_PUPPET: {get_param: DockerPuppetMountHostPuppet}
|
||||
@ -1149,6 +1157,7 @@ outputs:
|
||||
DEPLOY_SOURCE_HOST: {get_param: deployment_source_hosts}
|
||||
DEPLOY_TARGET_HOST: {get_param: deployment_target_hosts}
|
||||
CONTAINER_CLI: {get_param: ContainerCli}
|
||||
ENABLE_PAUNCH: {get_param: EnablePaunch}
|
||||
CONTAINER_LOG_STDOUT_PATH: {get_param: ContainerLogStdoutPath}
|
||||
CONTAINER_HEALTHCHECK_DISABLED: {get_param: ContainerHealthcheckDisabled}
|
||||
DEPLOY_IDENTIFIER: {get_param: DeployIdentifier}
|
||||
@ -1247,6 +1256,7 @@ outputs:
|
||||
BOOTSTRAP_SERVER_ID: {get_attr: [BootstrapServerId, value]}
|
||||
ENABLE_DEBUG: {get_param: ConfigDebug}
|
||||
ENABLE_PUPPET: {get_param: EnablePuppet}
|
||||
ENABLE_PAUNCH: {get_param: EnablePaunch}
|
||||
DOCKER_PUPPET_DEBUG: {get_param: DockerPuppetDebug}
|
||||
DOCKER_PUPPET_PROCESS_COUNT: {get_param: DockerPuppetProcessCount}
|
||||
DOCKER_PUPPET_MOUNT_HOST_PUPPET: {get_param: DockerPuppetMountHostPuppet}
|
||||
@ -1279,6 +1289,7 @@ outputs:
|
||||
BOOTSTRAP_SERVER_ID: {get_attr: [BootstrapServerId, value]}
|
||||
ENABLE_DEBUG: {get_param: ConfigDebug}
|
||||
ENABLE_PUPPET: {get_param: EnablePuppet}
|
||||
ENABLE_PAUNCH: {get_param: EnablePaunch}
|
||||
DOCKER_PUPPET_DEBUG: {get_param: DockerPuppetDebug}
|
||||
DOCKER_PUPPET_PROCESS_COUNT: {get_param: DockerPuppetProcessCount}
|
||||
DOCKER_PUPPET_MOUNT_HOST_PUPPET: {get_param: DockerPuppetMountHostPuppet}
|
||||
@ -1406,6 +1417,7 @@ outputs:
|
||||
BOOTSTRAP_SERVER_ID: {get_attr: [BootstrapServerId, value]}
|
||||
ENABLE_DEBUG: {get_param: ConfigDebug}
|
||||
ENABLE_PUPPET: {get_param: EnablePuppet}
|
||||
ENABLE_PAUNCH: {get_param: EnablePaunch}
|
||||
DOCKER_PUPPET_DEBUG: {get_param: DockerPuppetDebug}
|
||||
DOCKER_PUPPET_PROCESS_COUNT: {get_param: DockerPuppetProcessCount}
|
||||
DOCKER_PUPPET_MOUNT_HOST_PUPPET: {get_param: DockerPuppetMountHostPuppet}
|
||||
|
Loading…
x
Reference in New Issue
Block a user