D1406.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D1406.diff
View Options

	diff --git a/roles/paas-docker/docker/init.sls b/roles/paas-docker/docker/init.sls
	--- a/roles/paas-docker/docker/init.sls
	+++ b/roles/paas-docker/docker/init.sls
	@@ -2,33 +2,9 @@
	# Salt — Provision Docker engine
	# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
	# Project: Nasqueron
	-# Created: 2017-05-24
	+# Created: 2018-03-09
	# License: Trivial work, not eligible to copyright
	# -------------------------------------------------------------

	-# -------------------------------------------------------------
	-# Install Docker engine
	-# -------------------------------------------------------------
	-
	-{% if grains['os'] == 'CentOS' %}
	-remove_legacy_docker_packages:
	- pkg:
	- - removed
	- - pkgs:
	- - docker-common
	- - docker-selinux
	- - docker-engine
	-
	-install_docker_engine:
	- file.managed:
	- - name: /etc/yum.repos.d/docker-ce.repo
	- - source: https://download.docker.com/linux/centos/docker-ce.repo
	- - source_hash: 6650718e0fe5202ae7618521f695d43a8bc051c539d7570f0edbfa5b4916f218
	- pkg.installed:
	- - pkgs:
	- - device-mapper-persistent-data
	- - lvm2
	- - docker-ce
	- - require:
	- - file: install_docker_engine
	-{% endif %}
	+include:
	+ - .software
	diff --git a/roles/paas-docker/docker/init.sls b/roles/paas-docker/docker/software.sls
	copy from roles/paas-docker/docker/init.sls
	copy to roles/paas-docker/docker/software.sls