Skip to content
Merged
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
3 changes: 3 additions & 0 deletions manifests/plugin/salt.pp
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@
#
# $autosign_key_file:: File to use for salt autosign via grains
#
# $minimum_auth_version:: Minimum authentication version for salt minions
#
# $user:: User to run salt commands under
#
# $group:: Group to run salt commands and access configuration files
Expand All @@ -33,6 +35,7 @@
class foreman_proxy::plugin::salt (
Stdlib::Absolutepath $autosign_file = $foreman_proxy::plugin::salt::params::autosign_file,
Stdlib::Absolutepath $autosign_key_file = $foreman_proxy::plugin::salt::params::autosign_key_file,
Optional[Integer] $minimum_auth_version = $foreman_proxy::plugin::salt::params::minimum_auth_version,
Boolean $enabled = $foreman_proxy::plugin::salt::params::enabled,
Foreman_proxy::ListenOn $listen_on = $foreman_proxy::plugin::salt::params::listen_on,
String $user = $foreman_proxy::plugin::salt::params::user,
Expand Down
1 change: 1 addition & 0 deletions manifests/plugin/salt/params.pp
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
$autosign_file = "${foreman_proxy::params::etc}/salt/autosign.conf"
$autosign_grains_dir = '/var/lib/foreman-proxy/salt/grains'
$autosign_key_file = "${autosign_grains_dir}/autosign_key"
$minimum_auth_version = undef
$user = 'root'

$api = false
Expand Down
10 changes: 10 additions & 0 deletions templates/plugin/salt_master.conf.erb
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,16 @@ ext_pillar:
- puppet: /usr/bin/foreman-node


##
# Minimum authentication version
<% minimum_auth_version = scope.lookupvar('foreman_proxy::plugin::salt::minimum_auth_version') %>
<% if [nil, :undefined, :undef].include?(minimum_auth_version) %>
# use salt's default minimum_auth_version
<% else %>
minimum_auth_version: <%= minimum_auth_version %>
<% end %>


##
# Salt API access
external_auth:
Expand Down
Loading