Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
CIRCLE
/
salt
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
17
Merge Requests
1
Wiki
Snippets
Members
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit
b9193642
authored
May 24, 2018
by
barni2000
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
vxlan base network is now optional
parent
48613706
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
1 deletions
+4
-1
pillar/network.sls
+1
-0
salt/network/configuration.sls
+1
-1
salt/network/init.sls
+2
-0
No files found.
pillar/network.sls
View file @
b9193642
network:
network:
vxlan_base: False
if_name: eth0
if_name: eth0
vxlan_name: circle-vxlan
vxlan_name: circle-vxlan
vxlan_id: 42
vxlan_id: 42
...
...
salt/network/configuration.sls
View file @
b9193642
{% if pillar["
deployment_mode"] == "node"
%}
{% if pillar["
network"]["vxlan_base"] == True
%}
{% set vxlan_port = pillar["network"]["vxlan_port"]["port"] %}
{% set vxlan_port = pillar["network"]["vxlan_port"]["port"] %}
{% set vxlan_proto = pillar["network"]["vxlan_port"]["proto"] %}
{% set vxlan_proto = pillar["network"]["vxlan_port"]["proto"] %}
...
...
salt/network/init.sls
View file @
b9193642
...
@@ -7,6 +7,7 @@ ovs-bridge:
...
@@ -7,6 +7,7 @@ ovs-bridge:
- name: cloud
- name: cloud
{% set net = pillar["network"] %}
{% set net = pillar["network"] %}
{% if net["vxlan_base"] == True %}
circle-vxlan-if:
circle-vxlan-if:
cmd.run:
cmd.run:
- name: >
- name: >
...
@@ -22,6 +23,7 @@ circle-vxlan:
...
@@ -22,6 +23,7 @@ circle-vxlan:
- openvswitch_bridge: ovs-bridge
- openvswitch_bridge: ovs-bridge
- pkg: bind-utils
- pkg: bind-utils
- cmd: circle-vxlan-if
- cmd: circle-vxlan-if
{% endif %}
{% if grains['os_family'] == 'RedHat' %}
{% if grains['os_family'] == 'RedHat' %}
net_config:
net_config:
...
...
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