Merge "Fix Ansible Using tests as filters is deprecated"

This commit is contained in:
Zuul 2018-07-24 17:36:33 +00:00 committed by Gerrit Code Review
commit 1909b0d89a
4 changed files with 4 additions and 5 deletions

View File

@ -62,7 +62,7 @@
dest: '{{ build_repo_dir }}/DLRN/data/{{ project_name_mapped.stdout }}'
refspec: '{{ artg_change.refspec }}'
version: 'FETCH_HEAD'
when: artg_repos_dir is not defined or copy_dir|failed
when: artg_repos_dir is not defined or copy_dir is failed
- name: Run DLRN
shell: >

View File

@ -140,7 +140,7 @@
command:
ssh -o BatchMode=yes -o "StrictHostKeyChecking=no" centos@{{ hostvars[item].ansible_host }} -i "{{ private_key_location }}"
register: result
until: result|success
until: result is success
retries: 100
delay: 5
with_items:

View File

@ -138,7 +138,7 @@
command:
ssh -o BatchMode=yes -o "StrictHostKeyChecking=no" root@{{ undercloud_ip }} -i "{{ undercloud_key }}"
register: result
until: result|success
until: result is success
retries: 300
delay: 5

View File

@ -57,11 +57,10 @@
when: baremetal_nic_configs is defined
- name: Prepare custom t-h-t for overcloud deployment
include: custom_tht.yml
import_tasks: custom_tht.yml
when:
- overcloud_templates_refspec is defined or overcloud_templates_branch is defined
- overcloud_templates_repo is defined
static: no
- name: Copy extra THT config files on the undercloud
copy: