Added module for mirror configuration and moved to 2018.1 version
diff --git a/.gitmodules b/.gitmodules
index 089f541..318377b 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,6 @@
[submodule "classes/system"]
path = classes/system
url = https://github.com/Mirantis/reclass-system-salt-model.git
+[submodule "classes/cluster/mcp-offline/infra/mirror"]
+ path = classes/cluster/mcp-offline/infra/mirror
+ url = https://github.com/Mirantis/mcp-offline-model.git
diff --git a/classes/cluster/mcp-offline/infra/aptly.yml b/classes/cluster/mcp-offline/infra/aptly.yml
index c8301bd..48cc30d 100644
--- a/classes/cluster/mcp-offline/infra/aptly.yml
+++ b/classes/cluster/mcp-offline/infra/aptly.yml
@@ -1,446 +1,11 @@
classes:
-- system.aptly.server.single
-- 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
-- system.aptly.server.mirror.ubuntu.trusty.mcp.apt_mk.mitaka
-- system.aptly.server.mirror.ubuntu.trusty.mcp.apt_mk.oc323
-- system.aptly.server.mirror.ubuntu.trusty.mcp.apt_mk.openstack.mitaka
-- system.aptly.server.mirror.ubuntu.trusty.mcp.apt_mk.saltstack.salt-2016-3
-- system.aptly.server.mirror.ubuntu.xenial.mcp.apt_mk.aptly
-- system.aptly.server.mirror.ubuntu.xenial.mcp.apt_mk.cassandra
-- system.aptly.server.mirror.ubuntu.xenial.mcp.apt_mk.elastic
-- system.aptly.server.mirror.ubuntu.xenial.mcp.apt_mk.kibana.46
-- system.aptly.server.mirror.ubuntu.xenial.mcp.apt_mk.openstack.ocata
-- system.aptly.server.mirror.ubuntu.xenial.mcp.apt_mk.openstack.mitaka
-- system.aptly.server.mirror.ubuntu.xenial.mcp.apt_mk.salt
-- system.aptly.server.mirror.ubuntu.xenial.mcp.apt_mk.extra
-- system.aptly.server.mirror.ubuntu.xenial.mcp.apt_mk.ocata
-- system.aptly.server.mirror.ubuntu.xenial.mcp.apt_mk.oc323
-- system.aptly.server.mirror.ubuntu.xenial.mcp.apt_mk.influxdb
-- system.aptly.server.mirror.ubuntu.xenial.mcp.apt_mk.glusterfs
-- system.aptly.server.mirror.ubuntu.xenial.mcp.apt_mk.maas
-- system.aptly.server.mirror.ubuntu.xenial.mcp.apt_mk.docker
-- system.aptly.server.mirror.ubuntu.xenial.mcp.apt_mk.docker-legacy
-- system.aptly.server.mirror.ubuntu.xenial.mcp.apt_mk.ceph
-- system.aptly.server.mirror.ubuntu.xenial.mcp.apt_mk.grafana
-- system.aptly.server.mirror.ubuntu.xenial.mcp.apt_mk.saltstack.salt-2016-3
- system.linux.system.repo.aptly
- system.linux.system.repo.docker_legacy
-- system.git.server.single
-- service.docker.host
-- system.docker.client
-- service.docker.registry
- cluster.mcp-offline.infra
+- cluster.mcp-offline.infra.mirror
parameters:
- _param:
- apt_mk_version: '2017.12'
- aptly_gpg_keypair_id: A8272E04
- aptly_gpg_passphrase: ""
- aptly_server_secure: true
- aptly_gpg_private_key: |
- -----BEGIN PGP PRIVATE KEY BLOCK-----
- Version: GnuPG v1
-
- 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
- =QgPA
- -----END PGP PRIVATE KEY BLOCK-----
- aptly_gpg_public_key: |
- -----BEGIN PGP PUBLIC KEY BLOCK-----
- Version: GnuPG v1
-
- mQENBFnU98YBCACdTxOkxAJJQaQ4B9sEsh9s4MMOMxPSCwvzgGbk6HECDBhz2auF
- FfVydNbjLfoih8qdaLSmBQg8+FtdYJHEG1lekeiUETOxJnkhUFXq85KGNj9BbGBr
- m3/6Jo58pdMNdUMurAs807STvH3iTAhYymggX1u9GyjKbv24p2KMGuK1gC3W04NG
- qOQX3iwjmBWq87fX7tNLafptCq5A9TAv4Dvt1XZgGCiLI+EcPyfgNB1W/+EOOkFu
- jFdM43nm0YE3Bf4uuVR/u0REprYJfChdS6qYYgI3n2LuPyi9WMVVee+1RZmTwFcB
- cS53h+gq1GHOhj+YOwm3+ctmIoTNi26siutdABEBAAG0Kk1pcmFudGlzIE9mZmxp
- bmUgQXB0bHkgPGluZm9AbWlyYW50aXMuY29tPokBOAQTAQIAIgUCWdT3xgIbAwYL
- CQgHAwIGFQgCCQoLBBYCAwECHgECF4AACgkQpIXB3agnLgS9wQf7B2LiR4wQh7Vq
- Vwx1dKrhj0AXF7jSYfYJ/vtV6mXb0AxAxC3BVoW+KLPB+W9lHCXBRYXf1pJZIYcx
- v0rTGeqzpcxVmMIT1E4OAmZp8pFlBsFNTERG2z01kdnd3oddF3GSiP1cTg2+c9hJ
- UGJR0tAbPXDm0dXhuDD428IuSx5o4bdNdCshPYRe/P3CGG+KrySLL0/06UU2I5Mx
- f4pctRouWfrQDA6sIS+P58NKwIpXdWj1pPogJzVUJqHHyAUM8Ri+AZoXtKjqXAqN
- QNCd/xPaL9dtGxKTMDDKHvqyF5MpU3eYcEFIi79nunfC6Iaw+Izo+hYpiBlb2s6Q
- kCgR2y/f17kBDQRZ1PfGAQgA1NqQorh2cvogoU4DbRwnQKZDCCt4WnbvcJf8WZw7
- sINbqJm3pd/UjVwcPG0GFe9w7/eEdKv6N/fVMJYo/Dj34j2waN46sIBBaXi8pPuC
- rs/fV+KFGmdXNrOED8LeJ835+6eAm3W/930P1o/Rncfi7ANQr4nuSkzCoXhwo9n8
- RX70L1pYtGw1v3qMaDBKHGpZ0ZqSewSlQYclWG5EKg6ecR0wnLK9W62b5uExbexh
- 7d+W22NTZ9j7SVfwHG4IleZ03B+ak0NqlKpdEA9+8QLdrQsqFN8qDHqJ46ag+5xt
- pAPmw1S2va7Gkr0BMxzdxwA5d4ZauevaEKTi5NLGdNZuHQARAQABiQEfBBgBAgAJ
- BQJZ1PfGAhsMAAoJEKSFwd2oJy4E5R4H/3XjYvsalh2g4iYEOjZ1Ld55AA+NDlnp
- eXJfEOlhxdnAvkTc1CfKdT3qaN5hG0m7sVowaeVbf4cDNwIQy+R75V73h2DQpno3
- 746DDC0C2jRzDBwKrUU9Y/du3REcq4kMCnhtVBMSX6rbJoxSFdCzLu/XJd9oeXbb
- kObIeoe9FWIrswFB4NUhTHLn1bk5p8zsVbsRm3jl6ofoQmFKFoK6FauuNeB+Fc/1
- UdMpUb1Y9dpE/akgRm/79NRHKA4plQ2X/CGZu+KIw4XVn/0ilU8FbsX+KXcp8ui0
- XRqg8z44wtlroFTrnR+DgqplsellsrM+xGtZb9VrjFLeP89jzhrBWgE=
- =GLje
- aptly:
- server:
- mirror_update:
- enabled: False
- mirror:
- mcp_opencontrail_trusty_oc323:
- publisher:
- distributions:
- - ubuntu-trusty/stable
- mcp_opencontrail_xenial_oc323:
- publisher:
- distributions:
- - ubuntu-xenial/stable
- mirantis_openstack_mitaka_holdback_xenial:
- publisher:
- distributions:
- - ubuntu-xenial/openstack/mitaka/holdback/stable
- mirantis_openstack_mitaka_hotfix_xenial:
- publisher:
- distributions:
- - ubuntu-xenial/openstack/mitaka/hotfix/stable
- mirantis_openstack_mitaka_security_xenial:
- publisher:
- distributions:
- - ubuntu-xenial/openstack/mitaka/security/stable
- mirantis_openstack_mitaka_updates_xenial:
- publisher:
- distributions:
- - ubuntu-xenial/openstack/mitaka/updates/stable
- mirantis_openstack_mitaka_xenial:
- publisher:
- distributions:
- - ubuntu-xenial/openstack/mitaka/stable
- mirantis_openstack_ocata_holdback_xenial:
- publisher:
- distributions:
- - ubuntu-xenial/openstack/ocata/holdback/stable
- mirantis_openstack_ocata_hotfix_xenial:
- publisher:
- distributions:
- - ubuntu-xenial/openstack/ocata/hotfix/stable
- mirantis_openstack_ocata_security_xenial:
- publisher:
- distributions:
- - ubuntu-xenial/openstack/ocata/security/stable
- mirantis_openstack_ocata_updates_xenial:
- publisher:
- distributions:
- - ubuntu-xenial/openstack/ocata/updates/stable
- mirantis_openstack_ocata_xenial:
- publisher:
- distributions:
- - ubuntu-xenial/openstack/ocata/stable
- mirantis_openstack_trusty_cassandra:
- publisher:
- distributions:
- - ubuntu-trusty/cassandra/stable
- mirantis_openstack_xenial_cassandra:
- publisher:
- distributions:
- - ubuntu-xenial/cassandra/stable
- mirantis_openstack_trusty_extra:
- publisher:
- distributions:
- - ubuntu-trusty/stable
- mirantis_openstack_trusty_salt:
- publisher:
- distributions:
- - ubuntu-trusty/stable
- mirantis_openstack_xenial_aptly:
- publisher:
- distributions:
- - ubuntu-xenial/aptly/stable
- mirantis_openstack_xenial_ceph:
- publisher:
- distributions:
- - ubuntu-xenial/ceph/stable
- mirantis_openstack_xenial_docker:
- publisher:
- distributions:
- - ubuntu-xenial/docker/stable
- mirantis_openstack_xenial_docker_legacy:
- publisher:
- distributions:
- - ubuntu-xenial/docker/stable
- mirantis_openstack_xenial_elastic_2x:
- publisher:
- distributions:
- - ubuntu-xenial/elastic/2.x/stable
- mirantis_openstack_xenial_elastic_5x:
- publisher:
- distributions:
- - ubuntu-xenial/elastic/5.x/stable
- - ubuntu-xenial/kibana/5.x/${_param:apt_mk_version}
- - ubuntu-xenial/kibana/5.x/stable
- mirantis_openstack_xenial_extra:
- publisher:
- distributions:
- - ubuntu-xenial/stable
- mirantis_openstack_xenial_glusterfs:
- components: '3.12'
- publisher:
- distributions:
- - ubuntu-xenial/glusterfs/stable
- mirantis_openstack_xenial_grafana:
- publisher:
- distributions:
- - ubuntu-xenial/grafana/stable
- mirantis_openstack_xenial_influxdb:
- publisher:
- distributions:
- - ubuntu-xenial/influxdb/stable
- mirantis_openstack_xenial_kibana_46:
- publisher:
- distributions:
- - ubuntu-xenial/kibana/4.6/stable
- mirantis_openstack_xenial_maas:
- publisher:
- distributions:
- - ubuntu-xenial/maas/stable
- mirantis_openstack_xenial_salt:
- publisher:
- distributions:
- - ubuntu-xenial/stable
- mirantis_openstack_xenial_saltstack_2016_3:
- publisher:
- distributions:
- - ubuntu-xenial/salt/2016.3/stable
- mirantis_openstack_trusty_saltstack_2016_3:
- publisher:
- distributions:
- - ubuntu-trusty/salt/2016.3/stable
- mk_openstack_xenial_mitaka:
- publisher:
- distributions:
- - ubuntu-trusty/stable
- mk_openstack_xenial_ocata:
- publisher:
- distributions:
- - ubuntu-xenial/stable
- docker:
- host:
- insecure_registries:
- - apt:5000
- options:
- bip: 10.99.0.1/16
- fixed-cidr: 10.99.0.1/17
- client:
- registry:
- target_registry: apt:5000
- image:
- - registry: docker-prod-local.artifactory.mirantis.com/mirantis/external
- name: registry:${_param:apt_mk_version}
- - registry: docker-prod-local.artifactory.mirantis.com/mirantis/external
- name: compose:${_param:apt_mk_version}
- - registry: docker-prod-local.artifactory.mirantis.com/mirantis/external
- name: openldap:${_param:apt_mk_version}
- - registry: docker-prod-local.artifactory.mirantis.com/mirantis/cicd
- name: aptly:${_param:apt_mk_version}
- - registry: docker-prod-local.artifactory.mirantis.com/mirantis/cicd
- name: aptly-public:${_param:apt_mk_version}
- - registry: docker-prod-local.artifactory.mirantis.com/mirantis/cicd
- name: aptly-api:${_param:apt_mk_version}
- - registry: docker-prod-local.artifactory.mirantis.com/mirantis/cicd
- name: aptly-publisher:${_param:apt_mk_version}
- - registry: docker-prod-local.artifactory.mirantis.com/mirantis/cicd
- name: jnlp-slave:${_param:apt_mk_version}
- - registry: docker-prod-local.artifactory.mirantis.com/mirantis/cicd
- name: phpldapadmin:${_param:apt_mk_version}
- - registry: docker-prod-local.artifactory.mirantis.com/mirantis/cicd
- name: jenkins:${_param:apt_mk_version}
- - registry: docker-prod-local.artifactory.mirantis.com/mirantis/cicd
- name: gerrit:${_param:apt_mk_version}
- - registry: docker-prod-local.artifactory.mirantis.com/mirantis/cicd
- name: mysql:${_param:apt_mk_version}
- - registry: docker-prod-local.artifactory.mirantis.com/mirantis/external
- name: grafana:${_param:apt_mk_version}
- - registry: docker-prod-local.artifactory.mirantis.com/mirantis/external
- name: visualizer:${_param:apt_mk_version}
- - registry: docker-prod-local.artifactory.mirantis.com/mirantis/external
- name: elasticsearch:${_param:apt_mk_version}
- - registry: docker-prod-local.artifactory.mirantis.com/mirantis/external
- name: mongo:${_param:apt_mk_version}
- - registry: docker-prod-local.artifactory.mirantis.com/mirantis/external
- name: postgres:${_param:apt_mk_version}
- - registry: docker-prod-local.artifactory.mirantis.com/openstack-docker
- name: heka:${_param:apt_mk_version}
- - registry: docker-prod-local.artifactory.mirantis.com/mirantis/oss
- name: security-monkey-api:${_param:apt_mk_version}
- - registry: docker-prod-local.artifactory.mirantis.com/mirantis/oss
- name: security-monkey-scheduler:${_param:apt_mk_version}
- - registry: docker-prod-local.artifactory.mirantis.com/mirantis/oss
- name: janitor-monkey:${_param:apt_mk_version}
- - registry: docker-prod-local.artifactory.mirantis.com/mirantis/oss
- name: rundeck:${_param:apt_mk_version}
- - registry: docker-prod-local.artifactory.mirantis.com/mirantis/oss
- name: devops-portal:${_param:apt_mk_version}
- - registry: docker-prod-local.artifactory.mirantis.com/mirantis/oss
- name: pushkin:${_param:apt_mk_version}
- - registry: docker-prod-local.artifactory.mirantis.com/openstack-docker
- name: alertmanager:${_param:apt_mk_version}
- - registry: docker-prod-local.artifactory.mirantis.com/openstack-docker
- name: pushgateway:${_param:apt_mk_version}
- - registry: docker-prod-local.artifactory.mirantis.com/openstack-docker
- name: prometheus:${_param:apt_mk_version}
- - registry: docker-prod-local.artifactory.mirantis.com/openstack-docker
- name: telegraf:${_param:apt_mk_version}
- - registry: docker-prod-local.artifactory.mirantis.com/openstack-docker
- name: remote_storage_adapter:${_param:apt_mk_version}
- - registry: docker-prod-local.artifactory.mirantis.com/openstack-docker
- name: prometheus_relay:${_param:apt_mk_version}
- - registry: docker-prod-local.artifactory.mirantis.com/mirantis/kubernetes/contrail-integration
- name: contrail-cni:${_param:apt_mk_version}
- - registry: docker-prod-local.artifactory.mirantis.com/mirantis/kubernetes/contrail-integration
- name: contrail-network-controller:${_param:apt_mk_version}
- - registry: docker-prod-local.artifactory.mirantis.com/mirantis/kubernetes
- name: hyperkube-amd64:${_param:apt_mk_version}
- - registry: docker-prod-local.artifactory.mirantis.com/mirantis/external
- name: pause:${_param:apt_mk_version}
- - registry: docker-prod-local.artifactory.mirantis.com/mirantis/kubernetes
- name: virtlet:${_param:apt_mk_version}
- - registry: docker-prod-local.artifactory.mirantis.com/mirantis/external
- name: kubernetes-dashboard-amd64:${_param:apt_mk_version}
- - registry: docker-prod-local.artifactory.mirantis.com/mirantis/external
- name: k8s-dns-kube-dns-amd64:${_param:apt_mk_version}
- - registry: docker-prod-local.artifactory.mirantis.com/mirantis/external
- name: k8s-dns-dnsmasq-amd64:${_param:apt_mk_version}
- - registry: docker-prod-local.artifactory.mirantis.com/mirantis/external
- name: k8s-dns-sidecar-amd64:${_param:apt_mk_version}
- - registry: docker-prod-local.artifactory.mirantis.com/mirantis/external
- name: cluster-proportional-autoscaler-amd64:${_param:apt_mk_version}
- - registry: docker-prod-local.artifactory.mirantis.com/mirantis/kubernetes
- name: k8s-netchecker-agent:${_param:apt_mk_version}
- - registry: docker-prod-local.artifactory.mirantis.com/mirantis/kubernetes
- name: k8s-netchecker-server:${_param:apt_mk_version}
- - registry: docker-prod-local.artifactory.mirantis.com/mirantis/external
- name: etcd:${_param:apt_mk_version}
- - registry: docker-prod-local.artifactory.mirantis.com/mirantis/external
- name: etcd-operator:${_param:apt_mk_version}
- - registry: docker-prod-local.artifactory.mirantis.com/mirantis/external
- name: tiller:${_param:apt_mk_version}
- - registry: docker-prod-local.artifactory.mirantis.com/mirantis/projectcalico/calico
- name: ctl:${_param:apt_mk_version}
- - registry: docker-prod-local.artifactory.mirantis.com/mirantis/projectcalico/calico
- name: node:${_param:apt_mk_version}
- - registry: docker-prod-local.artifactory.mirantis.com/mirantis/projectcalico/calico
- name: cni:${_param:apt_mk_version}
- - registry: docker-prod-local.artifactory.mirantis.com/mirantis/external
- name: kube-policy-controller:${_param:apt_mk_version}
- - registry: docker-prod-local.artifactory.mirantis.com/mirantis/external
- name: external-dns:${_param:apt_mk_version}
- - registry: docker-prod-local.artifactory.mirantis.com/mirantis/oss
- name: qa-tools:${_param:apt_mk_version}
- git:
- server:
- directory: /srv/git/
- repos:
- - name: gerritlib
- url: https://github.com/openstack-infra/gerritlib.git
- - name: jeepyb
- url: https://github.com/openstack-infra/jeepyb.git
- - name: mk-pipelines
- url: https://gerrit.mcp.mirantis.net/mk/mk-pipelines.git
- - name: pipeline-library
- url: https://gerrit.mcp.mirantis.net/mcp-ci/pipeline-library.git
- - name: rundeck-cis-jobs
- url: https://github.com/Mirantis/rundeck-cis-jobs.git
- nginx:
- server:
- site:
- pip_server:
- enabled: true
- type: nginx_static
- name: pip_server
- root: /srv/pypi_mirror/packages/simple
- autoindex: True
- access_policy:
- allow:
- - all
- host:
- name: pipy.mcp-offline-lab.local
- port: 8084
- http_server:
- enabled: true
- type: nginx_static
- name: http_server
- root: /srv/http
- autoindex: True
- access_policy:
- allow:
- - all
- host:
- name: http.mcp-offline-lab.local
- port: 8078
linux:
system:
- profile:
- locales: |
- export LC_ALL=C
- directory:
- /srv/http/images:
- user: root
- group: root
- mode: 755
- makedirs: true
- /srv/scripts/:
- user: root
- group: root
- mode: 755
- makedirs: true
- /srv/pypi_mirror/packages/:
- user: root
- group: root
- mode: 755
- makedirs: true
repo:
debian_sid:
source: "deb http://ftp.cz.debian.org/debian sid main"
@@ -454,14 +19,3 @@
- pin: 'origin "ftp.cz.debian.org"'
priority: 500
package: 'aptly-publisher'
- package:
- cloud-init:
- version: latest
- debmirror:
- version: latest
- network:
- host:
- apt:
- address: 127.0.0.1
- names:
- - apt
\ No newline at end of file
diff --git a/classes/cluster/mcp-offline/infra/init.yml b/classes/cluster/mcp-offline/infra/init.yml
index d099f9d..86dff99 100644
--- a/classes/cluster/mcp-offline/infra/init.yml
+++ b/classes/cluster/mcp-offline/infra/init.yml
@@ -7,7 +7,7 @@
# Don't set it "false" before you configure sudo policies and enable power users.
# linux_system_user_sudo: true
docker_compose_image: apt:5000/compose:1.8.0
- apt_mk_version: "2017.12"
+ apt_mk_version: "2018.1"
aptly_server_hostname: apt
aptly_server_address: 10.1.0.14
linux_repo_refresh_db: true
diff --git a/classes/cluster/mcp-offline/infra/mirror b/classes/cluster/mcp-offline/infra/mirror
new file mode 160000
index 0000000..760a553
--- /dev/null
+++ b/classes/cluster/mcp-offline/infra/mirror
@@ -0,0 +1 @@
+Subproject commit 760a5538f6635fd0cfdf00ef0fca7c143c8557e1
diff --git a/classes/system b/classes/system
index e29ba01..9e73068 160000
--- a/classes/system
+++ b/classes/system
@@ -1 +1 @@
-Subproject commit e29ba018800292a80e4c38237bfc0417983c30ec
+Subproject commit 9e73068864891b369515ce1e817cbdf23c755366