Refactor publisher.sls and server/init.sls to support registry variable
Change-Id: I782eb9fdb2439f058d7fdc94a9d07f0873d1ef9a
diff --git a/aptly/publisher.sls b/aptly/publisher.sls
index d7b10f1..0ddb9ee 100644
--- a/aptly/publisher.sls
+++ b/aptly/publisher.sls
@@ -22,9 +22,11 @@
{%- elif publisher.source.engine == 'docker' %}
{% set publisherImage = (publisher.source.image|default('tcpcloud/aptly-publisher')).split(':') %}
+{% set registry = publisher.source.registry + "/" if publisher.source.registry is defined else "" %}
+
{{ publisherImage[0] }}:
dockerng.image_present:
- - name: {{ publisherImage[0] }}
+ - name: {{ registry }}{{ publisherImage[0] }}
{%- if publisherImage|length > 1 %}
tag: {{ publisherImage[1] }}
{%- else %}
diff --git a/aptly/server/init.sls b/aptly/server/init.sls
index a148959..632ea45 100644
--- a/aptly/server/init.sls
+++ b/aptly/server/init.sls
@@ -29,7 +29,7 @@
- source: salt://aptly/files/aptly
- template: jinja
- defaults:
- image: {{ server.source.image|default('tcpcloud/aptly') }}
+ image: {{ server.source.registry + "/" if server.source.registry is defined else "" }}{{ server.source.image|default('tcpcloud/aptly') }}
aptly_home: {{ server.home_dir }}
aptly_root: {{ server.root_dir }}
- mode: 755