Fix to Horizon git source engine
Change-Id: I7121382b9082a892c2a851dba78f4739b7a256f9
diff --git a/horizon/server/multi/init.sls b/horizon/server/multi/init.sls
index 63fa6f4..dcf8b74 100644
--- a/horizon/server/multi/init.sls
+++ b/horizon/server/multi/init.sls
@@ -2,6 +2,6 @@
{%- if server.enabled %}
include:
-- horizon.server.multi.service_git
+- horizon.server.multi.service
{%- endif %}
diff --git a/horizon/server/multi/service_git.sls b/horizon/server/multi/service.sls
similarity index 100%
rename from horizon/server/multi/service_git.sls
rename to horizon/server/multi/service.sls
diff --git a/horizon/server/multi/site.sls b/horizon/server/multi/site.sls
index ed503a1..4dc8595 100644
--- a/horizon/server/multi/site.sls
+++ b/horizon/server/multi/site.sls
@@ -55,11 +55,11 @@
- name: {{ app.source.address }}
- target: /srv/horizon/sites/{{ app_name }}/extra
{%- if grains.saltversioninfo.0 > 2015 %}
+ - rev: HEAD
- branch: {{ app.source.revision }}
{%- else %}
- rev: {{ app.source.revision }}
{%- endif %}
- - depth: 1
- submodules: True
- require:
- virtualenv: /srv/horizon/sites/{{ app_name }}
@@ -259,7 +259,12 @@
{{ plugin.source.engine }}.latest:
- name: {{ plugin.source.address }}
- target: /srv/horizon/sites/{{ app_name }}/plugins/{{ plugin_name }}
+ {%- if grains.saltversioninfo.0 > 2015 %}
+ - rev: HEAD
+ - branch: {{ plugin.source.revision }}
+ {%- else %}
- rev: {{ plugin.source.revision }}
+ {%- endif %}
- submodules: True
- require:
- file: /srv/horizon/sites/{{ app_name }}/plugins