From 7474d4239d42160a513c5e647884f413cd6ad430 Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Fri, 4 Mar 2016 11:27:45 +0000 Subject: [PATCH] Fix Windows repo settings using values from 2015.8 documentation --- salt/files/master.d/f_defaults.conf | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/salt/files/master.d/f_defaults.conf b/salt/files/master.d/f_defaults.conf index c183514..50db276 100644 --- a/salt/files/master.d/f_defaults.conf +++ b/salt/files/master.d/f_defaults.conf @@ -1109,17 +1109,17 @@ nodegroups: ##### Windows Software Repo settings ##### ########################################### # Location of the repo on the master: -{{ get_config('win_repo_dir_ng', '/srv/salt/win/repo-ng') }} +{{ get_config('winrepo_dir_ng', '/srv/salt/win/repo-ng') }} # List of git repositories to include with the local repo: -{% if 'win_gitrepos_ng' in cfg_master %} -win_gitrepos_ng: - {% for repo in cfg_master['win_gitrepos_ng'] %} +{% if 'winrepo_remotes_ng' in cfg_master %} +winrepo_remotes_ng: + {% for repo in cfg_master['winrepo_remotes_ng'] %} - {{ repo }} {% endfor %} -{% elif 'win_gitrepos_ng' in cfg_salt %} -win_gitrepos_ng: - {% for repo in cfg_salt['win_gitrepos_ng'] %} +{% elif 'winrepo_remotes_ng' in cfg_salt %} +winrepo_remotes_ng: + {% for repo in cfg_salt['winrepo_remotes_ng'] %} - {{ repo }} {% endfor %} {% else %}