commit 6efdf700a8715043ddba16e624c17fa9e9982bed
author azvyagintsev <azvyagintsev@mirantis.com> Tue Feb 27 11:31:40 2018 +0200
committer azvyagintsev <azvyagintsev@mirantis.com> Wed Feb 28 17:38:49 2018 +0200
tree 981d5038752a0f11706cbc673939e4279e27214f
parent e7f72f43ad1c7e02de727f74f0d7ef0a87093f6e

Move aptly to docker

Change-Id: I44bf69d1292c34fffb6d8b3bd34dac827d87a65f

init.yml

diff --git a/init.yml b/init.yml
index 92f9151..6d3ed47 100644
--- a/init.yml
+++ b/init.yml
@@ -1,5 +1,6 @@
 classes:
-- system.aptly.server.single
+- system.aptly.server.docker
+- system.aptly.client.publisher
 - system.aptly.server.mirror.ubuntu.trusty.mcp.apt_mk.cassandra
 - system.aptly.server.mirror.ubuntu.trusty.mcp.apt_mk.salt
 - system.aptly.server.mirror.ubuntu.trusty.mcp.apt_mk.extra
@@ -28,18 +29,21 @@
 - system.aptly.server.mirror.ubuntu.xenial.mcp.apt_mk.saltstack.salt-2016-3
 - system.debmirror.mirror_mirantis_com.ubuntu.xenial
 - system.git.server.single
-- system.linux.system.single.debian
-- service.docker.host
 - system.docker.client
-- service.docker.registry
+- system.docker.swarm.stack.aptly
+- service.docker.host
+- system.docker.swarm.manager
+- system.docker.swarm.master
+- cluster.mcp-offline.infra.docker-registry
+- service.docker.host
 parameters:
   _param:
     apt_mk_version: '2018.1'
-    mirror_mirantis_openstack_xenial_docker_legacy_gpgkeys:
-      - 58118E89F3A912897C070ADBF76221572C52609D
     aptly_gpg_keypair_id: A8272E04
     aptly_gpg_passphrase: ""
     aptly_server_secure: true
+    docker_stack_aptly_public_replicas: 1
+    docker_registry_http_secret: 'Thoh0unuaeSeeT9i'
     aptly_gpg_private_key: |
       -----BEGIN PGP PRIVATE KEY BLOCK-----
       Version: GnuPG v1
@@ -129,6 +133,7 @@
       XRqg8z44wtlroFTrnR+DgqplsellsrM+xGtZb9VrjFLeP89jzhrBWgE=
       =GLje
       -----END PGP PUBLIC KEY BLOCK-----
+
   aptly:
     server:
       mirror_update:
@@ -415,6 +420,43 @@
           host:
             name: http.mcp-offline-lab.local
             port: 8078
+        aptly_public:
+          enabled: true
+          type: nginx_proxy
+          name: aptly_public
+          proxy:
+            host: 127.0.0.1
+            port: 18085
+            protocol: http
+            size: 1G
+          host:
+            name: aptly.mcp-offline-lab.local
+            port: 80
+        aptly_api:
+          enabled: true
+          type: nginx_proxy
+          name: aptly_api
+          proxy:
+            host: 127.0.0.1
+            port: 18084
+            protocol: http
+            size: 1G
+          host:
+            name: aptly-api.mcp-offline-lab.local
+            port: 8080
+        docker_registry:
+          enabled: true
+          type: nginx_proxy
+          name: docker_registry
+          proxy:
+            host: 127.0.0.1
+            port: 15000
+            protocol: http
+            size: 1G
+          host:
+            name: registry.mcp-offline-lab.local
+            port: 5000
+
   linux:
     system:
       file:
@@ -447,6 +489,8 @@
       package:
         cloud-init:
           version: latest
+        reclass:
+          version: latest
     network:
       host:
         apt: