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.

Sign up for GitHub

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

Jump to bottom

Revert "Make it easier when using salt-ssh" #215

Merged
merged 1 commit into from
Jul 4, 2019
Merged

Revert "Make it easier when using salt-ssh" #215

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 5 additions & 5 deletions docker/map.jinja
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,11 @@
},
}, merge=salt['pillar.get']('registry:lookup:amazon')) %}

{%- set tplroot = tpldir.split('/')[0] %}
{% import_yaml tplroot ~ "/defaults.yaml" or {} as defaults %}
{% import_yaml tplroot ~ "/osfamilymap.yaml" or {} as osfamilymap %}
{% import_yaml tplroot ~ "/codenamemap.yaml" or {} as codemap %}
{% import_yaml tplroot ~ "/osmap.yaml" or {} as osmap %}
# Begin migration to new style map.jinja
{% import_yaml "docker/defaults.yaml" as defaults %}
{% import_yaml 'docker/osfamilymap.yaml' as osfamilymap %}
{% import_yaml "docker/codenamemap.yaml" as codemap %}
{% import_yaml "docker/osmap.yaml" as osmap %}

{% set pkg = salt['pillar.get']('docker-pkg:lookup', default={}, merge=True) %}
{% do defaults.docker.update(pkg) %}
Expand Down
3 changes: 1 addition & 2 deletions docker/repo.sls
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,7 @@
{% set humanname_old = 'Old ' if docker.use_old_repo else '' %}

{%- if grains['os_family']|lower in ('debian',) %}
{% set url = '[arch=' ~ grains["osarch"] ~ '] https://apt.dockerproject.org/repo ' ~ grains["os"]|lower ~ '-' ~ grains["oscodename"] ~ ' main' if docker.use_old_repo else '[arch=' ~ grains["osarch"] ~ '] ' ~ docker.repo.url_base ~ ' ' ~ docker.repo.version ~ ' stable' %}

{% set url = 'https://apt.dockerproject.org/repo ' ~ grains["os"]|lower ~ '-' ~ grains["oscodename"] ~ ' main' if docker.use_old_repo else docker.repo.url_base ~ ' ' ~ docker.repo.version ~ ' stable' %}

docker-package-repository:
pkgrepo.{{ repo_state }}:
Expand Down