Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Centos mapdotjinja #27

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,7 @@ Container

docker:
client:
enable: true
container:
jenkins:
# Don't start automatically
Expand Down Expand Up @@ -122,6 +123,7 @@ Stack

docker:
client:
enable: true
stack:
django_web:
enabled: true
Expand Down Expand Up @@ -156,6 +158,7 @@ Install docker-compose using Docker (default is distribution package)

docker:
client:
enable: true
compose:
source:
engine: docker
Expand Down Expand Up @@ -188,6 +191,7 @@ Registry

docker:
client:
enable: true
registry:
target_registry: apt:5000
image:
Expand All @@ -209,6 +213,7 @@ To deploy service in Swarm mode, you can use ``docker.client.service``:
parameters:
docker:
client:
enable: true
service:
postgresql:
environment:
Expand Down
12 changes: 11 additions & 1 deletion docker/map.jinja
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

{% set host = salt['grains.filter_by']({
'CentOS': {
'pkgs': ['docker-io'],
'pkgs': ['docker-ce'],
'service': 'docker',
},
'Debian': {
Expand Down Expand Up @@ -38,6 +38,16 @@
},
},
},
'CentOS': {
'pkgs': ['python-docker-py'],
'compose': {
'base': '/etc/docker/compose',
'source': {
'engine': 'pkg',
'pkgs': ['docker-compose'],
},
},
},
}, grain='os', merge=salt['pillar.get']('docker:client')) %}

{% set registry = salt['grains.filter_by']({
Expand Down