Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
T
tun
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Locked Files
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Security & Compliance
Security & Compliance
Dependency List
License Compliance
Packages
Packages
List
Container Registry
Analytics
Analytics
CI / CD
Code Review
Insights
Issues
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Railgun
tun
Commits
c40c3fd6
Commit
c40c3fd6
authored
Jun 30, 2022
by
nanahira
1
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
use item.value
parent
058953a6
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
12 additions
and
12 deletions
+12
-12
ansible/configure.yaml
ansible/configure.yaml
+8
-8
ansible/migrate-oc-mtu.yaml
ansible/migrate-oc-mtu.yaml
+3
-3
src/inventory.ts
src/inventory.ts
+1
-1
No files found.
ansible/configure.yaml
View file @
c40c3fd6
...
@@ -96,17 +96,17 @@
...
@@ -96,17 +96,17 @@
-
mci{{inventory_hostname_short}}
-
mci{{inventory_hostname_short}}
# 为了提高测试时候的性能,不改动wg的时候注释掉这段
# 为了提高测试时候的性能,不改动wg的时候注释掉这段
-
name
:
'
clean
up
null
connections
first'
-
name
:
'
clean
up
null
connections
first'
include_tasks
:
'
protocols/{{item.protocol}}/configure.yaml'
include_tasks
:
'
protocols/{{item.
value.
protocol}}/configure.yaml'
vars
:
vars
:
conn
:
'
{{item}}'
conn
:
'
{{item
.value
}}'
with_
items
:
'
{{
connections
}}'
with_
dict
:
'
{{
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.
value.
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.
value.
protocol}}/configure.yaml'
vars
:
vars
:
conn
:
'
{{item}}'
conn
:
'
{{item
.value
}}'
with_
items
:
'
{{
connections
}}'
with_
dict
:
'
{{
connections
}}'
when
:
"
not
noUpdateLinks
and
item.
protocol
is
defined
and
item.protocol
!=
'null'
and
not
item
.noUpdate"
when
:
"
not
noUpdateLinks
and
item.
value.protocol
is
defined
and
item.value.protocol
!=
'null'
and
not
item.value
.noUpdate"
# end
# end
-
name
:
services conf
-
name
:
services conf
copy
:
copy
:
...
...
ansible/migrate-oc-mtu.yaml
View file @
c40c3fd6
...
@@ -14,9 +14,9 @@
...
@@ -14,9 +14,9 @@
-
name
:
'
update
oc
things'
-
name
:
'
update
oc
things'
include_tasks
:
'
protocols/{{item.protocol}}/configure.yaml'
include_tasks
:
'
protocols/{{item.protocol}}/configure.yaml'
vars
:
vars
:
conn
:
'
{{item}}'
conn
:
'
{{item
.value
}}'
with_
items
:
'
{{
connections
}}'
with_
dict
:
'
{{
connections
}}'
when
:
"
not
noUpdateLinks
and
item.
protocol
==
'oc'
and
not
item
.noUpdate"
when
:
"
not
noUpdateLinks
and
item.
value.protocol
==
'oc'
and
not
item.value
.noUpdate"
-
name
:
start services
-
name
:
start services
docker_compose
:
docker_compose
:
project_src
:
'
{{ansible_user_dir}}/nextgen-network/services'
project_src
:
'
{{ansible_user_dir}}/nextgen-network/services'
...
...
src/inventory.ts
View file @
c40c3fd6
...
@@ -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
]),
connections
,
connections
:
_
.
keyBy
(
connections
,
'
name
'
)
,
lanInterfaces
,
lanInterfaces
,
localSubnets
,
localSubnets
,
masqInterfaces
,
masqInterfaces
,
...
...
nanahira
@nanahira
mentioned in commit
7b34b71c
·
Aug 17, 2022
mentioned in commit
7b34b71c
mentioned in commit 7b34b71c0726fcb33013e46958fbe4ffea561954
Toggle commit list
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment