openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Merge "Change all step checks to |int"

This commit is contained in:
Zuul 2019-06-17 15:00:27 +00:00 committed by Gerrit Code Review
parent b136245f20 8c6bec227f
commit 00c4576491
19 changed files with 30 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
common/deploy-steps-tasks.yaml
View File

@ -26,7 +26,7 @@
- container_config_tasks
- name: Write config data at the start of step 1
when: step == "1"
when: step|int == 1
block:
- name: Create and ensure setype for /var/log/containers directory
file:
@ -439,7 +439,7 @@
MOUNT_HOST_PUPPET: '{{docker_puppet_mount_host_puppet | default(true)}}'
CONTAINER_LOG_STDOUT_PATH: "{{ container_log_stdout_path }}"
CONTAINER_HEALTHCHECK_DISABLED: "{{ container_healthcheck_disabled }}"
when: step == "1"
when: step|int == 1
changed_when: false
check_mode: no
register: outputs
@ -466,7 +466,7 @@
- container_config
check_mode: no
when:
- step == "1"
- step|int == 1
- ansible_check_mode|bool
- ansible_diff_mode
failed_when: false
@ -477,7 +477,7 @@
var: diff_results.stdout_lines
changed_when: diff_results.rc == 1
when:
- step == "1"
- step|int == 1
- ansible_check_mode|bool
- ansible_diff_mode
tags:

6
deployment/barbican/barbican-api-container-puppet.yaml
View File

@ -313,7 +313,7 @@ outputs:
- thales_hsm_enabled
-
- name: Add ip addresses to the RFS server
when: step == '2'
when: step|int == 2
block:
- name: get the ip addresses for the barbican nodes
set_fact:
@ -395,7 +395,7 @@ outputs:
- thales_hsm_enabled
-
- name: Thales client install
when: step == '2'
when: step|int == 2
block:
- set_fact:
my_thales_client_ip:
@ -416,7 +416,7 @@ outputs:
- atos_hsm_enabled
-
- name: ATOS client install
when: step == '2'
when: step|int == 2
block:
- include_role:
name: atos-hsm

4
deployment/ceph-ansible/ceph-base.yaml
View File

@ -395,7 +395,7 @@ outputs:
config_settings: {}
external_deploy_tasks:
- name: ceph_base_external_deploy_init
when: step == '1'
when: step|int == 1
tags: ceph
block:
- name: ensure ceph-ansible is installed
@ -497,7 +497,7 @@ outputs:
content: "{% raw %}{{nodes_data[machine_uuid.stdout|default('')]|default({})|to_nice_yaml}}{% endraw %}"
dest: "{{playbook_dir}}/ceph-ansible/host_vars/{% raw %}{{inventory_hostname}}{% endraw %}.yml"
- name: ceph_base_external_deploy_task
when: step == '2'
when: step|int == 2
tags: ceph
block:
- name: detect private key file

2
deployment/ceph-ansible/ceph-client.yaml
View File

@ -64,7 +64,7 @@ outputs:
list_concat:
- {get_attr: [CephBase, role_data, external_deploy_tasks]}
- - name: ceph_client_external_deploy_init
when: step == '1'
when: step|int == 1
tags: ceph
block:
- name: set ceph-ansible group vars clients

2
deployment/ceph-ansible/ceph-external.yaml
View File

@ -70,7 +70,7 @@ outputs:
list_concat:
- {get_attr: [CephBase, role_data, external_deploy_tasks]}
- - name: ceph_external_external_deploy_init
when: step == '1'
when: step|int == 1
tags: ceph
block:
- name: set ceph-ansible group vars clients

2
deployment/ceph-ansible/ceph-mds.yaml
View File

@ -90,7 +90,7 @@ outputs:
list_concat:
- {get_attr: [CephBase, role_data, external_deploy_tasks]}
- - name: ceph_mds_external_deploy_init
when: step == '1'
when: step|int == 1
tags: ceph
block:
- name: set ceph-ansible group vars mdss

2
deployment/ceph-ansible/ceph-mgr.yaml
View File

@ -65,7 +65,7 @@ outputs:
list_concat:
- {get_attr: [CephBase, role_data, external_deploy_tasks]}
- - name: ceph_mgr_external_deploy_init
when: step == '1'
when: step|int == 1
tags: ceph
block:
- name: set ceph-ansible group vars mgrs

2
deployment/ceph-ansible/ceph-mon.yaml
View File

@ -83,7 +83,7 @@ outputs:
list_concat:
- {get_attr: [CephBase, role_data, external_deploy_tasks]}
- - name: ceph_mon_external_deploy_init
when: step == '1'
when: step|int == 1
tags: ceph
block:
- name: set ceph-ansible group vars mons

4
deployment/ceph-ansible/ceph-nfs.yaml
View File

@ -78,7 +78,7 @@ outputs:
list_concat:
- {get_attr: [CephBase, role_data, external_deploy_tasks]}
- - name: ceph_nfs_external_deploy_init
when: step == '1'
when: step|int == 1
tags: ceph
block:
- name: set ceph-ansible group vars nfss
@ -97,4 +97,4 @@ outputs:
dport:
# We support only NFS 4.1 to start
- 2049
- {}
- {}

2
deployment/ceph-ansible/ceph-osd.yaml
View File

@ -76,7 +76,7 @@ outputs:
list_concat:
- {get_attr: [CephBase, role_data, external_deploy_tasks]}
- - name: ceph_osd_external_deploy_init
when: step == '1'
when: step|int == 1
tags: ceph
block:
- name: set ceph-ansible group vars osds

2
deployment/ceph-ansible/ceph-rbdmirror.yaml
View File

@ -92,7 +92,7 @@ outputs:
list_concat:
- {get_attr: [CephBase, role_data, external_deploy_tasks]}
- - name: ceph_rbdmirror_external_deploy_init
when: step == '1'
when: step|int == 1
tags: ceph
block:
- name: set ceph-ansible group vars rbdmirrors

2
deployment/ceph-ansible/ceph-rgw.yaml
View File

@ -79,7 +79,7 @@ outputs:
list_concat:
- {get_attr: [CephBase, role_data, external_deploy_tasks]}
- - name: ceph_rgw_external_deploy_init
when: step == '1'
when: step|int == 1
tags: ceph
block:
- name: set ceph-ansible group vars rgws

2
deployment/octavia/octavia-deployment-config.j2.yaml
View File

@ -247,7 +247,7 @@ outputs:
config_settings: {}
external_deploy_tasks:
- name: octavia_post_deploy
when: step == '5'
when: step|int == 5
block:
- name: Set up group_vars
set_fact:

2
extraconfig/pre_network/boot-params-service.yaml
View File

@ -70,7 +70,7 @@ outputs:
- if:
- is_host_config_required
- - name: Configure kernel args, tuned and reboot
when: step == 0
when: step|int == 0
vars:
_KERNEL_ARGS_: {get_param: [RoleParameters, KernelArgs]}
_TUNED_PROFILE_NAME_: {get_param: [RoleParameters, TunedProfileName]}

6
extraconfig/services/ipsec.yaml
View File

@ -82,7 +82,7 @@ outputs:
step_config: ''
external_deploy_tasks:
- name: IPSEC configuration on step 1
when: step == '1'
when: step|int == 1
block:
- name: Generate PSK
command: openssl rand -base64 48
@ -98,7 +98,7 @@ outputs:
- "{{ groups.ipsec }}"
deploy_steps_tasks:
- name: IPSEC configuration on step 1
when: step == '1'
when: step|int == 1
block:
- include_role:
name: tripleo-ipsec
@ -112,7 +112,7 @@ outputs:
# already before setting up the IPSEC tunnels. Hence we do this
# in step 3.
- name: IPSEC configuration on step 3
when: step == '3'
when: step|int == 3
block:
- include_role:
name: tripleo-ipsec

2
extraconfig/services/openshift-cns.yaml
View File

@ -86,7 +86,7 @@ outputs:
step_config: ''
external_deploy_tasks:
- name: openshift_cns step 2 Generate Inventory
when: step == '2'
when: step|int == 2
block:
- name: set openshift global vars fact

4
extraconfig/services/openshift-master.yaml
View File

@ -156,7 +156,7 @@ outputs:
list_concat:
- get_attr: [OpenShiftNode, role_data, external_deploy_tasks]
- - name: openshift_master step 1
when: step == '1'
when: step|int == 1
tags: openshift
become: true
block:
@ -177,7 +177,7 @@ outputs:
owner: "{{ ansible_user }}"
- name: openshift_master step 3
when: step == '3'
when: step|int == 3
tags: openshift
block:
- name: set role facts for generating inventory

4
extraconfig/services/openshift-node.yaml
View File

@ -75,7 +75,7 @@ outputs:
step_config: ''
external_deploy_tasks:
- name: openshift_node step 2
when: step == '2'
when: step|int == 2
tags: openshift
block:
- name: set role facts for generating inventory
@ -173,7 +173,7 @@ outputs:
{% endif %}
- name: openshift_node step 4
when: step == '4'
when: step|int == 4
tags: openshift
block:
- name: set role facts for generating inventory

2
extraconfig/services/skydive-analyzer.yaml
View File

@ -71,7 +71,7 @@ outputs:
- 12380
external_deploy_tasks:
- name: Skydive deployment
when: step == '5'
when: step|int == 5
block:
- name: create skydive temp dirs
become: true