Browse Source

Conflicted resolved by merging changes

pull/15/head
Jerzy Drozdz 6 years ago
parent
commit
e7b020ab98
4 changed files with 15 additions and 2 deletions
  1. +2
    -0
      README.rst
  2. +4
    -0
      network/defaults.yaml
  3. +2
    -0
      network/routes.sls
  4. +7
    -2
      pillar.example.sls

+ 2
- 0
README.rst View File



* Alan Pearce <alan@alanpearce.co.uk> * Alan Pearce <alan@alanpearce.co.uk>
* Arnold Bechtoldt <mail@arnoldbechtoldt.com> * Arnold Bechtoldt <mail@arnoldbechtoldt.com>
* Krzysztof Pawłowski <krzysztof.pawlowski@firma.interia.pl>
* René Jochum <rene@jochums.at>
* Simon Lloyd <simon@slloyd.net> * Simon Lloyd <simon@slloyd.net>
* root <root@saltmaster01.(none)> * root <root@saltmaster01.(none)>



+ 4
- 0
network/defaults.yaml View File

- pre_down_cmds - pre_down_cmds
- post_up_cmds - post_up_cmds
- post_down_cmds - post_down_cmds
- noifupdown
{#- bonding #} {#- bonding #}
- master - master
- mode - mode
- ipv6ipaddr - ipv6ipaddr
- ipv6netmask - ipv6netmask
- ipv6gateway - ipv6gateway
- mtu
def_entries: def_entries:
- name: lo - name: lo
proto: loopback proto: loopback
- pre_down_cmds - pre_down_cmds
- post_up_cmds - post_up_cmds
- post_down_cmds - post_down_cmds
- noifupdown
{#- bonding #} {#- bonding #}
- master - master
- mode - mode
- ipv6_peerdns - ipv6_peerdns
- ipv6_defroute - ipv6_defroute
- ipv6_peerroutes - ipv6_peerroutes
- mtu
def_entries: [] def_entries: []
# - name: lo # - name: lo
# proto: none # proto: none

+ 2
- 0
network/routes.sls View File

- name: {{ net.name }} - name: {{ net.name }}
ipaddr: {{ net.ipaddr }} ipaddr: {{ net.ipaddr }}
netmask: {{ net.netmask }} netmask: {{ net.netmask }}
{% if net.gateway is defined %}
gateway: {{ net.gateway }} gateway: {{ net.gateway }}
{% endif %}
{% endfor %} {% endfor %}
{% endfor %} {% endfor %}

+ 7
- 2
pillar.example.sls View File

{# Disable default entries #}
network: network:
interfaces:
{# Disable default interface entries #}
lookup:
interfaces: interfaces:
def_entries: [] def_entries: []
hosts:
def_entries: []


########################
network:
interfaces:
{# Basic Setup #} {# Basic Setup #}
- name: eth0 - name: eth0
proto: dhcp proto: dhcp

Loading…
Cancel
Save