commit 616f637854dc45e6ce2cf3c6ed289151a4c5d7b9
author Ales Komarek <akomarek@mirantis.com> Tue Jul 04 14:34:35 2017 +0000
committer Gerrit Code Review <gerrit2@32a4cf582fa9> Tue Jul 04 14:34:37 2017 +0000
tree ddec7de665e3843396c2398c7ddce68de056a853
parent 6d8fb0c3f04b2fe8d2424be242919e350dee9fcf
parent 3d81c6863ba300113fc4af2c2b0e0e2d1838de31

Merge changes I4d3e36d2,I675bb777

* changes:
  Add new system class for artifactory
  remove hardcoded parameter for artifactory docker image

artifactory/client/init.yml

diff --git a/artifactory/client/init.yml b/artifactory/client/init.yml
new file mode 100644
index 0000000..9aea48b
--- /dev/null
+++ b/artifactory/client/init.yml
@@ -0,0 +1,22 @@
+parameters:
+  artifactory:
+    client:
+        enabled: True
+        source:
+          engine: pip
+        server:
+          host: ${_param:artifactory_server_host}
+          port: ${_param:artifactory_server_port}
+          user: ${_param:artifactory_client_user}
+          password: ${_param:artifactory_client_password}
+          ssl_verify: False
+        repo:
+          local_artifactory_repo:
+            name: local_artifactory_repo
+            package_type: generic
+            repo_type: local
+          remote_artifactory_repo:
+            name: remote_artifactory_repo
+            package_type: generic
+            repo_type: remote
+            url: "http://artifactory.mcp.mirantis.net/"

docker/swarm/stack/artifactory.yml

diff --git a/docker/swarm/stack/artifactory.yml b/docker/swarm/stack/artifactory.yml
index cda48fe..411b22e 100644
--- a/docker/swarm/stack/artifactory.yml
+++ b/docker/swarm/stack/artifactory.yml
@@ -13,7 +13,7 @@
               deploy:
                 restart_policy:
                   condition: any
-              image: ${_param:docker_image_repository:cicd}/artifactory
+              image: ${_param:docker_image_repository:cicd}
               ports:
                 - 18082:8081
               volumes: