View Options

	diff --git a/pillar/nodes/nodes.sls b/pillar/nodes/nodes.sls
	index 8a288e9..840d68d 100644
	--- a/pillar/nodes/nodes.sls
	+++ b/pillar/nodes/nodes.sls
	@@ -1,55 +1,56 @@
	# -------------------------------------------------------------
	# Salt — Nodes
	# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
	# Project: Nasqueron
	# Created: 2017-10-20
	# License: Trivial work, not eligible to copyright
	# -------------------------------------------------------------

	nodes:
	##
	## Forest: Nasqueron
	## Semantic field: https://devcentral.nasqueron.org/P27
	##
	dwellers:
	forest: nasqueron
	hostname: dwellers.nasqueron.org
	roles:
	- paas-lxc
	- paas-docker
	network:
	ipv6_tunnel: True
	equatower:
	forest: nasqueron
	hostname: equatower.nasqueron.org
	roles:
	- paas-docker
	network:
	ipv6_tunnel: False
	ysul:
	forest: nasqueron
	hostname: ysul.nasqueron.org
	roles:
	- devserver
	- saltmaster
	network:
	ipv4_interface: igb0
	ipv4_address: 163.172.49.16
	ipv4_gateway: 163.172.49.1
	+ ipv6_gateway: 2001:470:1f12:9e1::1
	ipv4_aliases:
	- 212.83.187.132
	ipv6_tunnel: True
	##
	## Forest: Eglide
	## Semantic field: ? (P27 used for "Eglide" too)
	##
	## This forest is intended to separate credentials
	## between Eglide and Nasqueron sevrers.
	##
	eglide:
	forest: eglide
	hostname: eglide.org
	roles:
	- shellserver
	network:
	ipv6_tunnel: True
	diff --git a/roles/core/network/files/routing.rc b/roles/core/network/files/routing.rc
	index 88d0eb5..4b78fca 100644
	--- a/roles/core/network/files/routing.rc
	+++ b/roles/core/network/files/routing.rc
	@@ -1,16 +1,19 @@
	# -------------------------------------------------------------
	# Network — rc configuration
	# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
	# Project: Nasqueron
	# License: Trivial work, not eligible to copyright
	# Source file: roles/core/network/files/routing.rc
	# -------------------------------------------------------------
	#
	# <auto-generated>
	# This file is managed by our rOPS SaltStack repository.
	#
	# Changes to this file may cause incorrect behavior
	# and will be lost if the state is redeployed.
	# </auto-generated>

	defaultrouter="{{ ipv4_gateway }}"
	+{% if ipv6_gateway != "" %}
	+ipv6_defaultrouter="{{ ipv6_gateway }}"
	+{% endif %}
	diff --git a/roles/core/network/init.sls b/roles/core/network/init.sls
	index 07345fe..559145b 100644
	--- a/roles/core/network/init.sls
	+++ b/roles/core/network/init.sls
	@@ -1,49 +1,50 @@
	# -------------------------------------------------------------
	# Salt — Network
	# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
	# Project: Nasqueron
	# Created: 2016-06-15
	# License: Trivial work, not eligible to copyright
	# -------------------------------------------------------------

	{% from "map.jinja" import dirs with context %}

	{% set network = salt['node.get']()['network'] %}

	# -------------------------------------------------------------
	# IPv4
	# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

	{% if grains['os'] == 'FreeBSD' %}
	/etc/rc.conf.d/netif/ipv4_{{ network['ipv4_interface'] }}:
	file.managed:
	- source: salt://roles/core/network/files/netif.rc
	- makedirs: True
	- template: jinja
	- context:
	interface: {{ network['ipv4_interface'] }}
	ipv4_address: {{ network['ipv4_address'] }}
	ipv4_netmask: {{ network['ipv4_netmask'] \| default('255.255.255.0') }}
	ipv4_aliases: {{ salt['node.list']('network:ipv4_aliases') }}
	dhcp_required: {{ salt['node.has']('network:dhcp_required') }}

	/etc/rc.conf.d/routing:
	file.managed:
	- source: salt://roles/core/network/files/routing.rc
	- template: jinja
	- context:
	ipv4_gateway: {{ network['ipv4_gateway'] }}
	+ ipv6_gateway: {{ network['ipv6_gateway'] \| default('') }}
	{% endif %}

	# -------------------------------------------------------------
	# IPv6
	# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

	{% if salt['node.has']('network.ipv6_tunnel') %}
	network_ipv6:
	file.managed:
	- name : {{ dirs.sbin }}/ipv6-setup-tunnel
	- source: salt://roles/core/network/files/{{ grains['id'] }}_ipv6.sh.jinja
	- template: jinja
	- mode: 755
	{% endif %}

File Metadata

Mime Type: text/x-diff
Expires: Sun, Oct 12, 07:10 (14 h, 10 m)
Storage Engine: blob
Storage Format: Raw Data
Storage Handle: 3065359
Default Alt Text: (4 KB)

No OneTemporary
Actions

View Options

File Metadata

Event Timeline

No OneTemporaryActions

View Options

File Metadata

Event Timeline

No OneTemporary
Actions