Skip to content

fix(bug): avoid name collisions and conflicting ids #446

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

Closed
noelmcloughlin wants to merge 9 commits into from
Closed

fix(bug): avoid name collisions and conflicting ids #446

Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
bfcbdc7
fix(bug): avoid name collisons and conflicting ids
noelmcloughlin Jan 22, 2020
fc5f1b6
test(version): bump package minor version
noelmcloughlin Jan 22, 2020
94833bf
test(version): bump package minor version
noelmcloughlin Jan 22, 2020
c8cc1d3
test(version): bump package minor version
noelmcloughlin Jan 22, 2020
02af642
test(amazonlinux): match package version against os
noelmcloughlin Jan 22, 2020
f3bc21a
Merge branch 'master' into unconflict
noelmcloughlin Jan 22, 2020
602616c
test(versions): bump suse and debian pkg versions
noelmcloughlin Jan 22, 2020
0db3855
Merge branch 'unconflict' of https://github.com/noelmcloughlin/salt-f…
noelmcloughlin Jan 22, 2020
21f3999
Merge branch 'master' into unconflict
noelmcloughlin Jan 25, 2020
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
6 changes: 3 additions & 3 deletions salt/standalone.sls
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{% from "salt/map.jinja" import salt_settings with context %}

salt-minion:
salt-minion-standalone:
Comment thread
noelmcloughlin marked this conversation as resolved.
{% if salt_settings.install_packages %}
pkg.installed:
- name: {{ salt_settings.salt_minion }}
Expand All @@ -26,9 +26,9 @@ salt-minion:
- name: {{ salt_settings.minion_service }}
- require:
{% if salt_settings.install_packages %}
- pkg: salt-minion
- pkg: salt-minion-standalone
{% endif %}
- file: salt-minion
- file: salt-minion-standalone

# clean up old _defaults.conf file if they have it around
remove-old-standalone-conf-file:
Expand Down