Commit 058953a6 authored by nanahira's avatar nanahira

Revert "rename var"

This reverts commit c11d4e1c.
parent c11d4e1c
...@@ -95,17 +95,17 @@ ...@@ -95,17 +95,17 @@
- mc-{{inventory_hostname_short}} - mc-{{inventory_hostname_short}}
- mci{{inventory_hostname_short}} - mci{{inventory_hostname_short}}
# 为了提高测试时候的性能,不改动wg的时候注释掉这段 # 为了提高测试时候的性能,不改动wg的时候注释掉这段
- name: 'clean up null links first' - name: 'clean up null connections first'
include_tasks: 'protocols/{{item.protocol}}/configure.yaml' include_tasks: 'protocols/{{item.protocol}}/configure.yaml'
vars: vars:
conn: '{{item}}' conn: '{{item}}'
with_items: '{{ links }}' with_items: '{{ connections }}'
when: "not noUpdateLinks and item.protocol is defined and item.protocol == 'null' and not item.noUpdate" when: "not noUpdateLinks and item.protocol is defined and item.protocol == 'null' and not item.noUpdate"
- name: 'loop through list from a variable' - name: 'loop through list from a variable'
include_tasks: 'protocols/{{item.protocol}}/configure.yaml' include_tasks: 'protocols/{{item.protocol}}/configure.yaml'
vars: vars:
conn: '{{item}}' conn: '{{item}}'
with_items: '{{ links }}' with_items: '{{ connections }}'
when: "not noUpdateLinks and item.protocol is defined and item.protocol != 'null' and not item.noUpdate" when: "not noUpdateLinks and item.protocol is defined and item.protocol != 'null' and not item.noUpdate"
# end # end
- name: services conf - name: services conf
......
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
include_tasks: 'protocols/{{item.protocol}}/configure.yaml' include_tasks: 'protocols/{{item.protocol}}/configure.yaml'
vars: vars:
conn: '{{item}}' conn: '{{item}}'
with_items: '{{ links }}' with_items: '{{ connections }}'
when: "not noUpdateLinks and item.protocol == 'oc' and not item.noUpdate" when: "not noUpdateLinks and item.protocol == 'oc' and not item.noUpdate"
- name: start services - name: start services
docker_compose: docker_compose:
......
...@@ -423,7 +423,7 @@ class InventoryBuilder { ...@@ -423,7 +423,7 @@ class InventoryBuilder {
ocMetric: host.ocMetric || null, ocMetric: host.ocMetric || null,
ocpasswdLines: host.ocpasswdLines || [], ocpasswdLines: host.ocpasswdLines || [],
gateways: _.values(this.gateways[host.name]), gateways: _.values(this.gateways[host.name]),
links: connections, connections,
lanInterfaces, lanInterfaces,
localSubnets, localSubnets,
masqInterfaces, masqInterfaces,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment