Fix assignments in docker tests. (#57249)

This commit is contained in:
Felix Fontein 2019-05-31 23:47:53 +02:00 committed by GitHub
parent 1515afd92c
commit 7cd229aa97
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
23 changed files with 27 additions and 27 deletions

View file

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

View file

@ -4,7 +4,7 @@
cname: "{{ cname_prefix ~ '-iid' }}"
- name: Registering container name
set_fact:
cnames: "{{ cnames }} + [cname]"
cnames: "{{ cnames + [cname] }}"
- name: Pull images
docker_image:

View file

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

View file

@ -7,7 +7,7 @@
cname_h3: "{{ cname_prefix ~ '-options-h3' }}"
- name: Registering container name
set_fact:
cnames: "{{ cnames }} + [cname, cname_h1, cname_h2, cname_h3]"
cnames: "{{ cnames + [cname, cname_h1, cname_h2, cname_h3] }}"
####################################################################
## auto_remove #####################################################

View file

@ -5,7 +5,7 @@
cname: "{{ cname_prefix ~ '-45700' }}"
- name: Registering container name
set_fact:
cnames: "{{ cnames }} + [cname]"
cnames: "{{ cnames + [cname] }}"
- name: Start container
docker_container:

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] }}"
####################################################################
## build.args ######################################################

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

@ -8,7 +8,7 @@
- name: Registering network names
set_fact:
dnetworks: "{{ dnetworks }} + [nname_ipam_0, nname_ipam_1, nname_ipam_2, nname_ipam_3]"
dnetworks: "{{ dnetworks + [nname_ipam_0, nname_ipam_1, nname_ipam_2, nname_ipam_3] }}"
#################### network-ipam-0 deprecated ####################

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] }}"
####################################################################
## internal ########################################################

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] }}"
####################################################################
## overlay #########################################################

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

@ -8,7 +8,7 @@
- name: Registering container name
set_fact:
config_names: "{{ config_names }} + [config_name_1, config_name_2]"
config_names: "{{ config_names + [config_name_1, config_name_2] }}"
- docker_config:
name: "{{ config_name_1 }}"

View file

@ -6,7 +6,7 @@
- name: Registering service name
set_fact:
service_names: "{{ service_names }} + [service_name]"
service_names: "{{ service_names + [service_name] }}"
####################################################################
## logging.driver ##################################################

View file

@ -6,8 +6,8 @@
- name: Registering service name
set_fact:
service_names: "{{ service_names }} + [service_name]"
volume_names: "{{ volume_names }} + [volume_name_1, volume_name_2]"
service_names: "{{ service_names + [service_name] }}"
volume_names: "{{ volume_names + [volume_name_1, volume_name_2] }}"
- docker_volume:
name: "{{ volume_name }}"

View file

@ -8,8 +8,8 @@
- name: Registering container name
set_fact:
service_names: "{{ service_names }} + [service_name]"
network_names: "{{ network_names }} + [network_name_1, network_name_2]"
service_names: "{{ service_names + [service_name] }}"
network_names: "{{ network_names + [network_name_1, network_name_2] }}"
- docker_network:
name: "{{ network_name }}"

View file

@ -6,7 +6,7 @@
- name: Registering service name
set_fact:
service_names: "{{ service_names }} + [service_name]"
service_names: "{{ service_names + [service_name] }}"
####################################################################

View file

@ -6,7 +6,7 @@
- name: Registering service name
set_fact:
service_names: "{{ service_names }} + [service_name]"
service_names: "{{ service_names + [service_name] }}"
####################################################################
## limits.cpus #####################################################

View file

@ -6,7 +6,7 @@
- name: Registering service name
set_fact:
service_names: "{{ service_names }} + [service_name]"
service_names: "{{ service_names + [service_name] }}"
###################################################################
## restart_config.condition #######################################

View file

@ -6,7 +6,7 @@
- name: Registering service name
set_fact:
service_names: "{{ service_names }} + [service_name]"
service_names: "{{ service_names + [service_name] }}"
###################################################################
## rollback_config.delay ############################################

View file

@ -8,7 +8,7 @@
- name: Registering container name
set_fact:
secret_names: "{{ secret_names }} + [secret_name_1, secret_name_2]"
secret_names: "{{ secret_names + [secret_name_1, secret_name_2] }}"
- docker_secret:
name: "{{ secret_name_1 }}"

View file

@ -6,7 +6,7 @@
- name: Registering service name
set_fact:
service_names: "{{ service_names }} + [service_name]"
service_names: "{{ service_names + [service_name] }}"
###################################################################
## update_config.delay ############################################

View file

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