Updated the windows repository support
Change-Id: I9d834d67e29d7c6d0b11599b0b543427cf1d7706
diff --git a/README.rst b/README.rst
index d61fedb..5eecf1a 100644
--- a/README.rst
+++ b/README.rst
@@ -273,6 +273,17 @@
master:
pillar_safe_render_error: False
+Enable Windows repo support
+
+.. code-block:: yaml
+
+ salt:
+ master:
+ win_repo:
+ source: git
+ address: https://github.com/saltstack/salt-winrepo-ng
+ revision: master
+
Event/Reactor Systems
~~~~~~~~~~~~~~~~~~~~~
diff --git a/salt/master/init.sls b/salt/master/init.sls
index 8b79bd3..0352299 100644
--- a/salt/master/init.sls
+++ b/salt/master/init.sls
@@ -6,7 +6,7 @@
- salt.master.env
- salt.master.pillar
- salt.master.minion
-{%- if pillar.salt.master.windows_repo is defined %}
+{%- if pillar.salt.master.win_repo is defined %}
- salt.master.win_repo
{%- endif %}
{%- if pillar.salt.master.ssh is defined %}
diff --git a/salt/master/win_repo.sls b/salt/master/win_repo.sls
index ef41129..e3c88df 100644
--- a/salt/master/win_repo.sls
+++ b/salt/master/win_repo.sls
@@ -5,45 +5,28 @@
- git.client
- salt.master.service
-{%- if master.windows_repo is defined %}
-
/srv/salt/win:
file.directory:
- user: root
- mode: 755
- makedirs: true
- - require:
- - file: /srv/salt/env
-{%- if master.windows_repo.source == 'git' %}
+{%- if master.win_repo.source == 'git' %}
-{{ master.windows_repo.address }}:
+{{ master.win_repo.address }}:
git.latest:
- target: /srv/salt/win/repo
- - rev: {{ master.windows_repo.branch }}
+ - rev: {{ master.win_repo.branch }}
- require:
- file: /srv/salt/win
- pkg: git_packages
salt_master_update_win_repo:
- cmd.run:
+ cmd.wait:
- name: salt-run winrepo.genrepo
- - require:
- - git: {{ master.windows_repo.address }}
-
-{%- for environment in master.environments %}
-
-/srv/salt/env/{{ name }}/win:
- file.symlink:
- - target: /srv/salt/win
- - require:
- - file: /srv/salt/env/{{ name }}
- - git: {{ master.windows_repo.address }}
-
-{%- endfor %}
+ - watch:
+ - git: {{ master.win_repo.address }}
{%- endif %}
{%- endif %}
-
-{%- endif %}
\ No newline at end of file
diff --git a/salt/test.sls b/salt/test.sls
new file mode 100644
index 0000000..5278cdf
--- /dev/null
+++ b/salt/test.sls
@@ -0,0 +1,9 @@
+
+haproxy_config:
+ file.managed:
+ - name: /tmp/haproxy_config
+ - contents: |
+{%- for server, addrs in salt['mine.get']('roles:salt:master', 'grains.items', expr_form='pillar').items() %}
+ server {{ server }} {{ addrs[0] }}:80 check
+{%- endfor %}
+ - template: jinja
\ No newline at end of file