D2322.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D2322.diff
View Options

	diff --git a/pillar/paas/docker.sls b/pillar/paas/docker.sls
	--- a/pillar/paas/docker.sls
	+++ b/pillar/paas/docker.sls
	@@ -77,6 +77,11 @@
	dwellers:
	bugzilla:
	subnet: 172.21.3.0/24
	+ docker-001:
	+ cd:
	+ subnet: 172.18.1.0/24
	+ ci:
	+ subnet: 172.18.2.0/24
	equatower:
	cd:
	subnet: 172.18.1.0/24
	@@ -88,6 +93,12 @@
	# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

	docker_daemon:
	+ docker-001:
	+ storage-driver: devicemapper
	+ storage-opts:
	+ - "dm.thinpooldev=/dev/mapper/wharf-thinpool"
	+ - "dm.use_deferred_removal=true"
	+ - "dm.use_deferred_deletion=true
	equatower:
	storage-driver: devicemapper
	storage-opts:
	@@ -96,6 +107,8 @@
	- "dm.use_deferred_deletion=true"

	docker_devicemapper:
	+ docker-001:
	+ thinpool: wharf-thinpool
	equatower:
	thinpool: wharf-thinpool

	diff --git a/pillar/top.sls b/pillar/top.sls
	--- a/pillar/top.sls
	+++ b/pillar/top.sls
	@@ -19,6 +19,13 @@

	cloudhugger: []

	+ docker-001:
	+ - credentials.zr
	+ - paas.docker
	+ - saas.jenkins
	+ - saas.phpbb
	+ - saas.sentry
	+
	dwellers:
	- credentials.zr
	- paas.docker