move lxc-containers data to pillar

This commit is contained in:
Astro 2016-11-17 00:58:19 +01:00
parent 3bb52c08c5
commit 24ed406026
7 changed files with 52 additions and 52 deletions

View File

@ -0,0 +1,47 @@
containers:
pub-gw:
interfaces:
core:
type: veth
gw: anon1
pub:
type: phys
serv-gw:
interfaces:
core:
type: veth
gw: upstream1
serv:
type: veth
priv1-gw:
interfaces:
core:
type: veth
gw: upstream1
priv2-gw:
interfaces:
core:
type: veth
gw: upstream1
upstream1:
interfaces:
core:
type: veth
up1:
type: phys
upstream2:
interfaces:
core:
type: veth
up2:
type: phys
anon1:
interfaces:
core:
type: veth

View File

@ -12,4 +12,5 @@ base:
'upstream1':
- upstream.upstream1
'server1':
- lxc-containers.server1
- switches

View File

@ -1,46 +0,0 @@
pub-gw:
interfaces:
core:
type: veth
gw: anon1
pub:
type: phys
serv-gw:
interfaces:
core:
type: veth
gw: upstream1
serv:
type: veth
priv1-gw:
interfaces:
core:
type: veth
gw: upstream1
priv2-gw:
interfaces:
core:
type: veth
gw: upstream1
upstream1:
interfaces:
core:
type: veth
up1:
type: phys
upstream2:
interfaces:
core:
type: veth
up2:
type: phys
anon1:
interfaces:
core:
type: veth

View File

@ -1,9 +1,7 @@
{%- import_yaml "lxc-containers-1/containers.yaml" as containers -%}
lxc:
pkg.installed: []
{% for id, container in containers.items() %}
{% for id, container in pillar['containers'].items() %}
/var/lib/lxc/{{ id }}:
cmd.run:
@ -14,7 +12,7 @@ lxc:
/var/lib/lxc/{{ id }}/config:
file.managed:
- source: salt://lxc-containers-1/config
- source: salt://lxc-containers/config
- template: 'jinja'
- context:
id: {{ id }}
@ -37,7 +35,7 @@ lxc:
/var/lib/lxc/{{ id }}/rootfs/etc/hosts:
file.managed:
- source: salt://lxc-containers-1/hosts
- source: salt://lxc-containers/hosts
- template: 'jinja'
- context:
id: {{ id }}

View File

@ -2,7 +2,7 @@ base:
'server1':
- salt-master
- server1-network
- lxc-containers-1
- lxc-containers
- ospf
- switches
'*-gw':