D2207.id.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D2207.id.diff
View Options

	diff --git a/roles/paas-docker/salt/init.sls b/roles/paas-docker/salt/init.sls
	--- a/roles/paas-docker/salt/init.sls
	+++ b/roles/paas-docker/salt/init.sls
	@@ -6,21 +6,11 @@
	# License: Trivial work, not eligible to copyright
	# -------------------------------------------------------------

	-{% from "map.jinja" import packages_prefixes with context %}
	-
	-# -------------------------------------------------------------
	-# Does Salt use Python 2 or Python 3?
	-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
	-
	-{% if grains['pythonversion'][0] == 2 %}
	-{% set prefix = packages_prefixes['python2'] %}
	-{% else %}
	-{% set prefix = packages_prefixes['python3'] %}
	-{% endif %}
	-
	# -------------------------------------------------------------
	# Dependencies for Docker Salt minions
	# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

	-{{prefix}}docker-py:
	- pkg.installed
	+required_python_packages_for_docker_and_salt:
	+ pip.installed:
	+ - name: docker
	+ - bin_env: /usr/bin/pip3