D3445.diff
No OneTemporary
Actions

Size

798 B

Referenced Files

None

Subscribers

None

D3445.diff
View Options

	diff --git a/pillar/devserver/datacubes.sls b/pillar/devserver/datacubes.sls
	--- a/pillar/devserver/datacubes.sls
	+++ b/pillar/devserver/datacubes.sls
	@@ -9,6 +9,8 @@
	# Datacubes
	# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

	+datacube_zfs_pool: greenway
	+
	datacubes:

	bak: &default {}
	diff --git a/roles/devserver/datacube/init.sls b/roles/devserver/datacube/init.sls
	--- a/roles/devserver/datacube/init.sls
	+++ b/roles/devserver/datacube/init.sls
	@@ -19,7 +19,11 @@

	{% if salt['node.has']('zfs:pool') %}

	-{% set tank = salt['node.get']("zfs:pool") %}
	+{% if "datacube_zfs_pool" in pillar %}
	+{% set tank = pillar["datacube_zfs_pool"] %}
	+{% else %}
	+{% set tank = salt["node.get"]("zfs:pool") %}
	+{% endif %}

	{{ tank }}/datacube:
	zfs.filesystem_present: