Browse Source

Merge "Add tags always into external update tasks." into stable/stein

tags/10.6.1
Zuul 3 weeks ago
parent
commit
96443f9c47
1 changed files with 34 additions and 0 deletions
  1. 34
    0
      common/deploy-steps.j2

+ 34
- 0
common/deploy-steps.j2 View File

@@ -575,6 +575,16 @@ outputs:
575 575
           params:
576 576
             DEPLOY_SOURCE_HOST: {get_param: deployment_source_hosts}
577 577
             DEPLOY_TARGET_HOST: {get_param: deployment_target_hosts}
578
+            DEPLOY_IDENTIFIER: {get_param: DeployIdentifier}
579
+            BOOTSTRAP_SERVER_ID: {get_attr: [BootstrapServerId, value]}
580
+            ENABLE_DEBUG: {get_param: ConfigDebug}
581
+            ENABLE_PUPPET: {get_param: EnablePuppet}
582
+            DOCKER_PUPPET_DEBUG: {get_param: DockerPuppetDebug}
583
+            DOCKER_PUPPET_PROCESS_COUNT: {get_param: DockerPuppetProcessCount}
584
+            DOCKER_PUPPET_MOUNT_HOST_PUPPET: {get_param: DockerPuppetMountHostPuppet}
585
+            CONTAINER_CLI: {get_param: ContainerCli}
586
+            CONTAINER_LOG_STDOUT_PATH: {get_param: ContainerLogStdoutPath}
587
+            CONTAINER_HEALTHCHECK_DISABLED: {get_param: ContainerHealthcheckDisabled}
578 588
           template: |
579 589
             - hosts: DEPLOY_SOURCE_HOST
580 590
               name: Gather facts from undercloud
@@ -602,11 +612,23 @@ outputs:
602 612
               gather_facts: {{ '"{{' }} gather_facts | default(false) {{ '}}"' }}
603 613
               any_errors_fatal: yes
604 614
               become: false
615
+              vars:
616
+                bootstrap_server_id: BOOTSTRAP_SERVER_ID
617
+                deploy_identifier: DEPLOY_IDENTIFIER
618
+                enable_debug: ENABLE_DEBUG
619
+                enable_puppet: ENABLE_PUPPET
620
+                container_cli: CONTAINER_CLI
621
+                container_log_stdout_path: CONTAINER_LOG_STDOUT_PATH
622
+                container_healthcheck_disabled: CONTAINER_HEALTHCHECK_DISABLED
623
+                docker_puppet_debug: DOCKER_PUPPET_DEBUG
624
+                docker_puppet_process_count: DOCKER_PUPPET_PROCESS_COUNT
625
+                docker_puppet_mount_host_puppet: DOCKER_PUPPET_MOUNT_HOST_PUPPET
605 626
               tasks:
606 627
                 - include_tasks: external_update_steps_tasks.yaml
607 628
                   with_sequence: start=0 end={{external_update_steps_max-1}}
608 629
                   loop_control:
609 630
                     loop_var: step
631
+                  tags: always
610 632
               tags:
611 633
                 - external
612 634
                 - external_update_steps
@@ -618,11 +640,23 @@ outputs:
618 640
               gather_facts: {{ '"{{' }} gather_facts | default(false) {{ '}}"' }}
619 641
               any_errors_fatal: yes
620 642
               become: false
643
+              vars:
644
+                bootstrap_server_id: BOOTSTRAP_SERVER_ID
645
+                deploy_identifier: DEPLOY_IDENTIFIER
646
+                enable_debug: ENABLE_DEBUG
647
+                enable_puppet: ENABLE_PUPPET
648
+                container_cli: CONTAINER_CLI
649
+                container_log_stdout_path: CONTAINER_LOG_STDOUT_PATH
650
+                container_healthcheck_disabled: CONTAINER_HEALTHCHECK_DISABLED
651
+                docker_puppet_debug: DOCKER_PUPPET_DEBUG
652
+                docker_puppet_process_count: DOCKER_PUPPET_PROCESS_COUNT
653
+                docker_puppet_mount_host_puppet: DOCKER_PUPPET_MOUNT_HOST_PUPPET
621 654
               tasks:
622 655
                 - include_tasks: external_deploy_steps_tasks.yaml
623 656
                   with_sequence: start=1 end={{deploy_steps_max-1}}
624 657
                   loop_control:
625 658
                     loop_var: step
659
+                  tags: always
626 660
               tags:
627 661
                 - external
628 662
                 - external_deploy_steps

Loading…
Cancel
Save