From cbe576366831910262caec523a7d2c12287a7c55 Mon Sep 17 00:00:00 2001 From: Niels Abspoel Date: Sat, 9 Jan 2016 19:39:47 +0100 Subject: [PATCH 1/3] fix pillar and libvirt --- salt/files/master.d/_libvirt.conf | 1 + salt/files/master.d/_pillar.conf | 1 + salt/files/minion.d/_libvirt.conf | 1 + salt/files/minion.d/_pillar.conf | 1 + 4 files changed, 4 insertions(+) create mode 100644 salt/files/master.d/_libvirt.conf create mode 100644 salt/files/master.d/_pillar.conf create mode 100644 salt/files/minion.d/_libvirt.conf create mode 100644 salt/files/minion.d/_pillar.conf diff --git a/salt/files/master.d/_libvirt.conf b/salt/files/master.d/_libvirt.conf new file mode 100644 index 0000000..bbd38bc --- /dev/null +++ b/salt/files/master.d/_libvirt.conf @@ -0,0 +1 @@ +virt.tunnel: True diff --git a/salt/files/master.d/_pillar.conf b/salt/files/master.d/_pillar.conf new file mode 100644 index 0000000..5f3fdf0 --- /dev/null +++ b/salt/files/master.d/_pillar.conf @@ -0,0 +1 @@ +pillar_merge_lists: False diff --git a/salt/files/minion.d/_libvirt.conf b/salt/files/minion.d/_libvirt.conf new file mode 100644 index 0000000..bbd38bc --- /dev/null +++ b/salt/files/minion.d/_libvirt.conf @@ -0,0 +1 @@ +virt.tunnel: True diff --git a/salt/files/minion.d/_pillar.conf b/salt/files/minion.d/_pillar.conf new file mode 100644 index 0000000..5f3fdf0 --- /dev/null +++ b/salt/files/minion.d/_pillar.conf @@ -0,0 +1 @@ +pillar_merge_lists: False From adb0c7008d3e55bcaea48099a9b324fe07b41bec Mon Sep 17 00:00:00 2001 From: Niels Abspoel Date: Sat, 9 Jan 2016 21:45:23 +0100 Subject: [PATCH 2/3] removing accidentally committed files --- salt/files/master.d/_libvirt.conf | 1 - salt/files/master.d/_pillar.conf | 1 - salt/files/minion.d/_libvirt.conf | 1 - salt/files/minion.d/_pillar.conf | 1 - 4 files changed, 4 deletions(-) delete mode 100644 salt/files/master.d/_libvirt.conf delete mode 100644 salt/files/master.d/_pillar.conf delete mode 100644 salt/files/minion.d/_libvirt.conf delete mode 100644 salt/files/minion.d/_pillar.conf diff --git a/salt/files/master.d/_libvirt.conf b/salt/files/master.d/_libvirt.conf deleted file mode 100644 index bbd38bc..0000000 --- a/salt/files/master.d/_libvirt.conf +++ /dev/null @@ -1 +0,0 @@ -virt.tunnel: True diff --git a/salt/files/master.d/_pillar.conf b/salt/files/master.d/_pillar.conf deleted file mode 100644 index 5f3fdf0..0000000 --- a/salt/files/master.d/_pillar.conf +++ /dev/null @@ -1 +0,0 @@ -pillar_merge_lists: False diff --git a/salt/files/minion.d/_libvirt.conf b/salt/files/minion.d/_libvirt.conf deleted file mode 100644 index bbd38bc..0000000 --- a/salt/files/minion.d/_libvirt.conf +++ /dev/null @@ -1 +0,0 @@ -virt.tunnel: True diff --git a/salt/files/minion.d/_pillar.conf b/salt/files/minion.d/_pillar.conf deleted file mode 100644 index 5f3fdf0..0000000 --- a/salt/files/minion.d/_pillar.conf +++ /dev/null @@ -1 +0,0 @@ -pillar_merge_lists: False From 41f2de74bd92b9b03ea7544e6815786c12c2f8d4 Mon Sep 17 00:00:00 2001 From: Kevin Schmidt Date: Fri, 11 Dec 2015 12:42:16 +0000 Subject: [PATCH 3/3] * add gitfs whitelist and blacklist --- salt/files/master.d/f_defaults.conf | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/salt/files/master.d/f_defaults.conf b/salt/files/master.d/f_defaults.conf index 54cb732..770c8d9 100644 --- a/salt/files/master.d/f_defaults.conf +++ b/salt/files/master.d/f_defaults.conf @@ -652,6 +652,30 @@ gitfs_remotes: # repository and defaults to the repository root. {{ get_config('gitfs_root', 'somefolder/otherfolder') }} +# The gitfs_env_whitelist and gitfs_env_blacklist parameters allow for greater +# control over which branches/tags are exposed as fileserver environments. +{% if 'gitfs_env_whitelist' in cfg_master -%} +gitfs_env_whitelist: + {%- for git_env in cfg_master['gitfs_env_whitelist'] %} + - {{ git_env }} + {%- endfor -%} +{% else -%} +# gitfs_env_whitelist: +# - base +# - v1.* +{% endif %} + +{% if 'gitfs_env_blacklist' in cfg_master -%} +gitfs_env_blacklist: + {%- for git_env in cfg_master['gitfs_env_blacklist'] %} + - {{ git_env }} + {%- endfor -%} +{% else -%} +# gitfs_env_blacklist: +# - bug/* +# - feature/* +{% endif %} + ##### Pillar settings ##### ##########################################