Update model for offline image
* Fix typos for default offline images names
* Update debmirror repos
* Add entropy for aptly container
* Update MAAS configs
Change-Id: I700216f3727023a36e579da08c0f416b67a94cf8
Related-Prod: PROD-32735
diff --git a/debmirror/mirror_mirantis_com/cassandra/xenial.yml b/debmirror/mirror_mirantis_com/cassandra/xenial.yml
index 4527a63..d096854 100644
--- a/debmirror/mirror_mirantis_com/cassandra/xenial.yml
+++ b/debmirror/mirror_mirantis_com/cassandra/xenial.yml
@@ -1,3 +1,5 @@
+classes:
+- system.defaults.debmirror
parameters:
debmirror:
client:
@@ -7,10 +9,10 @@
force: ${_param:mirror_mirantis_com_cassandra_xenial_force}
lock_target: True
extra_flags: [ '--verbose', '--progress', '--nosource', '--no-check-gpg', '--rsync-extra=none' ]
- method: "rsync"
+ method: "${_param:debmirror_mirrors_sync_method}"
arch: [ 'amd64' ]
- mirror_host: "mirror.mirantis.com"
- mirror_root: ":mirror/${_param:mcp_version}/cassandra/xenial/"
+ mirror_host: "${_param:debmirror_mirrors_host}"
+ mirror_root: "${_param:debmirror_mirrors_root}/cassandra/xenial/"
target_dir: "${_param:debmirror_mirrors_base_target_dir}/cassandra/xenial/"
log_file: "/var/log/debmirror/mirror_mirantis_com_cassandra_xenial.log"
dist: [ "21x" ]
diff --git a/debmirror/mirror_mirantis_com/ceph-luminous/xenial.yml b/debmirror/mirror_mirantis_com/ceph-luminous/xenial.yml
index ec4bb7d..2e90d54 100644
--- a/debmirror/mirror_mirantis_com/ceph-luminous/xenial.yml
+++ b/debmirror/mirror_mirantis_com/ceph-luminous/xenial.yml
@@ -1,3 +1,5 @@
+classes:
+- system.defaults.debmirror
parameters:
debmirror:
client:
@@ -7,10 +9,10 @@
force: ${_param:mirror_mirantis_com_ceph_luminous_xenial_force}
lock_target: True
extra_flags: [ '--verbose', '--progress', '--nosource', '--no-check-gpg', '--rsync-extra=none' ]
- method: "rsync"
+ method: "${_param:debmirror_mirrors_sync_method}"
arch: [ 'amd64' ]
- mirror_host: "mirror.mirantis.com"
- mirror_root: ":mirror/${_param:mcp_version}/ceph-luminous/xenial/"
+ mirror_host: "${_param:debmirror_mirrors_host}"
+ mirror_root: "${_param:debmirror_mirrors_root}/ceph-luminous/xenial/"
target_dir: "${_param:debmirror_mirrors_base_target_dir}/ceph-luminous/xenial/"
log_file: "/var/log/debmirror/mirror_mirantis_com_ceph_luminous_xenial.log"
dist: [ xenial ]
diff --git a/debmirror/mirror_mirantis_com/docker/xenial.yml b/debmirror/mirror_mirantis_com/docker/xenial.yml
index e4cffaa..dca5d99 100644
--- a/debmirror/mirror_mirantis_com/docker/xenial.yml
+++ b/debmirror/mirror_mirantis_com/docker/xenial.yml
@@ -1,3 +1,5 @@
+classes:
+- system.defaults.debmirror
parameters:
debmirror:
client:
@@ -7,10 +9,10 @@
force: ${_param:mirror_mirantis_com_docker_xenial_force}
lock_target: True
extra_flags: [ '--verbose', '--progress', '--nosource', '--no-check-gpg', '--rsync-extra=none' ]
- method: "rsync"
+ method: "${_param:debmirror_mirrors_sync_method}"
arch: [ 'amd64' ]
- mirror_host: "mirror.mirantis.com"
- mirror_root: ":mirror/${_param:mcp_version}/docker/xenial/"
+ mirror_host: "${_param:debmirror_mirrors_host}"
+ mirror_root: "${_param:debmirror_mirrors_root}/docker/xenial/"
target_dir: "${_param:debmirror_mirrors_base_target_dir}/docker/xenial/"
log_file: "/var/log/debmirror/mirror_mirantis_com_docker_xenial.log"
dist: [ xenial ]
diff --git a/debmirror/mirror_mirantis_com/elasticsearch-5.x/xenial.yml b/debmirror/mirror_mirantis_com/elasticsearch-5.x/xenial.yml
index 97d2cd3..f9ce996 100644
--- a/debmirror/mirror_mirantis_com/elasticsearch-5.x/xenial.yml
+++ b/debmirror/mirror_mirantis_com/elasticsearch-5.x/xenial.yml
@@ -1,3 +1,5 @@
+classes:
+- system.defaults.debmirror
parameters:
debmirror:
client:
@@ -8,10 +10,10 @@
force: ${_param:mirror_mirantis_com_elasticsearch_5_x_xenial_force}
lock_target: True
extra_flags: [ '--verbose', '--progress', '--nosource', '--no-check-gpg', '--rsync-extra=none' ]
- method: "rsync"
+ method: "${_param:debmirror_mirrors_sync_method}"
arch: [ 'amd64' ]
- mirror_host: "mirror.mirantis.com"
- mirror_root: ":mirror/${_param:mcp_version}/elasticsearch-5.x/xenial/"
+ mirror_host: "${_param:debmirror_mirrors_host}"
+ mirror_root: "${_param:debmirror_mirrors_root}/elasticsearch-5.x/xenial/"
target_dir: "${_param:debmirror_mirrors_base_target_dir}/elasticsearch-5.x/xenial/"
log_file: "/var/log/debmirror/mirror_mirantis_com_elasticsearch_5_x_xenial.log"
dist: [ stable ]
diff --git a/debmirror/mirror_mirantis_com/elasticsearch-6.x/xenial.yml b/debmirror/mirror_mirantis_com/elasticsearch-6.x/xenial.yml
index 2c60c82..445f56b 100644
--- a/debmirror/mirror_mirantis_com/elasticsearch-6.x/xenial.yml
+++ b/debmirror/mirror_mirantis_com/elasticsearch-6.x/xenial.yml
@@ -1,3 +1,5 @@
+classes:
+- system.defaults.debmirror
parameters:
debmirror:
client:
@@ -8,10 +10,10 @@
force: ${_param:mirror_mirantis_com_elasticsearch_6_x_xenial_force}
lock_target: True
extra_flags: [ '--verbose', '--progress', '--nosource', '--no-check-gpg', '--rsync-extra=none' ]
- method: "rsync"
+ method: "${_param:debmirror_mirrors_sync_method}"
arch: [ 'amd64' ]
- mirror_host: "mirror.mirantis.com"
- mirror_root: ":mirror/${_param:mcp_version}/elasticsearch-6.x/xenial/"
+ mirror_host: "${_param:debmirror_mirrors_host}"
+ mirror_root: "${_param:debmirror_mirrors_root}/elasticsearch-6.x/xenial/"
target_dir: "${_param:debmirror_mirrors_base_target_dir}/elasticsearch-6.x/xenial/"
log_file: "/var/log/debmirror/mirror_mirantis_com_elasticsearch_6_x_xenial.log"
dist: [ stable ]
diff --git a/debmirror/mirror_mirantis_com/elasticsearch-curator-5/xenial.yml b/debmirror/mirror_mirantis_com/elasticsearch-curator-5/xenial.yml
index 5ee8741..ec61542 100644
--- a/debmirror/mirror_mirantis_com/elasticsearch-curator-5/xenial.yml
+++ b/debmirror/mirror_mirantis_com/elasticsearch-curator-5/xenial.yml
@@ -1,3 +1,5 @@
+classes:
+- system.defaults.debmirror
parameters:
debmirror:
client:
@@ -8,10 +10,10 @@
force: ${_param:mirror_mirantis_com_elasticsearch_curator_5_xenial_force}
lock_target: True
extra_flags: [ '--verbose', '--progress', '--nosource', '--no-check-gpg', '--rsync-extra=none' ]
- method: "rsync"
+ method: "${_param:debmirror_mirrors_sync_method}"
arch: [ 'amd64' ]
- mirror_host: "mirror.mirantis.com"
- mirror_root: ":mirror/${_param:mcp_version}/elasticsearch-curator-5/xenial/"
+ mirror_host: "${_param:debmirror_mirrors_host}"
+ mirror_root: "${_param:debmirror_mirrors_root}/elasticsearch-curator-5/xenial/"
target_dir: "${_param:debmirror_mirrors_base_target_dir}/elasticsearch-curator-5/xenial/"
log_file: "/var/log/debmirror/mirror_mirantis_com_elasticsearch_curator_5_xenial.log"
dist: [ stable ]
diff --git a/debmirror/mirror_mirantis_com/extra/xenial.yml b/debmirror/mirror_mirantis_com/extra/xenial.yml
index f5ed991..2615ee5 100644
--- a/debmirror/mirror_mirantis_com/extra/xenial.yml
+++ b/debmirror/mirror_mirantis_com/extra/xenial.yml
@@ -1,3 +1,5 @@
+classes:
+- system.defaults.debmirror
parameters:
debmirror:
client:
@@ -7,10 +9,10 @@
force: ${_param:mirror_mirantis_com_extra_xenial_force}
lock_target: True
extra_flags: [ '--verbose', '--progress', '--nosource', '--no-check-gpg', '--rsync-extra=none' ]
- method: "rsync"
+ method: "${_param:debmirror_mirrors_sync_method}"
arch: [ 'amd64' ]
- mirror_host: "mirror.mirantis.com"
- mirror_root: ":mirror/${_param:mcp_version}/extra/xenial/"
+ mirror_host: "${_param:debmirror_mirrors_host}"
+ mirror_root: "${_param:debmirror_mirrors_root}/extra/xenial/"
target_dir: "${_param:debmirror_mirrors_base_target_dir}/extra/xenial/"
log_file: "/var/log/debmirror/mirror_mirantis_com_extra_xenial.log"
dist: [ xenial ]
diff --git a/debmirror/mirror_mirantis_com/glusterfs-3.8/xenial.yml b/debmirror/mirror_mirantis_com/glusterfs-3.8/xenial.yml
index fbac95e..a080ad5 100644
--- a/debmirror/mirror_mirantis_com/glusterfs-3.8/xenial.yml
+++ b/debmirror/mirror_mirantis_com/glusterfs-3.8/xenial.yml
@@ -1,3 +1,5 @@
+classes:
+- system.defaults.debmirror
parameters:
debmirror:
client:
@@ -7,10 +9,10 @@
force: ${_param:mirror_mirantis_com_glusterfs_3_8_xenial_force}
lock_target: True
extra_flags: [ '--verbose', '--progress', '--nosource', '--no-check-gpg', '--rsync-extra=none' ]
- method: "rsync"
+ method: "${_param:debmirror_mirrors_sync_method}"
arch: [ 'amd64' ]
- mirror_host: "mirror.mirantis.com"
- mirror_root: ":mirror/${_param:mcp_version}/glusterfs-3.8/xenial/"
+ mirror_host: "${_param:debmirror_mirrors_host}"
+ mirror_root: "${_param:debmirror_mirrors_root}/glusterfs-3.8/xenial/"
target_dir: "${_param:debmirror_mirrors_base_target_dir}/glusterfs-3.8/xenial/"
log_file: "/var/log/debmirror/mirror_mirantis_com_glusterfs_3_8_xenial.log"
dist: [ xenial ]
diff --git a/debmirror/mirror_mirantis_com/glusterfs-5/xenial.yml b/debmirror/mirror_mirantis_com/glusterfs-5/xenial.yml
new file mode 100644
index 0000000..ef433a7
--- /dev/null
+++ b/debmirror/mirror_mirantis_com/glusterfs-5/xenial.yml
@@ -0,0 +1,21 @@
+classes:
+- system.defaults.debmirror
+parameters:
+ debmirror:
+ client:
+ enabled: true
+ mirrors:
+ mirror_mirantis_com_glusterfs_5_xenial:
+ force: ${_param:mirror_mirantis_com_glusterfs_5_xenial_force}
+ lock_target: True
+ extra_flags: [ '--verbose', '--progress', '--nosource', '--no-check-gpg', '--rsync-extra=none' ]
+ method: "${_param:debmirror_mirrors_sync_method}"
+ arch: [ 'amd64' ]
+ mirror_host: "${_param:debmirror_mirrors_host}"
+ mirror_root: "${_param:debmirror_mirrors_root}/glusterfs-5/xenial/"
+ target_dir: "${_param:debmirror_mirrors_base_target_dir}/glusterfs-5/xenial/"
+ log_file: "/var/log/debmirror/mirror_mirantis_com_glusterfs_5_xenial.log"
+ dist: [ xenial ]
+ section: [ main ]
+ filter:
+ 001: "--exclude='-dbg_'"
diff --git a/debmirror/mirror_mirantis_com/init.yml b/debmirror/mirror_mirantis_com/init.yml
index 68f7530..753a3a4 100644
--- a/debmirror/mirror_mirantis_com/init.yml
+++ b/debmirror/mirror_mirantis_com/init.yml
@@ -1,17 +1,36 @@
classes:
- system.debmirror.mirror_mirantis_com.cassandra.xenial
+- system.debmirror.mirror_mirantis_com.update.cassandra.xenial
- system.debmirror.mirror_mirantis_com.ceph-luminous.xenial
+- system.debmirror.mirror_mirantis_com.update.ceph-luminous.xenial
- system.debmirror.mirror_mirantis_com.docker.xenial
+- system.debmirror.mirror_mirantis_com.update.docker.xenial
- system.debmirror.mirror_mirantis_com.elasticsearch-5.x.xenial
+- system.debmirror.mirror_mirantis_com.update.elasticsearch-5.x.xenial
- system.debmirror.mirror_mirantis_com.elasticsearch-6.x.xenial
+- system.debmirror.mirror_mirantis_com.update.elasticsearch-6.x.xenial
- system.debmirror.mirror_mirantis_com.elasticsearch-curator-5.xenial
+- system.debmirror.mirror_mirantis_com.update.elasticsearch-curator-5.xenial
- system.debmirror.mirror_mirantis_com.extra.xenial
+- system.debmirror.mirror_mirantis_com.update.extra.xenial
- system.debmirror.mirror_mirantis_com.glusterfs-3.8.xenial
+- system.debmirror.mirror_mirantis_com.glusterfs-5.xenial
+- system.debmirror.mirror_mirantis_com.update.glusterfs-5.xenial
- system.debmirror.mirror_mirantis_com.maas.xenial
+- system.debmirror.mirror_mirantis_com.update.maas.xenial
+- system.debmirror.mirror_mirantis_com.opencontrail-4.1.xenial
+- system.debmirror.mirror_mirantis_com.update.opencontrail-4.1.xenial
- system.debmirror.mirror_mirantis_com.openstack-pike.xenial
+- system.debmirror.mirror_mirantis_com.update.openstack-pike.xenial
- system.debmirror.mirror_mirantis_com.openstack-queens.xenial
+- system.debmirror.mirror_mirantis_com.update.openstack-queens.xenial
- system.debmirror.mirror_mirantis_com.percona.xenial
+- system.debmirror.mirror_mirantis_com.update.percona.xenial
- system.debmirror.mirror_mirantis_com.salt-formulas.xenial
+- system.debmirror.mirror_mirantis_com.update.salt-formulas.xenial
- system.debmirror.mirror_mirantis_com.saltstack-2017.7.xenial
+- system.debmirror.mirror_mirantis_com.update.saltstack-2017.7.xenial
- system.debmirror.mirror_mirantis_com.td-agent.xenial
+- system.debmirror.mirror_mirantis_com.update.td-agent.xenial
- system.debmirror.mirror_mirantis_com.ubuntu.xenial
+- system.debmirror.mirror_mirantis_com.update.ubuntu.xenial
diff --git a/debmirror/mirror_mirantis_com/maas/xenial.yml b/debmirror/mirror_mirantis_com/maas/xenial.yml
index c19c0a2..cc3aaa1 100644
--- a/debmirror/mirror_mirantis_com/maas/xenial.yml
+++ b/debmirror/mirror_mirantis_com/maas/xenial.yml
@@ -1,3 +1,5 @@
+classes:
+- system.defaults.debmirror
parameters:
debmirror:
client:
@@ -7,10 +9,10 @@
force: ${_param:mirror_mirantis_com_maas_xenial_force}
lock_target: True
extra_flags: [ '--verbose', '--progress', '--nosource', '--no-check-gpg', '--rsync-extra=none' ]
- method: "rsync"
+ method: "${_param:debmirror_mirrors_sync_method}"
arch: [ 'amd64' ]
- mirror_host: "mirror.mirantis.com"
- mirror_root: ":mirror/${_param:mcp_version}/maas/xenial/"
+ mirror_host: "${_param:debmirror_mirrors_host}"
+ mirror_root: "${_param:debmirror_mirrors_root}/maas/xenial/"
target_dir: "${_param:debmirror_mirrors_base_target_dir}/maas/xenial/"
log_file: "/var/log/debmirror/mirror_mirantis_com_maas_xenial.log"
dist: [ xenial ]
diff --git a/debmirror/mirror_mirantis_com/opencontrail-4.0/xenial.yml b/debmirror/mirror_mirantis_com/opencontrail-4.0/xenial.yml
index 38b13b1..b637715 100644
--- a/debmirror/mirror_mirantis_com/opencontrail-4.0/xenial.yml
+++ b/debmirror/mirror_mirantis_com/opencontrail-4.0/xenial.yml
@@ -1,3 +1,5 @@
+classes:
+- system.defaults.debmirror
parameters:
debmirror:
client:
@@ -7,10 +9,10 @@
force: ${_param:mirror_mirantis_com_oc40_xenial_force}
lock_target: True
extra_flags: [ '--verbose', '--progress', '--nosource', '--no-check-gpg', '--rsync-extra=none' ]
- method: "rsync"
+ method: "${_param:debmirror_mirrors_sync_method}"
arch: [ 'amd64' ]
- mirror_host: "mirror.mirantis.com"
- mirror_root: ":mirror/${_param:mcp_version}/opencontrail-4.0/xenial/"
+ mirror_host: "${_param:debmirror_mirrors_host}"
+ mirror_root: "${_param:debmirror_mirrors_root}/opencontrail-4.0/xenial/"
target_dir: "${_param:debmirror_mirrors_base_target_dir}/opencontrail-4.0/xenial/"
log_file: "/var/log/debmirror/mirror_mirantis_com_oc40_xenial.log"
dist: [ xenial ]
diff --git a/debmirror/mirror_mirantis_com/opencontrail-4.1/xenial.yml b/debmirror/mirror_mirantis_com/opencontrail-4.1/xenial.yml
index e7d6b2b..72cf29a 100644
--- a/debmirror/mirror_mirantis_com/opencontrail-4.1/xenial.yml
+++ b/debmirror/mirror_mirantis_com/opencontrail-4.1/xenial.yml
@@ -1,3 +1,5 @@
+classes:
+- system.defaults.debmirror
parameters:
debmirror:
client:
@@ -7,10 +9,10 @@
force: ${_param:mirror_mirantis_com_oc41_xenial_force}
lock_target: True
extra_flags: [ '--verbose', '--progress', '--nosource', '--no-check-gpg', '--rsync-extra=none' ]
- method: "rsync"
+ method: "${_param:debmirror_mirrors_sync_method}"
arch: [ 'amd64' ]
- mirror_host: "mirror.mirantis.com"
- mirror_root: ":mirror/${_param:mcp_version}/opencontrail-4.1/xenial/"
+ mirror_host: "${_param:debmirror_mirrors_host}"
+ mirror_root: "${_param:debmirror_mirrors_root}/opencontrail-4.1/xenial/"
target_dir: "${_param:debmirror_mirrors_base_target_dir}/opencontrail-4.1/xenial/"
log_file: "/var/log/debmirror/mirror_mirantis_com_oc41_xenial.log"
dist: [ xenial ]
diff --git a/debmirror/mirror_mirantis_com/openstack-pike/xenial.yml b/debmirror/mirror_mirantis_com/openstack-pike/xenial.yml
index e664637..86dd3b2 100644
--- a/debmirror/mirror_mirantis_com/openstack-pike/xenial.yml
+++ b/debmirror/mirror_mirantis_com/openstack-pike/xenial.yml
@@ -1,3 +1,5 @@
+classes:
+- system.defaults.debmirror
parameters:
debmirror:
client:
@@ -7,10 +9,10 @@
force: ${_param:mirror_mirantis_com_openstack_pike_xenial_force}
lock_target: True
extra_flags: [ '--verbose', '--progress', '--nosource', '--no-check-gpg', '--rsync-extra=none' ]
- method: "rsync"
+ method: "${_param:debmirror_mirrors_sync_method}"
arch: [ 'amd64' ]
- mirror_host: "mirror.mirantis.com"
- mirror_root: ":mirror/${_param:mcp_version}/openstack-pike/xenial/"
+ mirror_host: "${_param:debmirror_mirrors_host}"
+ mirror_root: "${_param:debmirror_mirrors_root}/openstack-pike/xenial/"
target_dir: "${_param:debmirror_mirrors_base_target_dir}/openstack-pike/xenial/"
log_file: "/var/log/debmirror/mirror_mirantis_com_openstack_pike_xenial.log"
dist: [ xenial ]
diff --git a/debmirror/mirror_mirantis_com/openstack-queens/xenial.yml b/debmirror/mirror_mirantis_com/openstack-queens/xenial.yml
index 52ea04d..e8ec6df 100644
--- a/debmirror/mirror_mirantis_com/openstack-queens/xenial.yml
+++ b/debmirror/mirror_mirantis_com/openstack-queens/xenial.yml
@@ -1,3 +1,5 @@
+classes:
+- system.defaults.debmirror
parameters:
debmirror:
client:
@@ -7,10 +9,10 @@
force: ${_param:mirror_mirantis_com_openstack_queens_xenial_force}
lock_target: True
extra_flags: [ '--verbose', '--progress', '--nosource', '--no-check-gpg', '--rsync-extra=none' ]
- method: "rsync"
+ method: "${_param:debmirror_mirrors_sync_method}"
arch: [ 'amd64' ]
- mirror_host: "mirror.mirantis.com"
- mirror_root: ":mirror/${_param:mcp_version}/openstack-queens/xenial/"
+ mirror_host: "${_param:debmirror_mirrors_host}"
+ mirror_root: "${_param:debmirror_mirrors_root}/openstack-queens/xenial/"
target_dir: "${_param:debmirror_mirrors_base_target_dir}/openstack-queens/xenial/"
log_file: "/var/log/debmirror/mirror_mirantis_com_openstack_queens_xenial.log"
dist: [ xenial ]
diff --git a/debmirror/mirror_mirantis_com/percona/xenial.yml b/debmirror/mirror_mirantis_com/percona/xenial.yml
index 87746e0..6f26de7 100644
--- a/debmirror/mirror_mirantis_com/percona/xenial.yml
+++ b/debmirror/mirror_mirantis_com/percona/xenial.yml
@@ -1,3 +1,5 @@
+classes:
+- system.defaults.debmirror
parameters:
debmirror:
client:
@@ -7,10 +9,10 @@
force: ${_param:mirror_mirantis_com_percona_xenial_force}
lock_target: True
extra_flags: [ '--verbose', '--progress', '--nosource', '--no-check-gpg', '--rsync-extra=none' ]
- method: "rsync"
+ method: "${_param:debmirror_mirrors_sync_method}"
arch: [ 'amd64' ]
- mirror_host: "mirror.mirantis.com"
- mirror_root: ":mirror/${_param:mcp_version}/percona/xenial/"
+ mirror_host: "${_param:debmirror_mirrors_host}"
+ mirror_root: "${_param:debmirror_mirrors_root}/percona/xenial/"
target_dir: "${_param:debmirror_mirrors_base_target_dir}/percona/xenial/"
log_file: "/var/log/debmirror/mirror_mirantis_com_percona_xenial.log"
dist: [ xenial ]
diff --git a/debmirror/mirror_mirantis_com/salt-formulas/xenial.yml b/debmirror/mirror_mirantis_com/salt-formulas/xenial.yml
index c7f8523..f55f7c4 100644
--- a/debmirror/mirror_mirantis_com/salt-formulas/xenial.yml
+++ b/debmirror/mirror_mirantis_com/salt-formulas/xenial.yml
@@ -1,3 +1,5 @@
+classes:
+- system.defaults.debmirror
parameters:
debmirror:
client:
@@ -7,10 +9,10 @@
force: ${_param:mirror_mirantis_com_salt-formulas_xenial_force}
lock_target: True
extra_flags: [ '--verbose', '--progress', '--nosource', '--no-check-gpg', '--rsync-extra=none' ]
- method: "rsync"
+ method: "${_param:debmirror_mirrors_sync_method}"
arch: [ 'amd64' ]
- mirror_host: "mirror.mirantis.com"
- mirror_root: ":mirror/${_param:mcp_version}/salt-formulas/xenial/"
+ mirror_host: "${_param:debmirror_mirrors_host}"
+ mirror_root: "${_param:debmirror_mirrors_root}/salt-formulas/xenial/"
target_dir: "${_param:debmirror_mirrors_base_target_dir}/salt-formulas/xenial/"
log_file: "/var/log/debmirror/mirror_mirantis_com_salt-formulas_xenial.log"
dist: [ xenial ]
diff --git a/debmirror/mirror_mirantis_com/saltstack-2016.3/xenial.yml b/debmirror/mirror_mirantis_com/saltstack-2016.3/xenial.yml
deleted file mode 100644
index 3a3528b..0000000
--- a/debmirror/mirror_mirantis_com/saltstack-2016.3/xenial.yml
+++ /dev/null
@@ -1,17 +0,0 @@
-parameters:
- debmirror:
- client:
- enabled: true
- mirrors:
- mirror_mirantis_com_saltstack_2016_3_xenial:
- force: ${_param:mirror_mirantis_com_saltstack_2016_3_xenial_force}
- lock_target: True
- extra_flags: [ '--verbose', '--progress', '--nosource', '--no-check-gpg', '--rsync-extra=none' ]
- method: "rsync"
- arch: [ 'amd64' ]
- mirror_host: "mirror.mirantis.com"
- mirror_root: ":mirror/${_param:mcp_version}/saltstack-2016.3/xenial/"
- target_dir: "${_param:debmirror_mirrors_base_target_dir}/saltstack-2016.3/xenial/"
- log_file: "/var/log/debmirror/mirror_mirantis_com_saltstack_2016_3_xenial.log"
- dist: [ xenial ]
- section: [ main ]
diff --git a/debmirror/mirror_mirantis_com/saltstack-2017.7/xenial.yml b/debmirror/mirror_mirantis_com/saltstack-2017.7/xenial.yml
index 19371b4..f31673b 100644
--- a/debmirror/mirror_mirantis_com/saltstack-2017.7/xenial.yml
+++ b/debmirror/mirror_mirantis_com/saltstack-2017.7/xenial.yml
@@ -1,3 +1,5 @@
+classes:
+- system.defaults.debmirror
parameters:
debmirror:
client:
@@ -7,10 +9,10 @@
force: ${_param:mirror_mirantis_com_saltstack_2017_7_xenial_force}
lock_target: True
extra_flags: [ '--verbose', '--progress', '--nosource', '--no-check-gpg', '--rsync-extra=none' ]
- method: "rsync"
+ method: "${_param:debmirror_mirrors_sync_method}"
arch: [ 'amd64' ]
- mirror_host: "mirror.mirantis.com"
- mirror_root: ":mirror/${_param:mcp_version}/saltstack-2017.7/xenial/"
+ mirror_host: "${_param:debmirror_mirrors_host}"
+ mirror_root: "${_param:debmirror_mirrors_root}/saltstack-2017.7/xenial/"
target_dir: "${_param:debmirror_mirrors_base_target_dir}/saltstack-2017.7/xenial/"
log_file: "/var/log/debmirror/mirror_mirantis_com_saltstack_2017_7_xenial.log"
dist: [ xenial ]
diff --git a/debmirror/mirror_mirantis_com/td-agent/xenial.yml b/debmirror/mirror_mirantis_com/td-agent/xenial.yml
index 6c6becd..f4ffa7e 100644
--- a/debmirror/mirror_mirantis_com/td-agent/xenial.yml
+++ b/debmirror/mirror_mirantis_com/td-agent/xenial.yml
@@ -1,3 +1,5 @@
+classes:
+- system.defaults.debmirror
parameters:
debmirror:
client:
@@ -7,10 +9,10 @@
force: ${_param:mirror_mirantis_com_td_agent_xenial_force}
lock_target: True
extra_flags: [ '--verbose', '--progress', '--nosource', '--no-check-gpg', '--rsync-extra=none' ]
- method: "rsync"
+ method: "${_param:debmirror_mirrors_sync_method}"
arch: [ 'amd64' ]
- mirror_host: "mirror.mirantis.com"
- mirror_root: ":mirror/${_param:mcp_version}/td-agent/xenial/"
+ mirror_host: "${_param:debmirror_mirrors_host}"
+ mirror_root: "${_param:debmirror_mirrors_root}/td-agent/xenial/"
target_dir: "${_param:debmirror_mirrors_base_target_dir}/td-agent/xenial/"
log_file: "/var/log/debmirror/mirror_mirantis_com_td_agent_xenial.log"
dist: [ xenial ]
diff --git a/debmirror/mirror_mirantis_com/ubuntu/xenial.yml b/debmirror/mirror_mirantis_com/ubuntu/xenial.yml
index bc0a9d7..d09f75d 100644
--- a/debmirror/mirror_mirantis_com/ubuntu/xenial.yml
+++ b/debmirror/mirror_mirantis_com/ubuntu/xenial.yml
@@ -1,3 +1,5 @@
+classes:
+- system.defaults.debmirror
parameters:
debmirror:
client:
@@ -8,16 +10,16 @@
force: ${_param:mirror_mirantis_com_ubuntu_xenial_force}
lock_target: True
extra_flags: [ '--verbose', '--progress', '--nosource', '--no-check-gpg', '--rsync-extra=none' ]
- method: "rsync"
+ method: "${_param:debmirror_mirrors_sync_method}"
arch: [ 'amd64' ]
- mirror_host: "mirror.mirantis.com"
- mirror_root: ":mirror/${_param:mcp_version}/ubuntu/"
+ mirror_host: "${_param:debmirror_mirrors_host}"
+ mirror_root: "${_param:debmirror_mirrors_root}/ubuntu/"
target_dir: "${_param:debmirror_mirrors_base_target_dir}/ubuntu/"
log_file: "/var/log/debmirror/mirror_mirantis_com_ubuntu_xenial.log"
dist: [ xenial , xenial-security, xenial-updates ]
section: [ main , restricted, universe ]
- # FIXME uncomment after PROD-26267 will be fixed
- # cache_dir: "${_param:debmirror_mirrors_base_target_dir}/../.cache/ubuntu"
+ # TODO : add later
+ # cache_dir: "${_param:debmirror_mirrors_common_cache_dir}/ubuntu/"
# Don't exclude main/x11 - its required for many pkgs.
exclude_deb_section:
- Xfce
diff --git a/debmirror/mirror_mirantis_com/update/cassandra/xenial.yml b/debmirror/mirror_mirantis_com/update/cassandra/xenial.yml
new file mode 100644
index 0000000..1f91284
--- /dev/null
+++ b/debmirror/mirror_mirantis_com/update/cassandra/xenial.yml
@@ -0,0 +1,19 @@
+classes:
+- system.defaults.debmirror
+parameters:
+ debmirror:
+ client:
+ enabled: true
+ mirrors:
+ mirror_mirantis_com_update_cassandra_xenial:
+ force: ${_param:mirror_mirantis_com_cassandra_xenial_force}
+ lock_target: True
+ extra_flags: [ '--verbose', '--progress', '--nosource', '--no-check-gpg', '--rsync-extra=none' ]
+ method: "${_param:debmirror_mirrors_sync_method}"
+ arch: [ 'amd64' ]
+ mirror_host: "${_param:debmirror_mirrors_host}"
+ mirror_root: "${_param:debmirror_mirrors_update_root}/cassandra/xenial/"
+ target_dir: "${_param:debmirror_mirrors_update_target_dir}/cassandra/xenial/"
+ log_file: "/var/log/debmirror/mirror_mirantis_com_update_cassandra_xenial.log"
+ dist: [ "21x" ]
+ section: [ main ]
diff --git a/debmirror/mirror_mirantis_com/update/ceph-luminous/xenial.yml b/debmirror/mirror_mirantis_com/update/ceph-luminous/xenial.yml
new file mode 100644
index 0000000..6c75bb6
--- /dev/null
+++ b/debmirror/mirror_mirantis_com/update/ceph-luminous/xenial.yml
@@ -0,0 +1,21 @@
+classes:
+- system.defaults.debmirror
+parameters:
+ debmirror:
+ client:
+ enabled: true
+ mirrors:
+ mirror_mirantis_com_update_ceph_luminous_xenial:
+ force: ${_param:mirror_mirantis_com_ceph_luminous_xenial_force}
+ lock_target: True
+ extra_flags: [ '--verbose', '--progress', '--nosource', '--no-check-gpg', '--rsync-extra=none' ]
+ method: "${_param:debmirror_mirrors_sync_method}"
+ arch: [ 'amd64' ]
+ mirror_host: "${_param:debmirror_mirrors_host}"
+ mirror_root: "${_param:debmirror_mirrors_update_root}/ceph-luminous/xenial/"
+ target_dir: "${_param:debmirror_mirrors_update_target_dir}/ceph-luminous/xenial/"
+ log_file: "/var/log/debmirror/mirror_mirantis_com_update_ceph_luminous_xenial.log"
+ dist: [ xenial ]
+ section: [ main ]
+ filter:
+ 001: "--exclude='(-dbg_|-dbg-)'"
diff --git a/debmirror/mirror_mirantis_com/update/docker/xenial.yml b/debmirror/mirror_mirantis_com/update/docker/xenial.yml
new file mode 100644
index 0000000..c385ce8
--- /dev/null
+++ b/debmirror/mirror_mirantis_com/update/docker/xenial.yml
@@ -0,0 +1,24 @@
+classes:
+- system.defaults.debmirror
+parameters:
+ debmirror:
+ client:
+ enabled: true
+ mirrors:
+ mirror_mirantis_com_update_docker_xenial:
+ force: ${_param:mirror_mirantis_com_docker_xenial_force}
+ lock_target: True
+ extra_flags: [ '--verbose', '--progress', '--nosource', '--no-check-gpg', '--rsync-extra=none' ]
+ method: "${_param:debmirror_mirrors_sync_method}"
+ arch: [ 'amd64' ]
+ mirror_host: "${_param:debmirror_mirrors_host}"
+ mirror_root: "${_param:debmirror_mirrors_update_root}/docker/xenial/"
+ target_dir: "${_param:debmirror_mirrors_update_target_dir}/docker/xenial/"
+ log_file: "/var/log/debmirror/mirror_mirantis_com_update_docker_xenial.log"
+ dist: [ xenial ]
+ section: [ stable ]
+ filter:
+ # conteinerD - forked at 'extra' repo.
+ 001: --exclude='(docker-ce_17|containerd.io_1.2.0~(beta|rc))'
+ # Drop docker-ce <= 18.09
+ 002: --exclude='(docker-ce(-|_)18.0[0-8])'
diff --git a/debmirror/mirror_mirantis_com/update/elasticsearch-5.x/xenial.yml b/debmirror/mirror_mirantis_com/update/elasticsearch-5.x/xenial.yml
new file mode 100644
index 0000000..52f9482
--- /dev/null
+++ b/debmirror/mirror_mirantis_com/update/elasticsearch-5.x/xenial.yml
@@ -0,0 +1,23 @@
+classes:
+- system.defaults.debmirror
+parameters:
+ debmirror:
+ client:
+ enabled: true
+ mirrors:
+ mirror_mirantis_com_update_elasticsearch_5_x_xenial:
+ enabled: true
+ force: ${_param:mirror_mirantis_com_elasticsearch_5_x_xenial_force}
+ lock_target: True
+ extra_flags: [ '--verbose', '--progress', '--nosource', '--no-check-gpg', '--rsync-extra=none' ]
+ method: "${_param:debmirror_mirrors_sync_method}"
+ arch: [ 'amd64' ]
+ mirror_host: "${_param:debmirror_mirrors_host}"
+ mirror_root: "${_param:debmirror_mirrors_update_root}/elasticsearch-5.x/xenial/"
+ target_dir: "${_param:debmirror_mirrors_update_target_dir}/elasticsearch-5.x/xenial/"
+ log_file: "/var/log/debmirror/mirror_mirantis_com_update_elasticsearch_5_x_xenial.log"
+ dist: [ stable ]
+ section: [ main ]
+ filter:
+ # drop all versions below 5.6.12
+ 001: --exclude='(_|-)5\.([0-5]\.|6\.([0-9]|10|11)(-|\.))'
diff --git a/debmirror/mirror_mirantis_com/update/elasticsearch-6.x/xenial.yml b/debmirror/mirror_mirantis_com/update/elasticsearch-6.x/xenial.yml
new file mode 100644
index 0000000..938b3fb
--- /dev/null
+++ b/debmirror/mirror_mirantis_com/update/elasticsearch-6.x/xenial.yml
@@ -0,0 +1,24 @@
+classes:
+- system.defaults.debmirror
+parameters:
+ debmirror:
+ client:
+ enabled: true
+ mirrors:
+ mirror_mirantis_com_update_elasticsearch_6_x_xenial:
+ enabled: true
+ force: ${_param:mirror_mirantis_com_elasticsearch_6_x_xenial_force}
+ lock_target: True
+ extra_flags: [ '--verbose', '--progress', '--nosource', '--no-check-gpg', '--rsync-extra=none' ]
+ method: "${_param:debmirror_mirrors_sync_method}"
+ arch: [ 'amd64' ]
+ mirror_host: "${_param:debmirror_mirrors_host}"
+ mirror_root: "${_param:debmirror_mirrors_update_root}/elasticsearch-6.x/xenial/"
+ target_dir: "${_param:debmirror_mirrors_update_target_dir}/elasticsearch-6.x/xenial/"
+ log_file: "/var/log/debmirror/mirror_mirantis_com_update_elasticsearch_6_x_xenial.log"
+ dist: [ stable ]
+ section: [ main ]
+ filter:
+# # drop all versions below 6.5.2
+ 001: --exclude='(_|-)6\.([0-4]\.|[0-5]\.[0-1])'
+
diff --git a/debmirror/mirror_mirantis_com/update/elasticsearch-curator-5/xenial.yml b/debmirror/mirror_mirantis_com/update/elasticsearch-curator-5/xenial.yml
new file mode 100644
index 0000000..18da05b
--- /dev/null
+++ b/debmirror/mirror_mirantis_com/update/elasticsearch-curator-5/xenial.yml
@@ -0,0 +1,20 @@
+classes:
+- system.defaults.debmirror
+parameters:
+ debmirror:
+ client:
+ enabled: true
+ mirrors:
+ mirror_mirantis_com_update_elasticsearch_curator_5_xenial:
+ enabled: true
+ force: ${_param:mirror_mirantis_com_elasticsearch_curator_5_xenial_force}
+ lock_target: True
+ extra_flags: [ '--verbose', '--progress', '--nosource', '--no-check-gpg', '--rsync-extra=none' ]
+ method: "${_param:debmirror_mirrors_sync_method}"
+ arch: [ 'amd64' ]
+ mirror_host: "${_param:debmirror_mirrors_host}"
+ mirror_root: "${_param:debmirror_mirrors_update_root}/elasticsearch-curator-5/xenial/"
+ target_dir: "${_param:debmirror_mirrors_update_target_dir}/elasticsearch-curator-5/xenial/"
+ log_file: "/var/log/debmirror/mirror_mirantis_com_update_elasticsearch_curator_5_xenial.log"
+ dist: [ stable ]
+ section: [ main ]
diff --git a/debmirror/mirror_mirantis_com/update/extra/xenial.yml b/debmirror/mirror_mirantis_com/update/extra/xenial.yml
new file mode 100644
index 0000000..1c64647
--- /dev/null
+++ b/debmirror/mirror_mirantis_com/update/extra/xenial.yml
@@ -0,0 +1,21 @@
+classes:
+- system.defaults.debmirror
+parameters:
+ debmirror:
+ client:
+ enabled: true
+ mirrors:
+ mirror_mirantis_com_update_extra_xenial:
+ force: ${_param:mirror_mirantis_com_extra_xenial_force}
+ lock_target: True
+ extra_flags: [ '--verbose', '--progress', '--nosource', '--no-check-gpg', '--rsync-extra=none' ]
+ method: "${_param:debmirror_mirrors_sync_method}"
+ arch: [ 'amd64' ]
+ mirror_host: "${_param:debmirror_mirrors_host}"
+ mirror_root: "${_param:debmirror_mirrors_update_root}/extra/xenial/"
+ target_dir: "${_param:debmirror_mirrors_update_target_dir}/extra/xenial/"
+ log_file: "/var/log/debmirror/mirror_mirantis_com_update_extra_xenial.log"
+ dist: [ xenial ]
+ section: [ main ]
+ filter:
+ 001: --exclude='(-|_)dbg(_|-)'
diff --git a/debmirror/mirror_mirantis_com/update/glusterfs-5/xenial.yml b/debmirror/mirror_mirantis_com/update/glusterfs-5/xenial.yml
new file mode 100644
index 0000000..957bc0f
--- /dev/null
+++ b/debmirror/mirror_mirantis_com/update/glusterfs-5/xenial.yml
@@ -0,0 +1,21 @@
+classes:
+- system.defaults.debmirror
+parameters:
+ debmirror:
+ client:
+ enabled: true
+ mirrors:
+ mirror_mirantis_com_update_glusterfs_5_xenial:
+ force: ${_param:mirror_mirantis_com_glusterfs_5_xenial_force}
+ lock_target: True
+ extra_flags: [ '--verbose', '--progress', '--nosource', '--no-check-gpg', '--rsync-extra=none' ]
+ method: "${_param:debmirror_mirrors_sync_method}"
+ arch: [ 'amd64' ]
+ mirror_host: "${_param:debmirror_mirrors_host}"
+ mirror_root: "${_param:debmirror_mirrors_update_root}/glusterfs-5/xenial/"
+ target_dir: "${_param:debmirror_mirrors_update_target_dir}/glusterfs-5/xenial/"
+ log_file: "/var/log/debmirror/mirror_mirantis_com_update_glusterfs_5_xenial.log"
+ dist: [ xenial ]
+ section: [ main ]
+ filter:
+ 001: "--exclude='-dbg_'"
diff --git a/debmirror/mirror_mirantis_com/update/maas/xenial.yml b/debmirror/mirror_mirantis_com/update/maas/xenial.yml
new file mode 100644
index 0000000..7402049
--- /dev/null
+++ b/debmirror/mirror_mirantis_com/update/maas/xenial.yml
@@ -0,0 +1,19 @@
+classes:
+- system.defaults.debmirror
+parameters:
+ debmirror:
+ client:
+ enabled: true
+ mirrors:
+ mirror_mirantis_com_update_maas_xenial:
+ force: ${_param:mirror_mirantis_com_maas_xenial_force}
+ lock_target: True
+ extra_flags: [ '--verbose', '--progress', '--nosource', '--no-check-gpg', '--rsync-extra=none' ]
+ method: "${_param:debmirror_mirrors_sync_method}"
+ arch: [ 'amd64' ]
+ mirror_host: "${_param:debmirror_mirrors_host}"
+ mirror_root: "${_param:debmirror_mirrors_update_root}/maas/xenial/"
+ target_dir: "${_param:debmirror_mirrors_update_target_dir}/maas/xenial/"
+ log_file: "/var/log/debmirror/mirror_mirantis_com_update_maas_xenial.log"
+ dist: [ xenial ]
+ section: [ main ]
diff --git a/debmirror/mirror_mirantis_com/update/opencontrail-4.1/xenial.yml b/debmirror/mirror_mirantis_com/update/opencontrail-4.1/xenial.yml
new file mode 100644
index 0000000..7803e7a
--- /dev/null
+++ b/debmirror/mirror_mirantis_com/update/opencontrail-4.1/xenial.yml
@@ -0,0 +1,21 @@
+classes:
+- system.defaults.debmirror
+parameters:
+ debmirror:
+ client:
+ enabled: true
+ mirrors:
+ mirror_mirantis_com_update_oc41_xenial:
+ force: ${_param:mirror_mirantis_com_oc41_xenial_force}
+ lock_target: True
+ extra_flags: [ '--verbose', '--progress', '--nosource', '--no-check-gpg', '--rsync-extra=none' ]
+ method: "${_param:debmirror_mirrors_sync_method}"
+ arch: [ 'amd64' ]
+ mirror_host: "${_param:debmirror_mirrors_host}"
+ mirror_root: "${_param:debmirror_mirrors_update_root}/opencontrail-4.1/xenial/"
+ target_dir: "${_param:debmirror_mirrors_update_target_dir}/opencontrail-4.1/xenial/"
+ log_file: "/var/log/debmirror/mirror_mirantis_com_update_oc41_xenial.log"
+ dist: [ xenial ]
+ section: [ main ]
+ filter:
+ 001: "--exclude='(-dbg_|-dbg-)'"
diff --git a/debmirror/mirror_mirantis_com/update/openstack-pike/xenial.yml b/debmirror/mirror_mirantis_com/update/openstack-pike/xenial.yml
new file mode 100644
index 0000000..eb1d17a
--- /dev/null
+++ b/debmirror/mirror_mirantis_com/update/openstack-pike/xenial.yml
@@ -0,0 +1,21 @@
+classes:
+- system.defaults.debmirror
+parameters:
+ debmirror:
+ client:
+ enabled: true
+ mirrors:
+ mirror_mirantis_com_update_openstack_pike_xenial:
+ force: ${_param:mirror_mirantis_com_openstack_pike_xenial_force}
+ lock_target: True
+ extra_flags: [ '--verbose', '--progress', '--nosource', '--no-check-gpg', '--rsync-extra=none' ]
+ method: "${_param:debmirror_mirrors_sync_method}"
+ arch: [ 'amd64' ]
+ mirror_host: "${_param:debmirror_mirrors_host}"
+ mirror_root: "${_param:debmirror_mirrors_update_root}/openstack-pike/xenial/"
+ target_dir: "${_param:debmirror_mirrors_update_target_dir}/openstack-pike/xenial/"
+ log_file: "/var/log/debmirror/mirror_mirantis_com_update_openstack_pike_xenial.log"
+ dist: [ xenial ]
+ section: [ main ]
+ filter:
+ 001: --exclude='(-|_)dbg(_|-)'
diff --git a/debmirror/mirror_mirantis_com/update/openstack-queens/xenial.yml b/debmirror/mirror_mirantis_com/update/openstack-queens/xenial.yml
new file mode 100644
index 0000000..5701b7a
--- /dev/null
+++ b/debmirror/mirror_mirantis_com/update/openstack-queens/xenial.yml
@@ -0,0 +1,21 @@
+classes:
+- system.defaults.debmirror
+parameters:
+ debmirror:
+ client:
+ enabled: true
+ mirrors:
+ mirror_mirantis_com_update_openstack_queens_xenial:
+ force: ${_param:mirror_mirantis_com_openstack_queens_xenial_force}
+ lock_target: True
+ extra_flags: [ '--verbose', '--progress', '--nosource', '--no-check-gpg', '--rsync-extra=none' ]
+ method: "${_param:debmirror_mirrors_sync_method}"
+ arch: [ 'amd64' ]
+ mirror_host: "${_param:debmirror_mirrors_host}"
+ mirror_root: "${_param:debmirror_mirrors_update_root}/openstack-queens/xenial/"
+ target_dir: "${_param:debmirror_mirrors_update_target_dir}/openstack-queens/xenial/"
+ log_file: "/var/log/debmirror/mirror_mirantis_com_update_openstack_queens_xenial.log"
+ dist: [ xenial ]
+ section: [ main ]
+ filter:
+ 001: --exclude='(-|_)dbg(_|-)'
diff --git a/debmirror/mirror_mirantis_com/update/percona/xenial.yml b/debmirror/mirror_mirantis_com/update/percona/xenial.yml
new file mode 100644
index 0000000..fc739d8
--- /dev/null
+++ b/debmirror/mirror_mirantis_com/update/percona/xenial.yml
@@ -0,0 +1,25 @@
+classes:
+- system.defaults.debmirror
+parameters:
+ debmirror:
+ client:
+ enabled: true
+ mirrors:
+ mirror_mirantis_com_update_percona_xenial:
+ force: ${_param:mirror_mirantis_com_percona_xenial_force}
+ lock_target: True
+ extra_flags: [ '--verbose', '--progress', '--nosource', '--no-check-gpg', '--rsync-extra=none' ]
+ method: "${_param:debmirror_mirrors_sync_method}"
+ arch: [ 'amd64' ]
+ mirror_host: "${_param:debmirror_mirrors_host}"
+ mirror_root: "${_param:debmirror_mirrors_update_root}/percona/xenial/"
+ target_dir: "${_param:debmirror_mirrors_update_target_dir}/percona/xenial/"
+ log_file: "/var/log/debmirror/mirror_mirantis_com_update_percona_xenial.log"
+ dist: [ xenial ]
+ section: [ main ]
+ filter:
+ 001: --exclude='(-|_)dbg(_|-)'
+ 002: "--exclude='/percona-server-5.(5|6)'"
+ 003: "--exclude='/percona-server-mongodb'"
+ 004: "--exclude='/(percona-xtradb-cluster|percona-server-5|percona-xtradb-cluster)'"
+ 050: "--include='/*galera*'"
diff --git a/debmirror/mirror_mirantis_com/update/salt-formulas/xenial.yml b/debmirror/mirror_mirantis_com/update/salt-formulas/xenial.yml
new file mode 100644
index 0000000..fb042ab
--- /dev/null
+++ b/debmirror/mirror_mirantis_com/update/salt-formulas/xenial.yml
@@ -0,0 +1,19 @@
+classes:
+- system.defaults.debmirror
+parameters:
+ debmirror:
+ client:
+ enabled: true
+ mirrors:
+ mirror_mirantis_com_update_salt-formulas_xenial:
+ force: ${_param:mirror_mirantis_com_salt-formulas_xenial_force}
+ lock_target: True
+ extra_flags: [ '--verbose', '--progress', '--nosource', '--no-check-gpg', '--rsync-extra=none' ]
+ method: "${_param:debmirror_mirrors_sync_method}"
+ arch: [ 'amd64' ]
+ mirror_host: "${_param:debmirror_mirrors_host}"
+ mirror_root: "${_param:debmirror_mirrors_update_root}/salt-formulas/xenial/"
+ target_dir: "${_param:debmirror_mirrors_update_target_dir}/salt-formulas/xenial/"
+ log_file: "/var/log/debmirror/mirror_mirantis_com_update_salt-formulas_xenial.log"
+ dist: [ xenial ]
+ section: [ main ]
diff --git a/debmirror/mirror_mirantis_com/update/saltstack-2017.7/xenial.yml b/debmirror/mirror_mirantis_com/update/saltstack-2017.7/xenial.yml
new file mode 100644
index 0000000..cd9998e
--- /dev/null
+++ b/debmirror/mirror_mirantis_com/update/saltstack-2017.7/xenial.yml
@@ -0,0 +1,19 @@
+classes:
+- system.defaults.debmirror
+parameters:
+ debmirror:
+ client:
+ enabled: true
+ mirrors:
+ mirror_mirantis_com_update_saltstack_2017_7_xenial:
+ force: ${_param:mirror_mirantis_com_saltstack_2017_7_xenial_force}
+ lock_target: True
+ extra_flags: [ '--verbose', '--progress', '--nosource', '--no-check-gpg', '--rsync-extra=none' ]
+ method: "${_param:debmirror_mirrors_sync_method}"
+ arch: [ 'amd64' ]
+ mirror_host: "${_param:debmirror_mirrors_host}"
+ mirror_root: "${_param:debmirror_mirrors_update_root}/saltstack-2017.7/xenial/"
+ target_dir: "${_param:debmirror_mirrors_update_target_dir}/saltstack-2017.7/xenial/"
+ log_file: "/var/log/debmirror/mirror_mirantis_com_update_saltstack_2017_7_xenial.log"
+ dist: [ xenial ]
+ section: [ main ]
diff --git a/debmirror/mirror_mirantis_com/update/td-agent/xenial.yml b/debmirror/mirror_mirantis_com/update/td-agent/xenial.yml
new file mode 100644
index 0000000..5d951ee
--- /dev/null
+++ b/debmirror/mirror_mirantis_com/update/td-agent/xenial.yml
@@ -0,0 +1,19 @@
+classes:
+- system.defaults.debmirror
+parameters:
+ debmirror:
+ client:
+ enabled: true
+ mirrors:
+ mirror_mirantis_com_update_td_agent_xenial:
+ force: ${_param:mirror_mirantis_com_td_agent_xenial_force}
+ lock_target: True
+ extra_flags: [ '--verbose', '--progress', '--nosource', '--no-check-gpg', '--rsync-extra=none' ]
+ method: "${_param:debmirror_mirrors_sync_method}"
+ arch: [ 'amd64' ]
+ mirror_host: "${_param:debmirror_mirrors_host}"
+ mirror_root: "${_param:debmirror_mirrors_update_root}/td-agent/xenial/"
+ target_dir: "${_param:debmirror_mirrors_update_target_dir}/td-agent/xenial/"
+ log_file: "/var/log/debmirror/mirror_mirantis_com_update_td_agent_xenial.log"
+ dist: [ xenial ]
+ section: [ contrib ]
diff --git a/debmirror/mirror_mirantis_com/update/ubuntu/xenial.yml b/debmirror/mirror_mirantis_com/update/ubuntu/xenial.yml
new file mode 100644
index 0000000..12a17e7
--- /dev/null
+++ b/debmirror/mirror_mirantis_com/update/ubuntu/xenial.yml
@@ -0,0 +1,193 @@
+classes:
+- system.defaults.debmirror
+parameters:
+ debmirror:
+ client:
+ enabled: true
+ mirrors:
+ # This mirror is used to build unmodified(no meta changes) but reduced offline ubuntu-mirror.
+ mirror_mirantis_com_update_ubuntu_xenial:
+ force: ${_param:mirror_mirantis_com_ubuntu_xenial_force}
+ lock_target: True
+ extra_flags: [ '--verbose', '--progress', '--nosource', '--no-check-gpg', '--rsync-extra=none' ]
+ method: "${_param:debmirror_mirrors_sync_method}"
+ arch: [ 'amd64' ]
+ mirror_host: "${_param:debmirror_mirrors_host}"
+ mirror_root: "${_param:debmirror_mirrors_update_root}/ubuntu/"
+ target_dir: "${_param:debmirror_mirrors_update_target_dir}/ubuntu/"
+ log_file: "/var/log/debmirror/mirror_mirantis_com_update_ubuntu_xenial.log"
+ dist: [ xenial , xenial-security, xenial-updates ]
+ section: [ main , restricted, universe ]
+ # TODO : add later
+ # cache_dir: "${_param:debmirror_mirrors_common_cache_dir}/ubuntu/"
+ # Don't exclude main/x11 - its required for many pkgs.
+ exclude_deb_section:
+ - Xfce
+ - comm
+ - doc
+ - electronics
+ - games
+ - gnome
+ - graphics
+ - hamradio
+ - kde
+ - localization
+ - news
+ - science
+ - sound
+ - translations
+ - video
+ - main/debug
+ - main/science
+ - restricted/Xfce
+ - restricted/comm
+ - restricted/debug
+ - restricted/doc
+ - restricted/electronics
+ - restricted/games
+ - restricted/gnome
+ - restricted/graphics
+ - restricted/hamradio
+ - restricted/kde
+ - restricted/localization
+ - restricted/news
+ - restricted/science
+ - restricted/sound
+ - restricted/translations
+ - restricted/video
+ - restricted/x11
+ - universe/Xfce
+ - universe/comm
+ - universe/debug
+ - universe/doc
+ - universe/electronics
+ - universe/games
+ - universe/gnome
+ - universe/graphics
+ - universe/hamradio
+ - universe/kde
+ - universe/localization
+ - universe/news
+ - universe/science
+ - universe/sound
+ - universe/translations
+ - universe/video
+ - universe/x11
+ - zope
+ - main/zope
+ - restricted/zope
+ - universe/zope
+ - 'tex$'
+ - 'main/tex$'
+ - 'restricted/tex$'
+ - 'universe/tex$'
+ - 'text$'
+ - 'universe/text$'
+ # Updating filter, please always start from section, aka main|universe|multiverse
+ filter:
+ 1: "--exclude='android*'"
+ 2: "--exclude='/(main|universe)/f/firefox'"
+ 3: "--exclude='/chromium-browser*'"
+ 5: "--exclude='/*-wallpapers*'"
+ 6: "--exclude='/language-pack-(?!en)'"
+ 7: "--exclude='thunderbird*'"
+ 8: --exclude='(libreoffice*|bgoffice|openoffice*)'
+ 10: "--exclude='live-image-*-desktop*'"
+ 11: --exclude='(desktop|mate|cinnamon|xubuntu|kubuntu|lubuntu)-*'
+ 16: "--exclude='flashplugin*'"
+ 17: --exclude='(unity|gnome).*'
+ 20: "--exclude='openjdk-*-(dbg|demo|source).*'"
+ 22: "--exclude='(kde|ubuntu|xfce4|sabily|sugar).*artwork*'"
+ 23: "--exclude='ubuntu-touch*'"
+ 24: "--exclude='remmina*'"
+ 25: "--exclude='/libbluetooth*'"
+ 26: "--exclude='/libandroid*'"
+ 27: "--exclude='/banshee*'"
+ 27: "--exclude='/*(.xorg)*joystick'"
+ 28: "--exclude='/xserver-xorg-video(.*vivid|.*wily|.*utopic)'"
+ 30: --exclude='universe.*bluez.*'
+ 32: --exclude='main/(a/a11y-profile-manager|e/emacs24|i/ispell|br\.ispell)'
+ 33: --exclude='/universe/.*(alsa|ubuntuone|telepathy|debian-multimedia|kodi|mediaplayer|nagios|getfem|gammaray|geotranz|brasero)'
+ 34: --exclude='(usb-creator|gcc-snapshot|gcc-mozilla|gccgo|gcc-.*-cross.*|gcc-avr|gcc-3\.3|gcc-4\.[7-8])'
+ 35: --exclude='(.*/q/qt|pyqt)'
+ 36: --exclude='/universe/.*(mediascanner2|mediatomb|mediawiki|pidgin|eclipse|esys-particle|fusion|e/emboss|e/empathy|g/globus|ecere-sdk|ferret|gap-)'
+ 84: --exclude='restricted/b/bcmwl'
+ 86: "--exclude='/main/(m/mozc/|n/nut/|o/oxide-qt/|o/orbit2/|q/(qtbase-opensource-src|qtdeclarative-opensource-src)/|t/telepathy-glib|w/webkit2gtk|w/webrtc-audio-processing)'"
+ 87: --exclude='universe/(s/syncevolution|r/r-bioc-|.*(libbiblio|libbusiness|biococoa))'
+ 89: --exclude='universe/(libk/libkde|k/kde|r/rustc|r/root-system|e/emacs|x/xemacs21)'
+ 90: "--exclude='/universe/p/(psi-plus|puppet-module|plasma|pcl/)'"
+ 91: --exclude='/golang-.*'
+ 92: "--exclude='/(llvm-toolchain|address-book|amule|openclipart|rhythmbox|gimp|sonic-visualiser|games|bsdgame|gazebo|arduino|webkitgtk|widelands|wxwidget|warzone|wings3d).*'"
+ 93: "--exclude='/(asterisk|abiword|webbrowser-app|imagemagick|.*clamav|wireshar|vlc|.*transmission|tryton-modules|trilinos|tomboy|wine1|wine-dev|compiz|mythtv|ubuntustudio).*'"
+ 94: "--exclude='/universe/o/(openstack-debian-images).*'"
+ 96: "--exclude='/(nvidia).*'"
+ 97: --exclude='(gambas3|opengl|screensaver|taoframework)'
+ # Drop all dbg pkgs
+ 98: --exclude='(-|_)dbg(_|-)'
+ 99: --exclude='mythbuntu|network-manager-applet|debian-junior|game-music-emu|fp-units-castle-game-engine|asio|unidic-mecab|zope\.'
+ 100: --exclude='kineticstools|juju-(deployer|mongo|core)|felix-latin|fonts-(yozvox-yozfont|nanum|roboto|baekmuk|arphic-.*|takao|noto-cjk|ipamj-mincho)|insighttoolkit|axiom'
+ 101: --exclude='openjdk-(8|9)(?!.*jre-headless.*)'
+ # List of unused linux kernels and unsupported arch
+ 300: --exclude='.*-(alpha|arm64|powerpc|s390x|armel|armhf|arm-|aarch64-|sparc64|mips64|mips|ppc64el|mipsn32|hppa|m68k|sh4|mipsel|ppc64|m68hc1|mingw-w64)'
+ 301: --exclude='(main|universe)/l/linux-*-(.*azure|.*aws|gke|gcp|.*azure-edge|.*oem/|.*euclid/)'
+ 303: "--exclude='/main/l/linux(.*)/linux-source-*'"
+ # Old minor version of kernel|tools|extra|cloud and related.
+ # Generic: Old - if minor less then < 136, but not 4numeric
+ 304: --exclude='main/l/linux.*/linux-.*4\.4\.0-(([0-9][0-9])|([0-9][0-3][0-6]))(\.|_|-)'
+ # Hwe 4.8: Old - if minor in 30-49 and < 57.
+ 305: '--exclude="main/l/linux.*/linux-.*4\.8\.0-(([0-4][0-9])|([0-9][0-6]))"'
+ # Hwe 4.10: Old - if minor in 0-39, < 42 .
+ 306: '--exclude="main/l/linux.*/linux-.*4\.10\.0-(([0-3][0-9])|(4[0-1]))"'
+ # Hwe 4.13: Old - if minor in 0-39, < 44
+ 307: '--exclude="main/l/linux.*/linux-.*4\.13\.0-(([0-3][0-9])|(4[0-4]))"'
+ # Hwe 4.15.0: Old - if minor in 0-39, < 43
+ 308: --exclude='main/l/linux.*/linux-.*4\.15\.0-(([0-3][0-9])|(4[0-2]))'
+ # Old 4.4.0
+ 309: --exclude='main/l/linux.*/linux-.*4\.4\.0-'
+ # List of packages, that should be fetched from fresh ppa or other mirror
+ # So,removing them from upstream mirror.
+ 500: --exclude='main/m/maas/'
+ 501: --exclude='universe/g/glusterfs/'
+ 502: "--exclude='/universe/d/(docker-|docker.io)/'"
+ 503: "--exclude='/(main|universe)/c/ceph'"
+ 504: "--exclude='/universe/a/aptly'"
+ 505: "--exclude='/universe/e/elasticsearch'"
+ 506: "--exclude='/universe/g/grafana/'"
+ 507: "--exclude='/universe/i/influxdb(?!.*python)'"
+ 508: "--exclude='/universe/s/salt'"
+ 509: "--exclude='/universe/z/zabbix'"
+ 510: "--exclude='(universe|main)/(o|d|n)/(openvswitch|dpdk|networking-ovs-dpdk)'"
+ 511: "--exclude='/main/libv/.*(libvirt)'"
+ 512: "--exclude='/main/s/.*(seabios)'"
+ 513: "--exclude='/universe/.*libvirt'"
+ 514: "--exclude='/(universe|main)/c/(cinder|ceilometer)'"
+ 515: "--exclude='/(universe|main)/p/python-(cinder|ceilometer)client'"
+ 516: "--exclude='/(universe|main)/n/(nova|neutron)'"
+ 517: "--exclude='/(universe|main)/p/python-(nova|neutron)client'"
+ 518: "--exclude='/(universe|main)/g/(glance)'"
+ 519: "--exclude='/(universe|main)/p/python-(glance)client'"
+ 520: "--exclude='/(universe|main)/b/(barbican)'"
+ 521: "--exclude='/(universe|main)/k/(keystone)'"
+ 522: "--exclude='/(universe|main)/d/(designate)'"
+ 523: "--exclude='/(universe|main)/p/python-(barbican|keystone|designate)client'"
+ 524: "--exclude='/(universe|main)/h/(horizon|heat)'"
+ 525: "--exclude='/(universe|main)/p/python-(horizon|heat)client'"
+ 526: "--exclude='/(universe|main)/m/(murano|mistral|manila)'"
+ 527: "--exclude='/(universe|main)/p/python-(murano|mistral|manila)client'"
+ 528: "--exclude='/(universe|main)/i/(ironic)'"
+ 529: "--exclude='/(universe|main)/a/(aodh)'"
+ 530: "--exclude='/(universe|main)/p/python-(ironic|aodh)client'"
+ 531: --exclude='/universe/p/percona-'
+ # List of extra includes, founded after tests.
+ 800: "--include='/main(.*)manpages'"
+ 801: "--include='/main(.*)python-(.*)doc'"
+ 802: "--include='/main(.*)python-(.*)network'"
+ 803: "--include='/main(.*)unittest2'" # openstack* pkgs
+ 804: "--include='/main(.*)libbluetooth3'" # python-guestfs
+ # Get required llvm.But drop old llvm toolset.Old - if major in 1-5.
+ 805: '--include="/main(.*)llvm-toolchain-(?![1-5])"' # pki-ca: < 389-ds-base < dogtag
+ 806: "--include='/main(.*)man-db'" # include man tool
+ 807: "--include='/main(.*)zfs-doc'" # Some extra fs dep's for MAAS provision stage.PROD-21531
+ 808: --include='main/.*(linux-libc(-|_|)|libgcc1_).*amd64.deb'
+ 809: --include='main/(x/xml-core|s/sgml-base|libxml|.*xmlsec1|.*python(3|)-zope.interface)'
+ 810: --include='universe/p/plexus-(container-default|interactivity-api)/' # PROD-26807 Req.for DogTag
diff --git a/defaults/debmirror.yml b/defaults/debmirror.yml
index b572dcc..8c636ac 100644
--- a/defaults/debmirror.yml
+++ b/defaults/debmirror.yml
@@ -2,6 +2,14 @@
_param:
# Global
debmirror_mirrors_base_target_dir: "/srv/volumes/aptly/public/${_param:mcp_version}/"
+ debmirror_mirrors_update_target_dir: "/srv/volumes/aptly/public/update/${_param:mcp_version}/"
+ # TODO : expiremental
+ debmirror_mirrors_common_cache_dir: "/srv/volumes/aptly/public/.common_cache/"
+ # debmirror_mirrors_sync_method set to http because mirror.mirantis.com is under cloud front
+ debmirror_mirrors_sync_method: http
+ debmirror_mirrors_host: "mirror.mirantis.com"
+ debmirror_mirrors_root: "${_param:mcp_version}"
+ debmirror_mirrors_update_root: "update/${_param:mcp_version}"
# Per repo modificators
mirror_mirantis_com_cassandra_xenial_force: False
mirror_mirantis_com_ceph_luminous_xenial_force: False
@@ -11,6 +19,7 @@
mirror_mirantis_com_elasticsearch_curator_5_xenial_force: False
mirror_mirantis_com_extra_xenial_force: False
mirror_mirantis_com_glusterfs_3_8_xenial_force: False
+ mirror_mirantis_com_glusterfs_5_xenial_force: False
mirror_mirantis_com_maas_xenial_force: False
mirror_mirantis_com_oc40_xenial_force: False
mirror_mirantis_com_oc41_xenial_force: False
diff --git a/defaults/docker_images.yml b/defaults/docker_images.yml
index bf5aa0c..54fbfa4 100644
--- a/defaults/docker_images.yml
+++ b/defaults/docker_images.yml
@@ -8,7 +8,7 @@
docker_image_openldap: "${_param:mcp_docker_registry}/mirantis/external/osixia/openldap:1.2.2"
docker_image_postgresql: "${_param:mcp_docker_registry}/mirantis/external/library/postgres:9.6.10"
# 3.4.13, from Feb 15, differ from 3.4.13 upstream verison, from March 14 - update next cycle
- docker_image_mongodb: "${_param:mcp_docker_registry}/mirantis/external/library/mongo:${_param:mcp_version}"
+ docker_image_mongodb: "${_param:mcp_docker_registry}/mirantis/external/mongo:${_param:mcp_version}"
###
# phpldapadmin:0.6.12
docker_image_phpldapadmin: "${_param:mcp_docker_registry}/mirantis/cicd/phpldapadmin:${_param:mcp_version}"
@@ -130,7 +130,7 @@
name: remote_storage_adapter:${_param:mcp_version}
- registry: ${_param:mcp_docker_registry}/openstack-docker
target_registry: ${_param:default_local_mirrror_content:docker_client_registry_target_registry}/openstack-docker
- name: prometheus_relay:2019.2.5
+ name: prometheus-relay:2019.2.5
- registry: ${_param:mcp_docker_registry}/openstack-docker
target_registry: ${_param:default_local_mirrror_content:docker_client_registry_target_registry}/openstack-docker
name: grafana:${_param:mcp_version}
@@ -145,11 +145,22 @@
name: gainsight_elasticsearch:${_param:mcp_version}
- registry: ${_param:mcp_docker_registry}/openstack-docker
target_registry: ${_param:default_local_mirrror_content:docker_client_registry_target_registry}/openstack-docker
- name: prometheus-es-exporter:2019.2.4
+ name: prometheus-es-exporter:2019.2.6
+
+ # OpenContrail 4.1
+ - registry: ${_param:mcp_docker_registry}/opencontrail-oc41
+ target_registry: ${_param:default_local_mirrror_content:docker_client_registry_target_registry}/opencontrail-oc41
+ name: opencontrail-analytics:${_param:opencontrail_docker_image_tag}
+ - registry: ${_param:mcp_docker_registry}/opencontrail-oc41
+ target_registry: ${_param:default_local_mirrror_content:docker_client_registry_target_registry}/opencontrail-oc41
+ name: opencontrail-analyticsdb:${_param:opencontrail_docker_image_tag}
+ - registry: ${_param:mcp_docker_registry}/opencontrail-oc41
+ target_registry: ${_param:default_local_mirrror_content:docker_client_registry_target_registry}/opencontrail-oc41
+ name: opencontrail-controller:${_param:opencontrail_docker_image_tag}
# QA\CVP tool-set's
- - registry: ${_param:mcp_docker_registry}/mirantis/cvp
- target_registry: ${_param:default_local_mirrror_content:docker_client_registry_target_registry}/mirantis/cvp
+ - registry: ${_param:mcp_docker_registry}/mirantis/cicd
+ target_registry: ${_param:default_local_mirrror_content:docker_client_registry_target_registry}/mirantis/cicd
name: ci-tempest:${_param:openstack_version}
- registry: ${_param:mcp_docker_registry}/mirantis/cvp
target_registry: ${_param:default_local_mirrror_content:docker_client_registry_target_registry}/mirantis/cvp
@@ -167,6 +178,6 @@
- registry: ${_param:mcp_docker_registry}/mirantis/cicd
target_registry: ${_param:default_local_mirrror_content:docker_client_registry_target_registry}/mirantis/cicd
name: mysql:${_param:mcp_version}
- - registry: ${_param:mcp_docker_registry}/mirantis/external/library
- target_registry: ${_param:default_local_mirrror_content:docker_client_registry_target_registry}/mirantis/external/library
+ - registry: ${_param:mcp_docker_registry}/mirantis/external
+ target_registry: ${_param:default_local_mirrror_content:docker_client_registry_target_registry}/mirantis/external
name: mongo:${_param:mcp_version}
diff --git a/defaults/linux_system_repo.yml b/defaults/linux_system_repo.yml
index 61aca94..07e96d2 100644
--- a/defaults/linux_system_repo.yml
+++ b/defaults/linux_system_repo.yml
@@ -12,6 +12,7 @@
linux_system_repo_mcp_glusterfs_url: ${_param:linux_system_repo_url}/glusterfs-${_param:linux_system_repo_mcp_glusterfs_version_number}/
linux_system_repo_mcp_influxdb_url: ${_param:linux_system_repo_url}/influxdb/
linux_system_repo_mcp_maas_url: ${_param:linux_system_repo_url}/maas/
+ linux_system_repo_mcp_update_maas_url: ${_param:linux_system_repo_update_url}/maas/
#
linux_system_repo_mcp_elasticsearch_curator_url: ${_param:linux_system_repo_url}/elasticsearch-curator-5/
linux_system_repo_mcp_update_elasticsearch_curator_url: ${_param:linux_system_repo_update_url}/elasticsearch-curator-5/
diff --git a/defaults/maas.yml b/defaults/maas.yml
index 795d4b0..7e073d1 100644
--- a/defaults/maas.yml
+++ b/defaults/maas.yml
@@ -5,14 +5,14 @@
maas_mirror_image_sections:
bootloaders:
keyring: /usr/share/keyrings/ubuntu-cloudimage-keyring.gpg
- upstream: ${_param:linux_system_repo_url}/maas-ephemeral-v3/
+ upstream: ${_param:linux_system_repo_update_url}/maas-ephemeral-v3/
local_dir: /srv/http/${_param:mcp_version}/maas-ephemeral-v3/
count: 1
# i386 need for pxe
filters: ['arch~(i386|amd64)', 'os~(grub*|pxelinux*)']
xenial:
keyring: /usr/share/keyrings/ubuntu-cloudimage-keyring.gpg
- upstream: ${_param:linux_system_repo_url}/maas-ephemeral-v3/
+ upstream: ${_param:linux_system_repo_update_url}/maas-ephemeral-v3/
local_dir: /srv/http/${_param:mcp_version}/maas-ephemeral-v3/
count: 1
filters: ['release~(xenial)', 'arch~(amd64)', 'subarch~(generic|hwe-16*|ga-16*)']
diff --git a/docker/swarm/stack/aptly.yml b/docker/swarm/stack/aptly.yml
index 3282641..f4af5c6 100644
--- a/docker/swarm/stack/aptly.yml
+++ b/docker/swarm/stack/aptly.yml
@@ -22,6 +22,7 @@
- 18084:8080
volumes:
- /srv/volumes/aptly:/var/lib/aptly
+ - /dev/urandom:/dev/random:ro
public:
deploy:
replicas: ${_param:docker_stack_aptly_public_replicas}
diff --git a/linux/system/repo/mcp/apt_mirantis/update/maas.yml b/linux/system/repo/mcp/apt_mirantis/update/maas.yml
new file mode 100644
index 0000000..650db89
--- /dev/null
+++ b/linux/system/repo/mcp/apt_mirantis/update/maas.yml
@@ -0,0 +1,15 @@
+classes:
+- system.linux.system.repo.keystorage.maas
+parameters:
+ linux:
+ system:
+ repo:
+ mcp_maas_update:
+ source: "deb [arch=amd64] ${_param:linux_system_repo_mcp_update_maas_url}/${_param:linux_system_codename} ${_param:linux_system_codename} main"
+ key: ${_param:linux_system_repo_mcp_maas_key}
+ architectures: amd64
+ clean_file: true
+ pin:
+ - pin: 'release o=LP-PPA-maas-stable'
+ priority: 1100
+ package: '*'
diff --git a/maas/region/boot_sources/maas_ephemeral_v3/init.yml b/maas/region/boot_sources/maas_ephemeral_v3/init.yml
index 168dfb6..774395a 100644
--- a/maas/region/boot_sources/maas_ephemeral_v3/init.yml
+++ b/maas/region/boot_sources/maas_ephemeral_v3/init.yml
@@ -1,6 +1,6 @@
parameters:
_param:
- maas_region_boot_sources_maas_ephemeral_v3_bs_url: https://mirror.mirantis.com/${_param:mcp_version}/maas-ephemeral-v3/
+ maas_region_boot_sources_maas_ephemeral_v3_bs_url: ${_param:linux_system_repo_update_url}/maas-ephemeral-v3/
maas:
region:
boot_sources_delete_all_others: true
diff --git a/maas/region/single.yml b/maas/region/single.yml
index e3d0305..175fbff 100644
--- a/maas/region/single.yml
+++ b/maas/region/single.yml
@@ -4,7 +4,7 @@
parameters:
_param:
maas_admin_username: mirantis
- maas_region_main_archive: https://mirror.mirantis.com/${_param:mcp_version}/ubuntu/
+ maas_region_main_archive: ${_param:linux_system_repo_update_url}/ubuntu/
maas:
cluster:
enabled: true