From 0f9df389df4a001eaf89ca14709ad4740c92092a Mon Sep 17 00:00:00 2001 From: Guillaume Abrioux Date: Tue, 14 May 2019 14:27:19 +0200 Subject: [PATCH] tests: fix a typo in dev_setup.yml c907ec41ae0698b7627ebcbe97f1c293611d41d7 introduced a typo. This commit fixes it. ``` [WARNING]: While constructing a mapping from /home/guits/ceph-ansible/tests/functional/dev_setup.yml, line 21, column 9, found a duplicate dict key (replace). ``` Signed-off-by: Guillaume Abrioux (cherry picked from commit 2798774e965a045787ce9d05fd82e63d8329bffb) --- tests/functional/dev_setup.yml | 44 ++++++++++++++++++---------------- 1 file changed, 23 insertions(+), 21 deletions(-) diff --git a/tests/functional/dev_setup.yml b/tests/functional/dev_setup.yml index d75a6e5ab..d8c35a5e1 100644 --- a/tests/functional/dev_setup.yml +++ b/tests/functional/dev_setup.yml @@ -7,28 +7,30 @@ - block: - - name: set_fact group_vars_path - set_fact: - group_vars_path: "{{ change_dir + '/hosts' if 'ooo-collocation' in change_dir.split('/') else change_dir + '/group_vars/all' }}" + - name: set_fact group_vars_path + set_fact: + group_vars_path: "{{ change_dir + '/hosts' if 'ooo-collocation' in change_dir.split('/') else change_dir + '/group_vars/all' }}" - - name: change ceph_repository to 'dev' - replace: - regexp: "ceph_repository:.*" - replace: "ceph_repository: dev" - dest: "{{ group_vars_path }}" - when: change_dir is defined + - block: + - name: change ceph_repository to 'dev' + replace: + regexp: "ceph_repository:.*" + replace: "ceph_repository: dev" + dest: "{{ group_vars_path }}" - - name: change nfs-ganesha repository to 'dev' - replace: - regexp: "nfs_ganesha_stable=.*" - replace: "nfs_ganesha_stable=False" - dest: "{{ group_vars_path }}" - replace: - regexp: "nfs_ganesha_dev:.*" - replace: "nfs_ganesha_dev=True" - dest: "{{ group_vars_path }}" - when: change_dir is defined + - name: ensure nfs_ganesha_stable is set to False + replace: + regexp: "nfs_ganesha_stable=.*" + replace: "nfs_ganesha_stable=False" + dest: "{{ group_vars_path }}" - - name: print contents of {{ group_vars_path }} - command: "cat {{ group_vars_path }}" + - name: ensure nfs_ganesha_dev is set to True + replace: + regexp: "nfs_ganesha_dev:.*" + replace: "nfs_ganesha_dev=True" + dest: "{{ group_vars_path }}" + when: change_dir is defined + + - name: print contents of {{ group_vars_path }} + command: "cat {{ group_vars_path }}" when: dev_setup