D4027.id10524.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D4027.id10524.diff
View Options

	diff --git a/roles/router/carp/init.sls b/roles/router/carp/init.sls
	--- a/roles/router/carp/init.sls
	+++ b/roles/router/carp/init.sls
	@@ -5,6 +5,8 @@
	# License: Trivial work, not eligible to copyright
	# -------------------------------------------------------------

	+{% from "roles/router/carp/map.jinja" import python with context %}
	+
	/etc/rc.conf.d/netif/carp:
	file.managed:
	- source: salt://roles/router/carp/files/carp.rc
	@@ -17,3 +19,14 @@
	file.managed:
	- source: salt://roles/router/carp/files/carp.conf
	- mode: '0644'
	+
	+python_pip:
	+ pkg.installed:
	+ - name: py{{ python.abi }}-pip
	+
	+carp_switch_dependencies:
	+ cmd.run:
	+ - name: python{{ python.version }} -m pip install ovh secretsmith
	+ - creates: /usr/local/lib/python{{ python.version }}/site-packages/secretsmith
	+ - require:
	+ - pkg: python_pip
	diff --git a/roles/router/carp/map.jinja b/roles/router/carp/map.jinja
	new file mode 100644
	--- /dev/null
	+++ b/roles/router/carp/map.jinja
	@@ -0,0 +1,13 @@
	+# -------------------------------------------------------------
	+# Salt — Router — CARP
	+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
	+# Project: Nasqueron
	+# License: Trivial work, not eligible to copyright
	+# -------------------------------------------------------------
	+
	+{% set py = grains['pythonversion'] %}
	+
	+{% set python = {
	+ 'version': py[0] ~ '.' ~ py[1],
	+ 'abi': py[0] ~ '' ~ py[1],
	+} %}