Fix assignments in docker tests. (#57249)

(cherry picked from commit 7cd229aa97)
This commit is contained in:
Felix Fontein 2019-05-31 23:47:53 +02:00 committed by Toshio Kuratomi
parent fa1cef7190
commit 0b5ab1e041
7 changed files with 9 additions and 9 deletions

View file

@ -9,8 +9,8 @@
nname_2: "{{ cname_prefix ~ '-network-2' }}"
- name: Registering container name
set_fact:
cnames: "{{ cnames }} + [cname, cname_h1, cname_h2, cname_h3]"
dnetworks: "{{ dnetworks }} + [nname_1, nname_2]"
cnames: "{{ cnames + [cname, cname_h1, cname_h2, cname_h3] }}"
dnetworks: "{{ dnetworks + [nname_1, nname_2] }}"
- name: Create networks
docker_network:

View file

@ -4,7 +4,7 @@
cname: "{{ cname_prefix ~ '-hi' }}"
- name: Registering container name
set_fact:
cnames: "{{ cnames }} + [cname]"
cnames: "{{ cnames + [cname] }}"
####################################################################
## Creation ########################################################

View file

@ -6,7 +6,7 @@
- name: Registering image name
set_fact:
inames: "{{ inames }} + [iname, iname_1]"
inames: "{{ inames + [iname, iname_1] }}"
####################################################################
## buildargs #######################################################

View file

@ -8,8 +8,8 @@
nname_2: "{{ name_prefix ~ '-network-2' }}"
- name: Registering container and network names
set_fact:
cnames: "{{ cnames }} + [cname_1, cname_2, cname_3]"
dnetworks: "{{ dnetworks }} + [nname_1, nname_2]"
cnames: "{{ cnames + [cname_1, cname_2, cname_3] }}"
dnetworks: "{{ dnetworks + [nname_1, nname_2] }}"
- name: Create containers
docker_container:

View file

@ -4,7 +4,7 @@
nname_1: "{{ name_prefix ~ '-network-1' }}"
- name: Registering network name
set_fact:
dnetworks: "{{ dnetworks }} + [nname_1]"
dnetworks: "{{ dnetworks + [nname_1] }}"
####################################################################
## driver_options ##################################################

View file

@ -5,7 +5,7 @@
nname_2: "{{ name_prefix ~ '-network-foobar' }}"
- name: Registering container and network names
set_fact:
dnetworks: "{{ dnetworks }} + [nname_1, nname_2]"
dnetworks: "{{ dnetworks + [nname_1, nname_2] }}"
####################################################################

View file

@ -4,7 +4,7 @@
vname: "{{ name_prefix ~ '-basic' }}"
- name: Registering container name
set_fact:
vnames: "{{ vnames }} + [vname]"
vnames: "{{ vnames + [vname] }}"
####################################################################
## basic ###########################################################