Browse Source

Merge "[TRAIN-ONLY] Be explicit when passing vars into deploy steps" into stable/train

changes/70/738170/1
Zuul 2 weeks ago
committed by Gerrit Code Review
parent
commit
22fc0c282f
5 changed files with 25 additions and 9 deletions
  1. +2
    -2
      common/deploy-steps-tasks-step-0.j2.yaml
  2. +2
    -2
      common/deploy-steps-tasks.yaml
  3. +17
    -1
      common/deploy-steps.j2
  4. +2
    -2
      common/generate-config-tasks.yaml
  5. +2
    -2
      common/host-container-puppet-tasks.yaml

+ 2
- 2
common/deploy-steps-tasks-step-0.j2.yaml View File

@@ -13,14 +13,14 @@
no_log: True
copy: src=docker_puppet_script.yaml dest=/var/lib/container-puppet/container-puppet.py force=yes mode=0600
when:
- enable_paunch|default(false)
- enable_paunch|bool
- name: Remove container-puppet.py if Paunch is disabled
no_log: True
file:
path: /var/lib/container-puppet/container-puppet.py
state: absent
when:
- not enable_paunch|default(false)
- not (enable_paunch|bool)
- name: Write container-puppet.sh
no_log: True
copy: src=container_puppet_script.yaml dest=/var/lib/container-puppet/container-puppet.sh force=yes mode=0755 setype=container_file_t


+ 2
- 2
common/deploy-steps-tasks.yaml View File

@@ -156,7 +156,7 @@
# 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: Per step starting of the containers using Paunch
when: enable_paunch|default(true)
when: enable_paunch|bool
block:
- name: Start containers for step {{ step }} using paunch
async: 3600
@@ -196,7 +196,7 @@
- container_startup_configs

- name: Per step starting of the containers using tripleo-ansible
when: not enable_paunch|default(true)
when: not (enable_paunch|bool)
environment:
TRIPLEO_MINOR_UPDATE: '{{ tripleo_minor_update | default(false) }}'
block:


+ 17
- 1
common/deploy-steps.j2 View File

@@ -484,6 +484,7 @@ outputs:
deploy_identifier: DEPLOY_IDENTIFIER
enable_debug: ENABLE_DEBUG
enable_puppet: ENABLE_PUPPET
enable_paunch: ENABLE_PAUNCH
container_cli: CONTAINER_CLI
container_log_stdout_path: CONTAINER_LOG_STDOUT_PATH
container_healthcheck_disabled: CONTAINER_HEALTHCHECK_DISABLED
@@ -642,6 +643,7 @@ outputs:
deploy_identifier: DEPLOY_IDENTIFIER
enable_debug: ENABLE_DEBUG
enable_puppet: ENABLE_PUPPET
enable_paunch: ENABLE_PAUNCH
container_cli: CONTAINER_CLI
container_log_stdout_path: CONTAINER_LOG_STDOUT_PATH
container_healthcheck_disabled: CONTAINER_HEALTHCHECK_DISABLED
@@ -673,6 +675,7 @@ outputs:
deploy_identifier: DEPLOY_IDENTIFIER
enable_debug: ENABLE_DEBUG
enable_puppet: ENABLE_PUPPET
enable_paunch: ENABLE_PAUNCH
container_cli: CONTAINER_CLI
container_log_stdout_path: CONTAINER_LOG_STDOUT_PATH
container_healthcheck_disabled: CONTAINER_HEALTHCHECK_DISABLED
@@ -704,6 +707,7 @@ outputs:
deploy_identifier: DEPLOY_IDENTIFIER
enable_debug: ENABLE_DEBUG
enable_puppet: ENABLE_PUPPET
enable_paunch: ENABLE_PAUNCH
container_cli: CONTAINER_CLI
container_log_stdout_path: CONTAINER_LOG_STDOUT_PATH
container_healthcheck_disabled: CONTAINER_HEALTHCHECK_DISABLED
@@ -749,6 +753,7 @@ outputs:
deploy_identifier: DEPLOY_IDENTIFIER
enable_debug: ENABLE_DEBUG
enable_puppet: ENABLE_PUPPET
enable_paunch: ENABLE_PAUNCH
container_cli: CONTAINER_CLI
container_log_stdout_path: CONTAINER_LOG_STDOUT_PATH
container_healthcheck_disabled: CONTAINER_HEALTHCHECK_DISABLED
@@ -784,6 +789,7 @@ outputs:
deploy_identifier: DEPLOY_IDENTIFIER
enable_debug: ENABLE_DEBUG
enable_puppet: ENABLE_PUPPET
enable_paunch: ENABLE_PAUNCH
container_cli: CONTAINER_CLI
container_log_stdout_path: CONTAINER_LOG_STDOUT_PATH
container_healthcheck_disabled: CONTAINER_HEALTHCHECK_DISABLED
@@ -839,6 +845,7 @@ outputs:
deploy_identifier: DEPLOY_IDENTIFIER
enable_debug: ENABLE_DEBUG
enable_puppet: ENABLE_PUPPET
enable_paunch: ENABLE_PAUNCH
container_cli: CONTAINER_CLI
container_log_stdout_path: CONTAINER_LOG_STDOUT_PATH
container_healthcheck_disabled: CONTAINER_HEALTHCHECK_DISABLED
@@ -884,6 +891,7 @@ outputs:
deploy_identifier: DEPLOY_IDENTIFIER
enable_debug: ENABLE_DEBUG
enable_puppet: ENABLE_PUPPET
enable_paunch: ENABLE_PAUNCH
container_cli: CONTAINER_CLI
container_log_stdout_path: CONTAINER_LOG_STDOUT_PATH
container_healthcheck_disabled: CONTAINER_HEALTHCHECK_DISABLED
@@ -940,6 +948,7 @@ outputs:
deploy_identifier: DEPLOY_IDENTIFIER
enable_debug: ENABLE_DEBUG
enable_puppet: ENABLE_PUPPET
enable_paunch: ENABLE_PAUNCH
container_cli: CONTAINER_CLI
container_log_stdout_path: CONTAINER_LOG_STDOUT_PATH
container_healthcheck_disabled: CONTAINER_HEALTHCHECK_DISABLED
@@ -968,6 +977,7 @@ outputs:
deploy_identifier: DEPLOY_IDENTIFIER
enable_debug: ENABLE_DEBUG
enable_puppet: ENABLE_PUPPET
enable_paunch: ENABLE_PAUNCH
container_cli: CONTAINER_CLI
container_log_stdout_path: CONTAINER_LOG_STDOUT_PATH
container_healthcheck_disabled: CONTAINER_HEALTHCHECK_DISABLED
@@ -1063,6 +1073,7 @@ outputs:
deploy_identifier: DEPLOY_IDENTIFIER
enable_debug: ENABLE_DEBUG
enable_puppet: ENABLE_PUPPET
enable_paunch: ENABLE_PAUNCH
container_cli: CONTAINER_CLI
container_log_stdout_path: CONTAINER_LOG_STDOUT_PATH
container_healthcheck_disabled: CONTAINER_HEALTHCHECK_DISABLED
@@ -1094,6 +1105,7 @@ outputs:
deploy_identifier: DEPLOY_IDENTIFIER
enable_debug: ENABLE_DEBUG
enable_puppet: ENABLE_PUPPET
enable_paunch: ENABLE_PAUNCH
container_cli: CONTAINER_CLI
container_log_stdout_path: CONTAINER_LOG_STDOUT_PATH
container_healthcheck_disabled: CONTAINER_HEALTHCHECK_DISABLED
@@ -1125,6 +1137,7 @@ outputs:
deploy_identifier: DEPLOY_IDENTIFIER
enable_debug: ENABLE_DEBUG
enable_puppet: ENABLE_PUPPET
enable_paunch: ENABLE_PAUNCH
container_cli: CONTAINER_CLI
container_log_stdout_path: CONTAINER_LOG_STDOUT_PATH
container_healthcheck_disabled: CONTAINER_HEALTHCHECK_DISABLED
@@ -1165,6 +1178,7 @@ outputs:
deploy_identifier: DEPLOY_IDENTIFIER
enable_debug: ENABLE_DEBUG
enable_puppet: ENABLE_PUPPET
enable_paunch: ENABLE_PAUNCH
container_cli: CONTAINER_CLI
container_log_stdout_path: CONTAINER_LOG_STDOUT_PATH
docker_puppet_debug: DOCKER_PUPPET_DEBUG
@@ -1203,6 +1217,8 @@ outputs:
template: |
- hosts: DEPLOY_TARGET_HOST
any_errors_fatal: yes
vars:
enable_paunch: ENABLE_PAUNCH
tasks:
- set_fact:
releases: {get_param: [FastForwardUpgradeReleases]}
@@ -1243,7 +1259,7 @@ outputs:
no_log: True
copy: src=docker_puppet_script.yaml dest=/var/lib/container-puppet/container-puppet.py force=yes mode=0600
when:
- enable_paunch|default(false)
- enable_paunch|bool
- name: Write container-puppet.sh
no_log: True
copy: src=container_puppet_script.yaml dest=/var/lib/container-puppet/container-puppet.sh force=yes mode=0755 setype=container_file_t


+ 2
- 2
common/generate-config-tasks.yaml View File

@@ -1,6 +1,6 @@
- name: Block for container-puppet tasks (generate config) during step 1 with paunch
when:
- enable_paunch|default(true)
- enable_paunch|bool
tags:
- container_config
block:
@@ -44,7 +44,7 @@

- name: Block for container-puppet tasks (generate config) during step {{ step }} with tripleo-ansible
when:
- not enable_paunch|default(true)
- not (enable_paunch|bool)
tags:
- container_config
block:


+ 2
- 2
common/host-container-puppet-tasks.yaml View File

@@ -10,7 +10,7 @@

- name: Block for container-puppet tasks (bootstrap tasks) for step {{ step }} with paunch
when:
- enable_paunch|default(true)
- enable_paunch|bool
tags:
- container_config_tasks
block:
@@ -53,7 +53,7 @@

- name: Block for container-puppet tasks (bootstrap tasks) for step {{ step }} with tripleo-ansible
when:
- not enable_paunch|default(true)
- not (enable_paunch|bool)
tags:
- container_config_tasks
block:


Loading…
Cancel
Save