aptly mirror parametrization
PROD-15379
Change-Id: Icff58138405245e968d63539ec7b0df2a313b6fd
diff --git a/aptly/server/mirror/ubuntu/xenial/ceph.yml b/aptly/server/mirror/ubuntu/xenial/ceph.yml
index 50afc3e..f3ade60 100644
--- a/aptly/server/mirror/ubuntu/xenial/ceph.yml
+++ b/aptly/server/mirror/ubuntu/xenial/ceph.yml
@@ -2,16 +2,20 @@
_param:
ceph_version: luminous
apt_mk_version: stable
+ mirror_ceph-xenial_source: http://download.ceph.com/debian-${_param:ceph_version}
+ mirror_ceph-xenial_distribution: xenial
+ mirror_ceph-xenial_components: main
+ mirror_ceph-xenial_gpgkeys:
+ - 460F3994
aptly:
server:
mirror:
ceph-xenial:
- source: http://download.ceph.com/debian-${_param:ceph_version}
- distribution: xenial
- components: main
+ source: ${_param:mirror_ceph-xenial_source}
+ distribution: ${_param:mirror_ceph-xenial_distribution}
+ components: ${_param:mirror_ceph-xenial_components}
architectures: amd64
- gpgkeys:
- - 460F3994
+ gpgkeys: ${_param:mirror_ceph-xenial_gpgkeys}
publisher:
component: ceph
distributions:
diff --git a/aptly/server/mirror/ubuntu/xenial/ceph_mirantis.yml b/aptly/server/mirror/ubuntu/xenial/ceph_mirantis.yml
index eda0368..a2e28ee 100644
--- a/aptly/server/mirror/ubuntu/xenial/ceph_mirantis.yml
+++ b/aptly/server/mirror/ubuntu/xenial/ceph_mirantis.yml
@@ -1,16 +1,20 @@
parameters:
_param:
apt_mk_version: stable
+ mirror_ubuntu-xenial-ceph-mirantis_source: http://eu.mirror.fuel-infra.org/decapod/ceph/jewel-xenial
+ mirror_ubuntu-xenial-ceph-mirantis_distribution: jewel-xenial
+ mirror_ubuntu-xenial-ceph-mirantis_components: main
+ mirror_ubuntu-xenial-ceph-mirantis_gpgkeys:
+ - 460F3994
aptly:
server:
mirror:
ubuntu-xenial-ceph-mirantis:
- source: http://eu.mirror.fuel-infra.org/decapod/ceph/jewel-xenial
- distribution: jewel-xenial
- components: main
+ source: ${_param:mirror_ubuntu-xenial-ceph-mirantis_source}
+ distribution: ${_param:mirror_ubuntu-xenial-ceph-mirantis_distribution}
+ components: ${_param:mirror_ubuntu-xenial-ceph-mirantis_components}
architectures: amd64
- gpgkeys:
- - 460F3994
+ gpgkeys: ${_param:mirror_ubuntu-xenial-ceph-mirantis_gpgkeys}
publisher:
component: ceph-mirantis
distributions:
diff --git a/aptly/server/mirror/ubuntu/xenial/docker.yml b/aptly/server/mirror/ubuntu/xenial/docker.yml
index b5d98c5..5c1f719 100644
--- a/aptly/server/mirror/ubuntu/xenial/docker.yml
+++ b/aptly/server/mirror/ubuntu/xenial/docker.yml
@@ -1,14 +1,19 @@
parameters:
+ _param:
+ mirror_docker-xenial_source: 'https://download.docker.com/linux/ubuntu'
+ mirror_docker-xenial_distribution: xenial
+ mirror_docker-xenial_components: stable
+ mirror_docker-xenial_gpgkeys:
+ - 9DC858229FC7DD38854AE2D88D81803C0EBFCD88
aptly:
server:
mirror:
docker-xenial:
- source: 'https://download.docker.com/linux/ubuntu'
- distribution: xenial
- components: stable
+ source: ${_param:mirror_docker-xenial_source}
+ distribution: ${_param:mirror_docker-xenial_distribution}
+ components: ${_param:mirror_docker-xenial_components}
architectures: amd64
- gpgkeys:
- - 9DC858229FC7DD38854AE2D88D81803C0EBFCD88
+ gpgkeys: ${_param:mirror_docker-xenial_gpgkeys}
publisher:
component: docker
distributions:
diff --git a/aptly/server/mirror/ubuntu/xenial/glusterfs.yml b/aptly/server/mirror/ubuntu/xenial/glusterfs.yml
index 248de32..5ad4089 100644
--- a/aptly/server/mirror/ubuntu/xenial/glusterfs.yml
+++ b/aptly/server/mirror/ubuntu/xenial/glusterfs.yml
@@ -2,16 +2,20 @@
_param:
apt_mk_version: stable
glusterfs_version: 3.8
+ mirror_glusterfs_upstream_xenial_source: http://ppa.launchpad.net/gluster/glusterfs-${_param:glusterfs_version}/ubuntu
+ mirror_glusterfs_upstream_xenial_distribution: xenial
+ mirror_glusterfs_upstream_xenial_components: main
+ mirror_glusterfs_upstream_xenial_gpgkeys:
+ - 3FE869A9
aptly:
server:
mirror:
glusterfs_upstream_xenial:
- source: http://ppa.launchpad.net/gluster/glusterfs-${_param:glusterfs_version}/ubuntu
- distribution: xenial
- components: main
+ source: ${_param:mirror_glusterfs_upstream_xenial_source}
+ distribution: ${_param:mirror_glusterfs_upstream_xenial_distribution}
+ components: ${_param:mirror_glusterfs_upstream_xenial_components}
architectures: amd64
- gpgkeys:
- - 3FE869A9
+ gpgkeys: ${_param:mirror_glusterfs_upstream_xenial_gpgkeys}
publisher:
component: glusterfs
distributions:
diff --git a/aptly/server/mirror/ubuntu/xenial/grafana.yml b/aptly/server/mirror/ubuntu/xenial/grafana.yml
index 8dbb6ea..4ae2047 100644
--- a/aptly/server/mirror/ubuntu/xenial/grafana.yml
+++ b/aptly/server/mirror/ubuntu/xenial/grafana.yml
@@ -1,16 +1,20 @@
parameters:
_param:
apt_mk_version: stable
+ mirror_grafana-xenial_source: https://packagecloud.io/grafana/stable/debian/
+ mirror_grafana-xenial_distribution: jessie
+ mirror_grafana-xenial_components: main
+ mirror_grafana-xenial_gpgkeys:
+ - D59097AB
aptly:
server:
mirror:
grafana-xenial:
- source: https://packagecloud.io/grafana/stable/debian/
- distribution: jessie
- components: main
+ source: ${_param:mirror_grafana-xenial_source}
+ distribution: ${_param:mirror_grafana-xenial_distribution}
+ components: ${_param:mirror_grafana-xenial_components}
architectures: amd64
- gpgkeys:
- - D59097AB
+ gpgkeys: ${_param:mirror_grafana-xenial_gpgkeys}
publisher:
component: grafana
distributions:
diff --git a/aptly/server/mirror/ubuntu/xenial/hp.yml b/aptly/server/mirror/ubuntu/xenial/hp.yml
index 5b84417..9f5c6ef 100644
--- a/aptly/server/mirror/ubuntu/xenial/hp.yml
+++ b/aptly/server/mirror/ubuntu/xenial/hp.yml
@@ -1,17 +1,22 @@
parameters:
+ _param:
+ mirror_hp-xenial_source: http://downloads.linux.hpe.com/SDR/repo/mcp/Ubuntu
+ mirror_hp-xenial_distribution: xenial/current
+ mirror_hp-xenial_components: non-free
+ mirror_hp-xenial_gpgkeys:
+ - 26C2B797
+ - B1275EA3
+ - 5CE2D476
+ - 2689B887
aptly:
server:
mirror:
hp-xenial:
- source: http://downloads.linux.hpe.com/SDR/repo/mcp/Ubuntu
- distribution: xenial/current
- components: non-free
+ source: ${_param:mirror_hp-xenial_source}
+ distribution: ${_param:mirror_hp-xenial_distribution}
+ components: ${_param:mirror_hp-xenial_components}
architectures: amd64
- gpgkeys:
- - 26C2B797
- - B1275EA3
- - 5CE2D476
- - 2689B887
+ gpgkeys: ${_param:mirror_hp-xenial_gpgkeys}
publisher:
component: hp-non-free
distributions:
diff --git a/aptly/server/mirror/ubuntu/xenial/influxdb.yml b/aptly/server/mirror/ubuntu/xenial/influxdb.yml
index a2ac597..2f61cb4 100644
--- a/aptly/server/mirror/ubuntu/xenial/influxdb.yml
+++ b/aptly/server/mirror/ubuntu/xenial/influxdb.yml
@@ -1,16 +1,20 @@
parameters:
_param:
apt_mk_version: stable
+ mirror_influxdb-xenial_source: https://repos.influxdata.com/ubuntu/
+ mirror_influxdb-xenial_distribution: xenial
+ mirror_influxdb-xenial_components: stable
+ mirror_influxdb-xenial_gpgkeys:
+ - 2582E0C5
aptly:
server:
mirror:
influxdb-xenial:
- source: https://repos.influxdata.com/ubuntu/
- distribution: xenial
- components: stable
+ source: ${_param:mirror_influxdb-xenial_source}
+ distribution: ${_param:mirror_influxdb-xenial_distribution}
+ components: ${_param:mirror_influxdb-xenial_components}
architectures: amd64
- gpgkeys:
- - 2582E0C5
+ gpgkeys: ${_param:mirror_influxdb-xenial_gpgkeys}
publisher:
component: influxdb
distributions:
diff --git a/aptly/server/mirror/ubuntu/xenial/maas.yml b/aptly/server/mirror/ubuntu/xenial/maas.yml
index 0e4a559..75cc04a 100644
--- a/aptly/server/mirror/ubuntu/xenial/maas.yml
+++ b/aptly/server/mirror/ubuntu/xenial/maas.yml
@@ -1,16 +1,20 @@
parameters:
_param:
apt_mk_version: stable
+ mirror_maas-xenial_source: http://ppa.launchpad.net/maas/stable/ubuntu
+ mirror_maas-xenial_distribution: xenial
+ mirror_maas-xenial_components: main
+ mirror_maas-xenial_gpgkeys:
+ - 684D4A1C
aptly:
server:
mirror:
maas-xenial:
- source: http://ppa.launchpad.net/maas/stable/ubuntu
- distribution: xenial
- components: main
+ source: ${_param:mirror_maas-xenial_source}
+ distribution: ${_param:mirror_maas-xenial_distribution}
+ components: ${_param:mirror_maas-xenial_components}
architectures: amd64
- gpgkeys:
- - 684D4A1C
+ gpgkeys: ${_param:mirror_maas-xenial_gpgkeys}
publisher:
component: maas
distributions:
diff --git a/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/extra.yml b/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/extra.yml
index 7231ac0..fbdc0f9 100644
--- a/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/extra.yml
+++ b/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/extra.yml
@@ -1,17 +1,22 @@
parameters:
_param:
apt_mk_version: stable
+ mirror_mirantis_openstack_xenial_extra_source: http://apt-mk.mirantis.com/xenial/
+ mirror_mirantis_openstack_xenial_extra_distribution: ${_param:apt_mk_version}
+ mirror_mirantis_openstack_xenial_extra_components: extra
+ mirror_mirantis_openstack_xenial_extra_key_url: "http://apt-mk.mirantis.com/public.gpg"
+ mirror_mirantis_openstack_xenial_extra_gpgkeys:
+ - A76882D3
aptly:
server:
mirror:
mirantis_openstack_xenial_extra:
- source: http://apt-mk.mirantis.com/xenial/
- distribution: ${_param:apt_mk_version}
- components: extra
+ source: ${_param:mirror_mirantis_openstack_xenial_extra_source}
+ distribution: ${_param:mirror_mirantis_openstack_xenial_extra_distribution}
+ components: ${_param:mirror_mirantis_openstack_xenial_extra_components}
architectures: amd64
- key_url: "http://apt-mk.mirantis.com/public.gpg"
- gpgkeys:
- - A76882D3
+ key_url: ${_param:mirror_mirantis_openstack_xenial_extra_key_url}
+ gpgkeys: ${_param:mirror_mirantis_openstack_xenial_extra_gpgkeys}
publisher:
component: extra
distributions:
diff --git a/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/oc31.yml b/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/oc31.yml
index cbd4f29..b7a8def 100644
--- a/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/oc31.yml
+++ b/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/oc31.yml
@@ -1,17 +1,22 @@
parameters:
_param:
apt_mk_version: stable
+ mirror_mcp_opencontrail_xenial_oc31_source: http://apt-mk.mirantis.com/xenial/
+ mirror_mcp_opencontrail_xenial_oc31_distribution: ${_param:apt_mk_version}
+ mirror_mcp_opencontrail_xenial_oc31_components: oc31
+ mirror_mcp_opencontrail_xenial_oc31_key_url: "http://apt-mk.mirantis.com/public.gpg"
+ mirror_mcp_opencontrail_xenial_oc31_gpgkeys:
+ - A76882D3
aptly:
server:
mirror:
mcp_opencontrail_xenial_oc31:
- source: http://apt-mk.mirantis.com/xenial/
- distribution: ${_param:apt_mk_version}
- components: oc31
+ source: ${_param:mirror_mcp_opencontrail_xenial_oc31_source}
+ distribution: ${_param:mirror_mcp_opencontrail_xenial_oc31_distribution}
+ components: ${_param:mirror_mcp_opencontrail_xenial_oc31_components}
architectures: amd64
- key_url: "http://apt-mk.mirantis.com/public.gpg"
- gpgkeys:
- - A76882D3
+ key_url: ${_param:mirror_mcp_opencontrail_xenial_oc31_key_url}
+ gpgkeys: ${_param:mirror_mcp_opencontrail_xenial_oc31_gpgkeys}
publisher:
component: oc31
distributions:
diff --git a/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/oc311.yml b/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/oc311.yml
index bfa1638..bfbb099 100644
--- a/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/oc311.yml
+++ b/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/oc311.yml
@@ -1,17 +1,22 @@
parameters:
_param:
apt_mk_version: stable
+ mirror_mcp_opencontrail_xenial_oc311_source: http://apt-mk.mirantis.com/xenial/
+ mirror_mcp_opencontrail_xenial_oc311_distribution: ${_param:apt_mk_version}
+ mirror_mcp_opencontrail_xenial_oc311_components: oc311
+ mirror_mcp_opencontrail_xenial_oc311_key_url: "http://apt-mk.mirantis.com/public.gpg"
+ mirror_mcp_opencontrail_xenial_oc311_gpgkeys:
+ - A76882D3
aptly:
server:
mirror:
mcp_opencontrail_xenial_oc311:
- source: http://apt-mk.mirantis.com/xenial/
- distribution: ${_param:apt_mk_version}
- components: oc311
+ source: ${_param:mirror_mcp_opencontrail_xenial_oc311_source}
+ distribution: ${_param:mirror_mcp_opencontrail_xenial_oc311_distribution}
+ components: ${_param:mirror_mcp_opencontrail_xenial_oc311_components}
architectures: amd64
- key_url: "http://apt-mk.mirantis.com/public.gpg"
- gpgkeys:
- - A76882D3
+ key_url: ${_param:mirror_mcp_opencontrail_xenial_oc311_key_url}
+ gpgkeys: ${_param:mirror_mcp_opencontrail_xenial_oc311_gpgkeys}
publisher:
component: oc311
distributions:
diff --git a/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/oc32.yml b/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/oc32.yml
index 40ca5d1..012634b 100644
--- a/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/oc32.yml
+++ b/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/oc32.yml
@@ -1,17 +1,22 @@
parameters:
_param:
apt_mk_version: stable
+ mirror_mcp_opencontrail_xenial_oc32_source: http://apt-mk.mirantis.com/xenial/
+ mirror_mcp_opencontrail_xenial_oc32_distribution: ${_param:apt_mk_version}
+ mirror_mcp_opencontrail_xenial_oc32_components: oc32
+ mirror_mcp_opencontrail_xenial_oc32_key_url: "http://apt-mk.mirantis.com/public.gpg"
+ mirror_mcp_opencontrail_xenial_oc32_gpgkeys:
+ - A76882D3
aptly:
server:
mirror:
mcp_opencontrail_xenial_oc32:
- source: http://apt-mk.mirantis.com/xenial/
- distribution: ${_param:apt_mk_version}
- components: oc32
+ source: ${_param:mirror_mcp_opencontrail_xenial_oc32_source}
+ distribution: ${_param:mirror_mcp_opencontrail_xenial_oc32_distribution}
+ components: ${_param:mirror_mcp_opencontrail_xenial_oc32_components}
architectures: amd64
- key_url: "http://apt-mk.mirantis.com/public.gpg"
- gpgkeys:
- - A76882D3
+ key_url: ${_param:mirror_mcp_opencontrail_xenial_oc32_key_url}
+ gpgkeys: ${_param:mirror_mcp_opencontrail_xenial_oc32_gpgkeys}
publisher:
component: oc32
distributions:
diff --git a/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/oc323.yml b/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/oc323.yml
index 2275c07..064ea75 100644
--- a/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/oc323.yml
+++ b/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/oc323.yml
@@ -1,17 +1,22 @@
parameters:
_param:
apt_mk_version: stable
+ mirror_mcp_opencontrail_xenial_oc323_source: http://apt-mk.mirantis.com/xenial/
+ mirror_mcp_opencontrail_xenial_oc323_distribution: ${_param:apt_mk_version}
+ mirror_mcp_opencontrail_xenial_oc323_components: oc323
+ mirror_mcp_opencontrail_xenial_oc323_key_url: "http://apt-mk.mirantis.com/public.gpg"
+ mirror_mcp_opencontrail_xenial_oc323_gpgkeys:
+ - A76882D3
aptly:
server:
mirror:
mcp_opencontrail_xenial_oc323:
- source: http://apt-mk.mirantis.com/xenial/
- distribution: ${_param:apt_mk_version}
- components: oc323
+ source: ${_param:mirror_mcp_opencontrail_xenial_oc323_source}
+ distribution: ${_param:mirror_mcp_opencontrail_xenial_oc323_distribution}
+ components: ${_param:mirror_mcp_opencontrail_xenial_oc323_components}
architectures: amd64
- key_url: "http://apt-mk.mirantis.com/public.gpg"
- gpgkeys:
- - A76882D3
+ key_url: ${_param:mirror_mcp_opencontrail_xenial_oc323_key_url}
+ gpgkeys: ${_param:mirror_mcp_opencontrail_xenial_oc323_gpgkeys}
publisher:
component: oc323
distributions:
diff --git a/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/ocata.yml b/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/ocata.yml
index fc0e512..8282405 100644
--- a/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/ocata.yml
+++ b/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/ocata.yml
@@ -1,17 +1,22 @@
parameters:
_param:
apt_mk_version: stable
+ mirror_mk_openstack_xenial_ocata_source: http://apt-mk.mirantis.com/xenial/
+ mirror_mk_openstack_xenial_ocata_distribution: ${_param:apt_mk_version}
+ mirror_mk_openstack_xenial_ocata_components: ocata
+ mirror_mk_openstack_xenial_ocata_key_url: "http://apt-mk.mirantis.com/public.gpg"
+ mirror_mk_openstack_xenial_ocata_gpgkeys:
+ - A76882D3
aptly:
server:
mirror:
mk_openstack_xenial_ocata:
- source: http://apt-mk.mirantis.com/xenial/
- distribution: ${_param:apt_mk_version}
- components: ocata
+ source: ${_param:mirror_mk_openstack_xenial_ocata_source}
+ distribution: ${_param:mirror_mk_openstack_xenial_ocata_distribution}
+ components: ${_param:mirror_mk_openstack_xenial_ocata_components}
architectures: amd64
- key_url: "http://apt-mk.mirantis.com/public.gpg"
- gpgkeys:
- - A76882D3
+ key_url: ${_param:mirror_mk_openstack_xenial_ocata_key_url}
+ gpgkeys: ${_param:mirror_mk_openstack_xenial_ocata_gpgkeys}
publisher:
component: ocata
distributions:
diff --git a/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/salt.yml b/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/salt.yml
index f5e4ca4..fd78f2c 100644
--- a/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/salt.yml
+++ b/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/salt.yml
@@ -1,17 +1,22 @@
parameters:
_param:
apt_mk_version: stable
+ mirror_mirantis_openstack_xenial_salt_source: http://apt-mk.mirantis.com/xenial/
+ mirror_mirantis_openstack_xenial_salt_distribution: ${_param:apt_mk_version}
+ mirror_mirantis_openstack_xenial_salt_components: salt
+ mirror_mirantis_openstack_xenial_salt_key_url: "http://apt-mk.mirantis.com/public.gpg"
+ mirror_mirantis_openstack_xenial_salt_gpgkeys:
+ - A76882D3
aptly:
server:
mirror:
mirantis_openstack_xenial_salt:
- source: http://apt-mk.mirantis.com/xenial/
- distribution: ${_param:apt_mk_version}
- components: salt
+ source: ${_param:mirror_mirantis_openstack_xenial_salt_source}
+ distribution: ${_param:mirror_mirantis_openstack_xenial_salt_distribution}
+ components: ${_param:mirror_mirantis_openstack_xenial_salt_components}
architectures: amd64
- key_url: "http://apt-mk.mirantis.com/public.gpg"
- gpgkeys:
- - A76882D3
+ key_url: ${_param:mirror_mirantis_openstack_xenial_salt_key_url}
+ gpgkeys: ${_param:mirror_mirantis_openstack_xenial_salt_gpgkeys}
publisher:
component: salt
distributions:
diff --git a/aptly/server/mirror/ubuntu/xenial/mcp/openstack_mitaka.yml b/aptly/server/mirror/ubuntu/xenial/mcp/openstack_mitaka.yml
index 32254d5..b10e128 100644
--- a/aptly/server/mirror/ubuntu/xenial/mcp/openstack_mitaka.yml
+++ b/aptly/server/mirror/ubuntu/xenial/mcp/openstack_mitaka.yml
@@ -1,41 +1,73 @@
parameters:
+ _param:
+ mirror_mirantis_openstack_mitaka_xenial_source: http://mirror.fuel-infra.org/mcp-repos/mitaka/xenial
+ mirror_mirantis_openstack_mitaka_xenial_distribution: mitaka
+ mirror_mirantis_openstack_mitaka_xenial_components: main restricted
+ mirror_mirantis_openstack_mitaka_xenial_key_url: "http://mirror.fuel-infra.org/mcp-repos/mitaka/xenial/archive-mcpmitaka.key"
+ mirror_mirantis_openstack_mitaka_xenial_gpgkeys:
+ - 1FA22B08
+
+ mirror_mirantis_openstack_mitaka_hotfix_xenial_source: http://mirror.fuel-infra.org/mcp-repos/mitaka/xenial
+ mirror_mirantis_openstack_mitaka_hotfix_xenial_distribution: mitaka-hotfix
+ mirror_mirantis_openstack_mitaka_hotfix_xenial_components: main restricted
+ mirror_mirantis_openstack_mitaka_hotfix_xenial_key_url: "http://mirror.fuel-infra.org/mcp-repos/mitaka/xenial/archive-mcpmitaka.key"
+ mirror_mirantis_openstack_mitaka_hotfix_xenial_gpgkeys:
+ - 1FA22B08
+
+ mirror_mirantis_openstack_mitaka_security_xenial_source: http://mirror.fuel-infra.org/mcp-repos/mitaka/xenial
+ mirror_mirantis_openstack_mitaka_security_xenial_distribution: mitaka-security
+ mirror_mirantis_openstack_mitaka_security_xenial_components: main restricted
+ mirror_mirantis_openstack_mitaka_security_xenial_key_url: "http://mirror.fuel-infra.org/mcp-repos/mitaka/xenial/archive-mcpmitaka.key"
+ mirror_mirantis_openstack_mitaka_security_xenial_gpgkeys:
+ - 1FA22B08
+
+ mirror_mirantis_openstack_mitaka_updates_xenial_source: http://mirror.fuel-infra.org/mcp-repos/mitaka/xenial
+ mirror_mirantis_openstack_mitaka_updates_xenial_distribution: mitaka-updates
+ mirror_mirantis_openstack_mitaka_updates_xenial_components: main restricted
+ mirror_mirantis_openstack_mitaka_updates_xenial_key_url: "http://mirror.fuel-infra.org/mcp-repos/mitaka/xenial/archive-mcpmitaka.key"
+ mirror_mirantis_openstack_mitaka_updates_xenial_gpgkeys:
+ - 1FA22B08
+
+ mirror_mirantis_openstack_mitaka_holdback_xenial_source: http://mirror.fuel-infra.org/mcp-repos/mitaka/xenial
+ mirror_mirantis_openstack_mitaka_holdback_xenial_distribution: mitaka-holdback
+ mirror_mirantis_openstack_mitaka_holdback_xenial_components: main restricted
+ mirror_mirantis_openstack_mitaka_holdback_xenial_key_url: "http://mirror.fuel-infra.org/mcp-repos/mitaka/xenial/archive-mcpmitaka.key"
+ mirror_mirantis_openstack_mitaka_holdback_xenial_gpgkeys:
+ - 1FA22B08
aptly:
server:
mirror:
mirantis_openstack_mitaka_xenial:
- source: http://mirror.fuel-infra.org/mcp-repos/mitaka/xenial
- distribution: mitaka
- components: main restricted
+ source: ${_param:mirror_mirantis_openstack_mitaka_xenial_source}
+ distribution: ${_param:mirror_mirantis_openstack_mitaka_xenial_distribution}
+ components: ${_param:mirror_mirantis_openstack_mitaka_xenial_components}
architectures: amd64
- key_url: "http://mirror.fuel-infra.org/mcp-repos/mitaka/xenial/archive-mcpmitaka.key"
- gpgkeys:
- - 1FA22B08
+ key_url: ${_param:mirror_mirantis_openstack_mitaka_xenial_key_url}
+ gpgkeys: ${_param:mirror_mirantis_openstack_mitaka_xenial_gpgkeys}
publisher:
component: main
distributions:
- ubuntu-xenial/mitaka
mirantis_openstack_mitaka_hotfix_xenial:
- source: http://mirror.fuel-infra.org/mcp-repos/mitaka/xenial
- distribution: mitaka-hotfix
- components: main restricted
+ source: ${_param:mirror_mirantis_openstack_mitaka_hotfix_xenial_source}
+ distribution: ${_param:mirror_mirantis_openstack_mitaka_hotfix_xenial_distribution}
+ components: ${_param:mirror_mirantis_openstack_mitaka_hotfix_xenial_components}
architectures: amd64
- key_url: "http://mirror.fuel-infra.org/mcp-repos/mitaka/xenial/archive-mcpmitaka.key"
- gpgkeys:
- - 1FA22B08
+ key_url: ${_param:mirror_mirantis_openstack_mitaka_hotfix_xenial_key_url}
+ gpgkeys: ${_param:mirror_mirantis_openstack_mitaka_hotfix_xenial_gpgkeys}
publisher:
component: main
distributions:
- ubuntu-xenial/mitaka-hotfix
mirantis_openstack_mitaka_security_xenial:
- source: http://mirror.fuel-infra.org/mcp-repos/mitaka/xenial
- distribution: mitaka-security
- components: main restricted
+ source: ${_param:mirror_mirantis_openstack_mitaka_security_xenial_source}
+ distribution: ${_param:mirror_mirantis_openstack_mitaka_security_xenial_distribution}
+ components: ${_param:mirror_mirantis_openstack_mitaka_security_xenial_components}
architectures: amd64
- key_url: "http://mirror.fuel-infra.org/mcp-repos/mitaka/xenial/archive-mcpmitaka.key"
- gpgkeys:
- - 1FA22B08
+ key_url: ${_param:mirror_mirantis_openstack_mitaka_security_xenial_key_url}
+ gpgkeys: ${_param:mirror_mirantis_openstack_mitaka_security_xenial_gpgkeys}
publisher:
component: main
distributions:
@@ -43,13 +75,12 @@
# required for alternative horizon plugins/etc..
mirantis_openstack_mitaka_updates_xenial:
- source: http://mirror.fuel-infra.org/mcp-repos/mitaka/xenial
- distribution: mitaka-updates
- components: main restricted
+ source: ${_param:mirror_mirantis_openstack_mitaka_updates_xenial_source}
+ distribution: ${_param:mirror_mirantis_openstack_mitaka_updates_xenial_distribution}
+ components: ${_param:mirror_mirantis_openstack_mitaka_updates_xenial_components}
architectures: amd64
- key_url: "http://mirror.fuel-infra.org/mcp-repos/mitaka/xenial/archive-mcpmitaka.key"
- gpgkeys:
- - 1FA22B08
+ key_url: ${_param:mirror_mirantis_openstack_mitaka_updates_xenial_key_url}
+ gpgkeys: ${_param:mirror_mirantis_openstack_mitaka_updates_xenial_gpgkeys}
publisher:
component: main
distributions:
@@ -57,13 +88,12 @@
# required for salt formulas
mirantis_openstack_mitaka_holdback_xenial:
- source: http://mirror.fuel-infra.org/mcp-repos/mitaka/xenial
- distribution: mitaka-holdback
- components: main restricted
+ source: ${_param:mirror_mirantis_openstack_mitaka_holdback_xenial_source}
+ distribution: ${_param:mirror_mirantis_openstack_mitaka_holdback_xenial_distribution}
+ components: ${_param:mirror_mirantis_openstack_mitaka_holdback_xenial_components}
architectures: amd64
- key_url: "http://mirror.fuel-infra.org/mcp-repos/mitaka/xenial/archive-mcpmitaka.key"
- gpgkeys:
- - 1FA22B08
+ key_url: ${_param:mirror_mirantis_openstack_mitaka_holdback_xenial_key_url}
+ gpgkeys: ${_param:mirror_mirantis_openstack_mitaka_holdback_xenial_gpgkeys}
publisher:
component: main
distributions:
diff --git a/aptly/server/mirror/ubuntu/xenial/mcp/openstack_newton.yml b/aptly/server/mirror/ubuntu/xenial/mcp/openstack_newton.yml
index 2f08b2c..aa10e46 100644
--- a/aptly/server/mirror/ubuntu/xenial/mcp/openstack_newton.yml
+++ b/aptly/server/mirror/ubuntu/xenial/mcp/openstack_newton.yml
@@ -1,41 +1,73 @@
parameters:
+ _param:
+ mirror_mirantis_openstack_newton_xenial_source: http://mirror.fuel-infra.org/mcp-repos/newton/xenial
+ mirror_mirantis_openstack_newton_xenial_distribution: newton
+ mirror_mirantis_openstack_newton_xenial_components: main restricted
+ mirror_mirantis_openstack_newton_xenial_key_url: "http://mirror.fuel-infra.org/mcp-repos/newton/xenial/archive-mcpnewton.key"
+ mirror_mirantis_openstack_newton_xenial_gpgkeys:
+ - 1FA22B08
+
+ mirror_mirantis_openstack_newton_hotfix_xenial_source: http://mirror.fuel-infra.org/mcp-repos/newton/xenial
+ mirror_mirantis_openstack_newton_hotfix_xenial_distribution: newton-hotfix
+ mirror_mirantis_openstack_newton_hotfix_xenial_components: main restricted
+ mirror_mirantis_openstack_newton_hotfix_xenial_key_url: "http://mirror.fuel-infra.org/mcp-repos/newton/xenial/archive-mcpnewton.key"
+ mirror_mirantis_openstack_newton_hotfix_xenial_gpgkeys:
+ - 1FA22B08
+
+ mirror_mirantis_openstack_newton_security_xenial_source: http://mirror.fuel-infra.org/mcp-repos/newton/xenial
+ mirror_mirantis_openstack_newton_security_xenial_distribution: newton-security
+ mirror_mirantis_openstack_newton_security_xenial_components: main restricted
+ mirror_mirantis_openstack_newton_security_xenial_key_url: "http://mirror.fuel-infra.org/mcp-repos/newton/xenial/archive-mcpnewton.key"
+ mirror_mirantis_openstack_newton_security_xenial_gpgkeys:
+ - 1FA22B08
+
+ mirror_mirantis_openstack_newton_updates_xenial_source: http://mirror.fuel-infra.org/mcp-repos/newton/xenial
+ mirror_mirantis_openstack_newton_updates_xenial_distribution: newton-updates
+ mirror_mirantis_openstack_newton_updates_xenial_components: main restricted
+ mirror_mirantis_openstack_newton_updates_xenial_key_url: "http://mirror.fuel-infra.org/mcp-repos/newton/xenial/archive-mcpnewton.key"
+ mirror_mirantis_openstack_newton_updates_xenial_gpgkeys:
+ - 1FA22B08
+
+ mirror_mirantis_openstack_newton_holdback_xenial_source: http://mirror.fuel-infra.org/mcp-repos/newton/xenial
+ mirror_mirantis_openstack_newton_holdback_xenial_distribution: newton-holdback
+ mirror_mirantis_openstack_newton_holdback_xenial_components: main restricted
+ mirror_mirantis_openstack_newton_holdback_xenial_key_url: "http://mirror.fuel-infra.org/mcp-repos/newton/xenial/archive-mcpnewton.key"
+ mirror_mirantis_openstack_newton_holdback_xenial_gpgkeys:
+ - 1FA22B08
aptly:
server:
mirror:
mirantis_openstack_newton_xenial:
- source: http://mirror.fuel-infra.org/mcp-repos/newton/xenial
- distribution: newton
- components: main restricted
+ source: ${_param:mirror_mirantis_openstack_newton_xenial_source}
+ distribution: ${_param:mirror_mirantis_openstack_newton_xenial_distribution}
+ components: ${_param:mirror_mirantis_openstack_newton_xenial_components}
architectures: amd64
- key_url: "http://mirror.fuel-infra.org/mcp-repos/newton/xenial/archive-mcpnewton.key"
- gpgkeys:
- - 1FA22B08
+ key_url: ${_param:mirror_mirantis_openstack_newton_xenial_key_url}
+ gpgkeys: ${_param:mirror_mirantis_openstack_newton_xenial_gpgkeys}
publisher:
component: main
distributions:
- ubuntu-xenial/newton
mirantis_openstack_newton_hotfix_xenial:
- source: http://mirror.fuel-infra.org/mcp-repos/newton/xenial
- distribution: newton-hotfix
- components: main restricted
+ source: ${_param:mirror_mirantis_openstack_newton_hotfix_xenial_source}
+ distribution: ${_param:mirror_mirantis_openstack_newton_hotfix_xenial_distribution}
+ components: ${_param:mirror_mirantis_openstack_newton_hotfix_xenial_components}
architectures: amd64
- key_url: "http://mirror.fuel-infra.org/mcp-repos/newton/xenial/archive-mcpnewton.key"
- gpgkeys:
- - 1FA22B08
+ key_url: ${_param:mirror_mirantis_openstack_newton_hotfix_xenial_key_url}
+ gpgkeys: ${_param:mirror_mirantis_openstack_newton_hotfix_xenial_gpgkeys}
publisher:
component: main
distributions:
- ubuntu-xenial/newton-hotfix
mirantis_openstack_newton_security_xenial:
- source: http://mirror.fuel-infra.org/mcp-repos/newton/xenial
- distribution: newton-security
- components: main restricted
+ source: ${_param:mirror_mirantis_openstack_newton_security_xenial_source}
+ distribution: ${_param:mirror_mirantis_openstack_newton_security_xenial_distribution}
+ components: ${_param:mirror_mirantis_openstack_newton_security_xenial_components}
architectures: amd64
- key_url: "http://mirror.fuel-infra.org/mcp-repos/newton/xenial/archive-mcpnewton.key"
- gpgkeys:
- - 1FA22B08
+ key_url: ${_param:mirror_mirantis_openstack_newton_security_xenial_key_url}
+ gpgkeys: ${_param:mirror_mirantis_openstack_newton_security_xenial_gpgkeys}
publisher:
component: main
distributions:
@@ -43,13 +75,12 @@
# required for alternative horizon plugins/etc..
mirantis_openstack_newton_updates_xenial:
- source: http://mirror.fuel-infra.org/mcp-repos/newton/xenial
- distribution: newton-updates
- components: main restricted
+ source: ${_param:mirror_mirantis_openstack_newton_updates_xenial_source}
+ distribution: ${_param:mirror_mirantis_openstack_newton_updates_xenial_distribution}
+ components: ${_param:mirror_mirantis_openstack_newton_updates_xenial_components}
architectures: amd64
- key_url: "http://mirror.fuel-infra.org/mcp-repos/newton/xenial/archive-mcpnewton.key"
- gpgkeys:
- - 1FA22B08
+ key_url: ${_param:mirror_mirantis_openstack_newton_updates_xenial_key_url}
+ gpgkeys: ${_param:mirror_mirantis_openstack_newton_updates_xenial_gpgkeys}
publisher:
component: main
distributions:
@@ -57,15 +88,13 @@
# required for salt formulas
mirantis_openstack_newton_holdback_xenial:
- source: http://mirror.fuel-infra.org/mcp-repos/newton/xenial
- distribution: newton-holdback
- components: main restricted
+ source: ${_param:mirror_mirantis_openstack_newton_holdback_xenial_source}
+ distribution: ${_param:mirror_mirantis_openstack_newton_holdback_xenial_distribution}
+ components: ${_param:mirror_mirantis_openstack_newton_holdback_xenial_components}
architectures: amd64
- key_url: "http://mirror.fuel-infra.org/mcp-repos/newton/xenial/archive-mcpnewton.key"
- gpgkeys:
- - 1FA22B08
+ key_url: ${_param:mirror_mirantis_openstack_newton_holdback_xenial_key_url}
+ gpgkeys: ${_param:mirror_mirantis_openstack_newton_holdback_xenial_gpgkeys}
publisher:
component: main
distributions:
- - ubuntu-xenial/newton-holdback
-
+ - ubuntu-xenial/newton-holdback
\ No newline at end of file
diff --git a/aptly/server/mirror/ubuntu/xenial/mcp/openstack_ocata.yml b/aptly/server/mirror/ubuntu/xenial/mcp/openstack_ocata.yml
index 8c12ddc..45d1efe 100644
--- a/aptly/server/mirror/ubuntu/xenial/mcp/openstack_ocata.yml
+++ b/aptly/server/mirror/ubuntu/xenial/mcp/openstack_ocata.yml
@@ -1,41 +1,73 @@
parameters:
+ _param:
+ mirror_mirantis_openstack_ocata_xenial_source: http://mirror.fuel-infra.org/mcp-repos/ocata/xenial
+ mirror_mirantis_openstack_ocata_xenial_distribution: ocata
+ mirror_mirantis_openstack_ocata_xenial_components: main restricted
+ mirror_mirantis_openstack_ocata_xenial_key_url: "http://mirror.fuel-infra.org/mcp-repos/ocata/xenial/archive-mcpocata.key"
+ mirror_mirantis_openstack_ocata_xenial_gpgkeys:
+ - 1FA22B08
+
+ mirror_mirantis_openstack_ocata_hotfix_xenial_source: http://mirror.fuel-infra.org/mcp-repos/ocata/xenial
+ mirror_mirantis_openstack_ocata_hotfix_xenial_distribution: ocata-hotfix
+ mirror_mirantis_openstack_ocata_hotfix_xenial_components: main restricted
+ mirror_mirantis_openstack_ocata_hotfix_xenial_key_url: "http://mirror.fuel-infra.org/mcp-repos/ocata/xenial/archive-mcpocata.key"
+ mirror_mirantis_openstack_ocata_hotfix_xenial_gpgkeys:
+ - 1FA22B08
+
+ mirror_mirantis_openstack_ocata_security_xenial_source: http://mirror.fuel-infra.org/mcp-repos/ocata/xenial
+ mirror_mirantis_openstack_ocata_security_xenial_distribution: ocata-security
+ mirror_mirantis_openstack_ocata_security_xenial_components: main restricted
+ mirror_mirantis_openstack_ocata_security_xenial_key_url: "http://mirror.fuel-infra.org/mcp-repos/ocata/xenial/archive-mcpocata.key"
+ mirror_mirantis_openstack_ocata_security_xenial_gpgkeys:
+ - 1FA22B08
+
+ mirror_mirantis_openstack_ocata_updates_xenial_source: http://mirror.fuel-infra.org/mcp-repos/ocata/xenial
+ mirror_mirantis_openstack_ocata_updates_xenial_distribution: ocata-updates
+ mirror_mirantis_openstack_ocata_updates_xenial_components: main restricted
+ mirror_mirantis_openstack_ocata_updates_xenial_key_url: "http://mirror.fuel-infra.org/mcp-repos/ocata/xenial/archive-mcpocata.key"
+ mirror_mirantis_openstack_ocata_updates_xenial_gpgkeys:
+ - 1FA22B08
+
+ mirror_mirantis_openstack_ocata_holdback_xenial_source: http://mirror.fuel-infra.org/mcp-repos/ocata/xenial
+ mirror_mirantis_openstack_ocata_holdback_xenial_distribution: ocata-holdback
+ mirror_mirantis_openstack_ocata_holdback_xenial_components: main restricted
+ mirror_mirantis_openstack_ocata_holdback_xenial_key_url: "http://mirror.fuel-infra.org/mcp-repos/ocata/xenial/archive-mcpocata.key"
+ mirror_mirantis_openstack_ocata_holdback_xenial_gpgkeys:
+ - 1FA22B08
aptly:
server:
mirror:
mirantis_openstack_ocata_xenial:
- source: http://mirror.fuel-infra.org/mcp-repos/ocata/xenial
- distribution: ocata
- components: main restricted
+ source: ${_param:mirror_mirantis_openstack_ocata_xenial_source}
+ distribution: ${_param:mirror_mirantis_openstack_ocata_xenial_distribution}
+ components: ${_param:mirror_mirantis_openstack_ocata_xenial_components}
architectures: amd64
- key_url: "http://mirror.fuel-infra.org/mcp-repos/ocata/xenial/archive-mcpocata.key"
- gpgkeys:
- - 1FA22B08
+ key_url: ${_param:mirror_mirantis_openstack_ocata_xenial_key_url}
+ gpgkeys: ${_param:mirror_mirantis_openstack_ocata_xenial_gpgkeys}
publisher:
component: main
distributions:
- ubuntu-xenial/ocata
mirantis_openstack_ocata_hotfix_xenial:
- source: http://mirror.fuel-infra.org/mcp-repos/ocata/xenial
- distribution: ocata-hotfix
- components: main restricted
+ source: ${_param:mirror_mirantis_openstack_ocata_hotfix_xenial_source}
+ distribution: ${_param:mirror_mirantis_openstack_ocata_hotfix_xenial_distribution}
+ components: ${_param:mirror_mirantis_openstack_ocata_hotfix_xenial_components}
architectures: amd64
- key_url: "http://mirror.fuel-infra.org/mcp-repos/ocata/xenial/archive-mcpocata.key"
- gpgkeys:
- - 1FA22B08
+ key_url: ${_param:mirror_mirantis_openstack_ocata_hotfix_xenial_key_url}
+ gpgkeys: ${_param:mirror_mirantis_openstack_ocata_hotfix_xenial_gpgkeys}
publisher:
component: main
distributions:
- ubuntu-xenial/ocata-hotfix
mirantis_openstack_ocata_security_xenial:
- source: http://mirror.fuel-infra.org/mcp-repos/ocata/xenial
- distribution: ocata-security
- components: main restricted
+ source: ${_param:mirror_mirantis_openstack_ocata_security_xenial_source}
+ distribution: ${_param:mirror_mirantis_openstack_ocata_security_xenial_distribution}
+ components: ${_param:mirror_mirantis_openstack_ocata_security_xenial_components}
architectures: amd64
- key_url: "http://mirror.fuel-infra.org/mcp-repos/ocata/xenial/archive-mcpocata.key"
- gpgkeys:
- - 1FA22B08
+ key_url: ${_param:mirror_mirantis_openstack_ocata_security_xenial_key_url}
+ gpgkeys: ${_param:mirror_mirantis_openstack_ocata_security_xenial_gpgkeys}
publisher:
component: main
distributions:
@@ -43,13 +75,12 @@
# required for alternative horizon plugins/etc..
mirantis_openstack_ocata_updates_xenial:
- source: http://mirror.fuel-infra.org/mcp-repos/ocata/xenial
- distribution: ocata-updates
- components: main restricted
+ source: ${_param:mirror_mirantis_openstack_ocata_updates_xenial_source}
+ distribution: ${_param:mirror_mirantis_openstack_ocata_updates_xenial_distribution}
+ components: ${_param:mirror_mirantis_openstack_ocata_updates_xenial_components}
architectures: amd64
- key_url: "http://mirror.fuel-infra.org/mcp-repos/ocata/xenial/archive-mcpocata.key"
- gpgkeys:
- - 1FA22B08
+ key_url: ${_param:mirror_mirantis_openstack_ocata_updates_xenial_key_url}
+ gpgkeys: ${_param:mirror_mirantis_openstack_ocata_updates_xenial_gpgkeys}
publisher:
component: main
distributions:
@@ -57,15 +88,13 @@
# required for salt formulas
mirantis_openstack_ocata_holdback_xenial:
- source: http://mirror.fuel-infra.org/mcp-repos/ocata/xenial
- distribution: ocata-holdback
- components: main restricted
+ source: ${_param:mirror_mirantis_openstack_ocata_holdback_xenial_source}
+ distribution: ${_param:mirror_mirantis_openstack_ocata_holdback_xenial_distribution}
+ components: ${_param:mirror_mirantis_openstack_ocata_holdback_xenial_components}
architectures: amd64
- key_url: "http://mirror.fuel-infra.org/mcp-repos/ocata/xenial/archive-mcpocata.key"
- gpgkeys:
- - 1FA22B08
+ key_url: ${_param:mirror_mirantis_openstack_ocata_holdback_xenial_key_url}
+ gpgkeys: ${_param:mirror_mirantis_openstack_ocata_holdback_xenial_gpgkeys}
publisher:
component: main
distributions:
- - ubuntu-xenial/ocata-holdback
-
+ - ubuntu-xenial/ocata-holdback
\ No newline at end of file
diff --git a/aptly/server/mirror/ubuntu/xenial/salt.yml b/aptly/server/mirror/ubuntu/xenial/salt.yml
index a100bde..7a01bb3 100644
--- a/aptly/server/mirror/ubuntu/xenial/salt.yml
+++ b/aptly/server/mirror/ubuntu/xenial/salt.yml
@@ -1,17 +1,21 @@
parameters:
_param:
apt_mk_version: stable
+ mirror_salt-2016-3-xenial_source: http://repo.saltstack.com/apt/ubuntu/16.04/amd64/2016.3/
+ mirror_salt-2016-3-xenial_distribution: xenial
+ mirror_salt-2016-3-xenial_components: main
+ mirror_salt-2016-3-xenial_gpgkeys:
+ - DE57BFBE
aptly:
server:
mirror:
salt-2016.3-xenial:
- source: http://repo.saltstack.com/apt/ubuntu/16.04/amd64/2016.3/
- distribution: xenial
- components: main
+ source: ${_param:mirror_salt-2016-3-xenial_source}
+ distribution: ${_param:mirror_salt-2016-3-xenial_distribution}
+ components: ${_param:mirror_salt-2016-3-xenial_components}
architectures: amd64
- gpgkeys:
- - DE57BFBE
+ gpgkeys: ${_param:mirror_salt-2016-3-xenial_gpgkeys}
publisher:
component: salt
distributions:
- - ubuntu-xenial/${_param:apt_mk_version}
+ - ubuntu-xenial/${_param:apt_mk_version}
\ No newline at end of file
diff --git a/aptly/server/mirror/ubuntu/xenial/tcpcloud.yml b/aptly/server/mirror/ubuntu/xenial/tcpcloud.yml
index 740fa7b..a6c0a85 100644
--- a/aptly/server/mirror/ubuntu/xenial/tcpcloud.yml
+++ b/aptly/server/mirror/ubuntu/xenial/tcpcloud.yml
@@ -2,7 +2,47 @@
aptly:
server:
mirror:
+ mirror_tcpcloud-nightly-main-xenial_source: http://apt.tcpcloud.eu/nightly
+ mirror_tcpcloud-nightly-main-xenial_distribution: xenial
+ mirror_tcpcloud-nightly-main-xenial_components: main security
+ mirror_tcpcloud-nightly-main-xenial_key_url: "http://apt.tcpcloud.eu/public.gpg"
+ mirror_tcpcloud-nightly-main-xenial_gpgkeys:
+ - 3EF02D1C
+ mirror_tcpcloud-nightly-tcp-xenial_source: http://apt.tcpcloud.eu/nightly
+ mirror_tcpcloud-nightly-tcp-xenial_distribution: xenial
+ mirror_tcpcloud-nightly-tcp-xenial_components: tcp
+ mirror_tcpcloud-nightly-tcp-xenial_key_url: "http://apt.tcpcloud.eu/public.gpg"
+ mirror_tcpcloud-nightly-tcp-xenial_gpgkeys:
+ - 3EF02D1C
+
+ mirror_tcpcloud-nightly-extra-xenial_source: http://apt.tcpcloud.eu/nightly
+ mirror_tcpcloud-nightly-extra-xenial_distribution: xenial
+ mirror_tcpcloud-nightly-extra-xenial_components: extra
+ mirror_tcpcloud-nightly-tcp-xenial_key_url: "http://apt.tcpcloud.eu/public.gpg"
+ mirror_tcpcloud-nightly-extra-xenial_gpgkeys:
+ - 3EF02D1C
+
+ mirror_tcpcloud-nightly-salt-xenial_source: http://apt.tcpcloud.eu/nightly
+ mirror_tcpcloud-nightly-salt-xenial_distribution: xenial
+ mirror_tcpcloud-nightly-salt-xenial_components: tcp-salt
+ mirror_tcpcloud-nightly-tcp-xenial_key_url: "http://apt.tcpcloud.eu/public.gpg"
+ mirror_tcpcloud-nightly-salt-xenial_gpgkeys:
+ - 3EF02D1C
+
+ mirror_tcpcloud-nightly-oc30-xenial_source: http://apt.tcpcloud.eu/nightly
+ mirror_tcpcloud-nightly-oc30-xenial_distribution: xenial
+ mirror_tcpcloud-nightly-oc30-xenial_components: oc30
+ mirror_tcpcloud-nightly-tcp-xenial_key_url: "http://apt.tcpcloud.eu/public.gpg"
+ mirror_tcpcloud-nightly-oc30-xenial_gpgkeys:
+ - 3EF02D1C
+
+ mirror_tcpcloud-nightly-elastic-xenial_source: http://apt.tcpcloud.eu/nightly
+ mirror_tcpcloud-nightly-elastic-xenial_distribution: xenial
+ mirror_tcpcloud-nightly-elastic-xenial_components: elastic
+ mirror_tcpcloud-nightly-tcp-xenial_key_url: "http://apt.tcpcloud.eu/public.gpg"
+ mirror_tcpcloud-nightly-elastic-xenial_gpgkeys:
+ - 3EF02D1C
#TOOD: 4x the lower below
#tcpcloud-[stable/testing]-xxx-[xenial/xenial]:
#
@@ -10,44 +50,39 @@
# salt tcp-salt extra liberty mitaka oc30 security mitaka
tcpcloud-nightly-main-xenial:
- source: http://apt.tcpcloud.eu/nightly
- distribution: xenial
+ source: ${_param:mirror_tcpcloud-nightly-main-xenial_source}
+ distribution: ${_param:mirror_tcpcloud-nightly-main-xenial_distribution}
#TODO: extra component might not be needed; tcp is just for heka
- components: main security
+ components: ${_param:mirror_tcpcloud-nightly-main-xenial_components}
architectures: amd64
- key_url: "http://apt.tcpcloud.eu/public.gpg"
- gpgkeys:
- - 3EF02D1C
+ key_url: ${_param:mirror_tcpcloud-nightly-main-xenial_key_url}
+ gpgkeys: ${_param:mirror_tcpcloud-nightly-main-xenial_gpgkeys}
publisher:
component: tcp-main
distributions:
- ubuntu-xenial/nightly
-
tcpcloud-nightly-tcp-xenial:
- source: http://apt.tcpcloud.eu/nightly
- distribution: xenial
+ source: ${_param:mirror_tcpcloud-nightly-tcp-xenial_source}
+ distribution: ${_param:mirror_tcpcloud-nightly-tcp-xenial_distribution}
#TODO: extra component might not be needed; tcp is just for heka
- components: tcp
+ components: ${_param:mirror_tcpcloud-nightly-tcp-xenial_components}
architectures: amd64
- key_url: "http://apt.tcpcloud.eu/public.gpg"
- gpgkeys:
- - 3EF02D1C
+ key_url: ${_param:mirror_tcpcloud-nightly-tcp-xenial_key_url}
+ gpgkeys: ${_param:mirror_tcpcloud-nightly-tcp-xenial_gpgkeys}
publisher:
component: tcp
distributions:
- ubuntu-xenial/nightly
-
tcpcloud-nightly-extra-xenial:
- source: http://apt.tcpcloud.eu/nightly
- distribution: xenial
+ source: ${_param:mirror_tcpcloud-nightly-extra-xenial_source}
+ distribution: ${_param:mirror_tcpcloud-nightly-extra-xenial_distribution}
#TODO: extra component might not be needed; tcp is just for heka
- components: extra
+ components: ${_param:mirror_tcpcloud-nightly-extra-xenial_components}
architectures: amd64
- key_url: "http://apt.tcpcloud.eu/public.gpg"
- gpgkeys:
- - 3EF02D1C
+ key_url: ${_param:mirror_tcpcloud-nightly-extra-xenial_key_url}
+ gpgkeys: ${_param:mirror_tcpcloud-nightly-extra-xenial_gpgkeys}
publisher:
component: tcp-extra
distributions:
@@ -55,13 +90,12 @@
# required for salt formulas
tcpcloud-nightly-salt-xenial:
- source: http://apt.tcpcloud.eu/nightly
- distribution: xenial
- components: tcp-salt
+ source: ${_param:mirror_tcpcloud-nightly-salt-xenial_source}
+ distribution: ${_param:mirror_tcpcloud-nightly-salt-xenial_distribution}
+ components: ${_param:mirror_tcpcloud-nightly-salt-xenial_components}
architectures: amd64
- key_url: "http://apt.tcpcloud.eu/public.gpg"
- gpgkeys:
- - 3EF02D1C
+ key_url: ${_param:mirror_tcpcloud-nightly-salt-xenial_key_url}
+ gpgkeys: ${_param:mirror_tcpcloud-nightly-salt-xenial_gpgkeys}
publisher:
component: tcp-salt
distributions:
@@ -69,13 +103,12 @@
# required for opencontrail formulas
tcpcloud-nightly-oc30-xenial:
- source: http://apt.tcpcloud.eu/nightly
- distribution: xenial
- components: oc30
+ source: ${_param:mirror_tcpcloud-nightly-oc30-xenial_source}
+ distribution: ${_param:mirror_tcpcloud-nightly-oc30-xenial_distribution}
+ components: ${_param:mirror_tcpcloud-nightly-oc30-xenial_components}
architectures: amd64
- key_url: "http://apt.tcpcloud.eu/public.gpg"
- gpgkeys:
- - 3EF02D1C
+ key_url: ${_param:mirror_tcpcloud-nightly-oc30-xenial_key_url}
+ gpgkeys: ${_param:mirror_tcpcloud-nightly-oc30-xenial_gpgkeys}
publisher:
component: tcp-oc30
distributions:
@@ -83,15 +116,13 @@
# elastic, kibana is there
tcpcloud-nightly-elastic-xenial:
- source: http://apt.tcpcloud.eu/nightly
- distribution: xenial
- components: elastic
+ source: ${_param:mirror_tcpcloud-nightly-elastic-xenial_source}
+ distribution: ${_param:mirror_tcpcloud-nightly-elastic-xenial_distribution}
+ components: ${_param:mirror_tcpcloud-nightly-elastic-xenial_components}
architectures: amd64
- key_url: "http://apt.tcpcloud.eu/public.gpg"
- gpgkeys:
- - 3EF02D1C
+ key_url: ${_param:mirror_tcpcloud-nightly-elastic-xenial_key_url}
+ gpgkeys: ${_param:mirror_tcpcloud-nightly-elastic-xenial_gpgkeys}
publisher:
component: tcp-elastic
distributions:
- - ubuntu-xenial/nightly
-
+ - ubuntu-xenial/nightly
\ No newline at end of file
diff --git a/aptly/server/mirror/ubuntu/xenial/ubuntu/xenial-backports/main.yml b/aptly/server/mirror/ubuntu/xenial/ubuntu/xenial-backports/main.yml
index 9aeff43..f9ad68e 100644
--- a/aptly/server/mirror/ubuntu/xenial/ubuntu/xenial-backports/main.yml
+++ b/aptly/server/mirror/ubuntu/xenial/ubuntu/xenial-backports/main.yml
@@ -2,19 +2,23 @@
_param:
linux_system_country_code: cz
aptly_server_mirror_ubuntu_xenial_sources: ${_param:aptly_server_mirror_ubuntu_sources}
+ mirror_xenial-backports-main_source: http://${_param:linux_system_country_code}.archive.ubuntu.com/ubuntu/
+ mirror_xenial-backports-main_distribution: xenial-backports
+ mirror_xenial-backports-main_components: main
+ mirror_xenial-backports-main_gpgkeys:
+ - 40976EAF437D05B5
+ - 437D05B5
+ - C0B21F32
aptly:
server:
mirror:
xenial-backports-main:
- source: http://${_param:linux_system_country_code}.archive.ubuntu.com/ubuntu/
- distribution: xenial-backports
+ source: ${_param:mirror_xenial-backports-main_source}
+ distribution: ${_param:mirror_xenial-backports-main_distribution}
sources: ${_param:aptly_server_mirror_ubuntu_xenial_sources}
- components: main
+ components: ${_param:mirror_xenial-backports-main_components}
architectures: amd64
- gpgkeys:
- - 40976EAF437D05B5
- - 437D05B5
- - C0B21F32
+ gpgkeys: ${_param:mirror_xenial-backports-main_gpgkeys}
publisher:
component: main
distributions:
diff --git a/aptly/server/mirror/ubuntu/xenial/ubuntu/xenial-backports/multiverse.yml b/aptly/server/mirror/ubuntu/xenial/ubuntu/xenial-backports/multiverse.yml
index ffb9239..3ef9908 100644
--- a/aptly/server/mirror/ubuntu/xenial/ubuntu/xenial-backports/multiverse.yml
+++ b/aptly/server/mirror/ubuntu/xenial/ubuntu/xenial-backports/multiverse.yml
@@ -2,19 +2,23 @@
_param:
linux_system_country_code: cz
aptly_server_mirror_ubuntu_xenial_sources: ${_param:aptly_server_mirror_ubuntu_sources}
+ mirror_xenial-backports-multiverse_source: http://${_param:linux_system_country_code}.archive.ubuntu.com/ubuntu/
+ mirror_xenial-backports-multiverse_distribution: xenial-backports
+ mirror_xenial-backports-multiverse_components: multiverse
+ mirror_xenial-backports-multiverse_gpgkeys:
+ - 40976EAF437D05B5
+ - 437D05B5
+ - C0B21F32
aptly:
server:
mirror:
xenial-backports-multiverse:
- source: http://${_param:linux_system_country_code}.archive.ubuntu.com/ubuntu/
- distribution: xenial-backports
+ source: ${_param:mirror_xenial-backports-multiverse_source}
+ distribution: ${_param:mirror_xenial-backports-multiverse_distribution}
sources: ${_param:aptly_server_mirror_ubuntu_xenial_sources}
- components: multiverse
+ components: ${_param:mirror_xenial-backports-multiverse_components}
architectures: amd64
- gpgkeys:
- - 40976EAF437D05B5
- - 437D05B5
- - C0B21F32
+ gpgkeys: ${_param:mirror_xenial-backports-multiverse_gpgkeys}
publisher:
component: multiverse
distributions:
diff --git a/aptly/server/mirror/ubuntu/xenial/ubuntu/xenial-backports/restricted.yml b/aptly/server/mirror/ubuntu/xenial/ubuntu/xenial-backports/restricted.yml
index 29f061e..5a32ee2 100644
--- a/aptly/server/mirror/ubuntu/xenial/ubuntu/xenial-backports/restricted.yml
+++ b/aptly/server/mirror/ubuntu/xenial/ubuntu/xenial-backports/restricted.yml
@@ -2,19 +2,23 @@
_param:
linux_system_country_code: cz
aptly_server_mirror_ubuntu_xenial_sources: ${_param:aptly_server_mirror_ubuntu_sources}
+ mirror_xenial-backports-restricted_source: http://${_param:linux_system_country_code}.archive.ubuntu.com/ubuntu/
+ mirror_xenial-backports-restricted_distribution: xenial-backports
+ mirror_xenial-backports-restricted_components: restricted
+ mirror_xenial-backports-restricted_gpgkeys:
+ - 40976EAF437D05B5
+ - 437D05B5
+ - C0B21F32
aptly:
server:
mirror:
xenial-backports-restricted:
- source: http://${_param:linux_system_country_code}.archive.ubuntu.com/ubuntu/
+ source: ${_param:mirror_xenial-backports-restricted_source}
+ distribution: ${_param:mirror_xenial-backports-restricted_distribution}
sources: ${_param:aptly_server_mirror_ubuntu_xenial_sources}
- distribution: xenial-backports
- components: restricted
+ components: ${_param:mirror_xenial-backports-restricted_components}
architectures: amd64
- gpgkeys:
- - 40976EAF437D05B5
- - 437D05B5
- - C0B21F32
+ gpgkeys: ${_param:mirror_xenial-backports-restricted_gpgkeys}
publisher:
component: restricted
distributions:
diff --git a/aptly/server/mirror/ubuntu/xenial/ubuntu/xenial-backports/universe.yml b/aptly/server/mirror/ubuntu/xenial/ubuntu/xenial-backports/universe.yml
index cdf9af1..aca402e 100644
--- a/aptly/server/mirror/ubuntu/xenial/ubuntu/xenial-backports/universe.yml
+++ b/aptly/server/mirror/ubuntu/xenial/ubuntu/xenial-backports/universe.yml
@@ -2,19 +2,23 @@
_param:
linux_system_country_code: cz
aptly_server_mirror_ubuntu_xenial_sources: ${_param:aptly_server_mirror_ubuntu_sources}
+ mirror_xenial-backports-universe_source: http://${_param:linux_system_country_code}.archive.ubuntu.com/ubuntu/
+ mirror_xenial-backports-universe_distribution: xenial-backports
+ mirror_xenial-backports-universe_components: universe
+ mirror_xenial-backports-universe_gpgkeys:
+ - 40976EAF437D05B5
+ - 437D05B5
+ - C0B21F32
aptly:
server:
mirror:
xenial-backports-universe:
- source: http://${_param:linux_system_country_code}.archive.ubuntu.com/ubuntu/
+ source: ${_param:mirror_xenial-backports-universe_source}
+ distribution: ${_param:mirror_xenial-backports-universe_distribution}
sources: ${_param:aptly_server_mirror_ubuntu_xenial_sources}
- distribution: xenial-backports
- components: universe
+ components: ${_param:mirror_xenial-backports-universe_components}
architectures: amd64
- gpgkeys:
- - 40976EAF437D05B5
- - 437D05B5
- - C0B21F32
+ gpgkeys: ${_param:mirror_xenial-backports-universe_gpgkeys}
publisher:
component: universe
distributions:
diff --git a/aptly/server/mirror/ubuntu/xenial/ubuntu/xenial-proposed/main.yml b/aptly/server/mirror/ubuntu/xenial/ubuntu/xenial-proposed/main.yml
index 8763e94..920a16f 100644
--- a/aptly/server/mirror/ubuntu/xenial/ubuntu/xenial-proposed/main.yml
+++ b/aptly/server/mirror/ubuntu/xenial/ubuntu/xenial-proposed/main.yml
@@ -2,19 +2,23 @@
_param:
linux_system_country_code: cz
aptly_server_mirror_ubuntu_xenial_sources: ${_param:aptly_server_mirror_ubuntu_sources}
+ mirror_xenial-proposed-main_source: http://${_param:linux_system_country_code}.archive.ubuntu.com/ubuntu/
+ mirror_xenial-proposed-main_distribution: xenial-proposed
+ mirror_xenial-proposed-main_components: main
+ mirror_xenial-proposed-main_gpgkeys:
+ - 40976EAF437D05B5
+ - 437D05B5
+ - C0B21F32
aptly:
server:
mirror:
xenial-proposed-main:
- source: http://${_param:linux_system_country_code}.archive.ubuntu.com/ubuntu/
- distribution: xenial-proposed
+ source: ${_param:mirror_xenial-proposed-main_source}
+ distribution: ${_param:mirror_xenial-proposed-main_distribution}
sources: ${_param:aptly_server_mirror_ubuntu_xenial_sources}
- components: main
+ components: ${_param:mirror_xenial-proposed-main_components}
architectures: amd64
- gpgkeys:
- - 40976EAF437D05B5
- - 437D05B5
- - C0B21F32
+ gpgkeys: ${_param:mirror_xenial-proposed-main_gpgkeys}
publisher:
component: main
distributions:
diff --git a/aptly/server/mirror/ubuntu/xenial/ubuntu/xenial-proposed/multiverse.yml b/aptly/server/mirror/ubuntu/xenial/ubuntu/xenial-proposed/multiverse.yml
index 6263456..aa6cf27 100644
--- a/aptly/server/mirror/ubuntu/xenial/ubuntu/xenial-proposed/multiverse.yml
+++ b/aptly/server/mirror/ubuntu/xenial/ubuntu/xenial-proposed/multiverse.yml
@@ -2,19 +2,23 @@
_param:
linux_system_country_code: cz
aptly_server_mirror_ubuntu_xenial_sources: ${_param:aptly_server_mirror_ubuntu_sources}
+ mirror_xenial-proposed-multiverse_source: http://${_param:linux_system_country_code}.archive.ubuntu.com/ubuntu/
+ mirror_xenial-proposed-multiverse_distribution: xenial-proposed
+ mirror_xenial-proposed-multiverse_components: multiverse
+ mirror_xenial-proposed-multiverse_gpgkeys:
+ - 40976EAF437D05B5
+ - 437D05B5
+ - C0B21F32
aptly:
server:
mirror:
xenial-proposed-multiverse:
- source: http://${_param:linux_system_country_code}.archive.ubuntu.com/ubuntu/
- distribution: xenial-proposed
+ source: ${_param:mirror_xenial-proposed-multiverse_source}
+ distribution: ${_param:mirror_xenial-proposed-multiverse_distribution}
sources: ${_param:aptly_server_mirror_ubuntu_xenial_sources}
- components: multiverse
+ components: ${_param:mirror_xenial-proposed-multiverse_components}
architectures: amd64
- gpgkeys:
- - 40976EAF437D05B5
- - 437D05B5
- - C0B21F32
+ gpgkeys: ${_param:mirror_xenial-proposed-multiverse_gpgkeys}
publisher:
component: multiverse
distributions:
diff --git a/aptly/server/mirror/ubuntu/xenial/ubuntu/xenial-proposed/restricted.yml b/aptly/server/mirror/ubuntu/xenial/ubuntu/xenial-proposed/restricted.yml
index e6c1562..78aef0b 100644
--- a/aptly/server/mirror/ubuntu/xenial/ubuntu/xenial-proposed/restricted.yml
+++ b/aptly/server/mirror/ubuntu/xenial/ubuntu/xenial-proposed/restricted.yml
@@ -2,19 +2,23 @@
_param:
linux_system_country_code: cz
aptly_server_mirror_ubuntu_xenial_sources: ${_param:aptly_server_mirror_ubuntu_sources}
+ mirror_xenial-proposed-restricted_source: http://${_param:linux_system_country_code}.archive.ubuntu.com/ubuntu/
+ mirror_xenial-proposed-restricted_distribution: xenial-proposed
+ mirror_xenial-proposed-restricted_components: restricted
+ mirror_xenial-proposed-restricted_gpgkeys:
+ - 40976EAF437D05B5
+ - 437D05B5
+ - C0B21F32
aptly:
server:
mirror:
xenial-proposed-restricted:
- source: http://${_param:linux_system_country_code}.archive.ubuntu.com/ubuntu/
+ source: ${_param:mirror_xenial-proposed-restricted_source}
+ distribution: ${_param:mirror_xenial-proposed-restricted_distribution}
sources: ${_param:aptly_server_mirror_ubuntu_xenial_sources}
- distribution: xenial-proposed
- components: restricted
+ components: ${_param:mirror_xenial-proposed-restricted_components}
architectures: amd64
- gpgkeys:
- - 40976EAF437D05B5
- - 437D05B5
- - C0B21F32
+ gpgkeys: ${_param:mirror_xenial-proposed-restricted_gpgkeys}
publisher:
component: restricted
distributions:
diff --git a/aptly/server/mirror/ubuntu/xenial/ubuntu/xenial-proposed/universe.yml b/aptly/server/mirror/ubuntu/xenial/ubuntu/xenial-proposed/universe.yml
index 82c5bab..618e4e8 100644
--- a/aptly/server/mirror/ubuntu/xenial/ubuntu/xenial-proposed/universe.yml
+++ b/aptly/server/mirror/ubuntu/xenial/ubuntu/xenial-proposed/universe.yml
@@ -2,19 +2,23 @@
_param:
linux_system_country_code: cz
aptly_server_mirror_ubuntu_xenial_sources: ${_param:aptly_server_mirror_ubuntu_sources}
+ mirror_xenial-proposed-universe_source: http://${_param:linux_system_country_code}.archive.ubuntu.com/ubuntu/
+ mirror_xenial-proposed-universe_distribution: xenial-proposed
+ mirror_xenial-proposed-universe_components: universe
+ mirror_xenial-proposed-universe_gpgkeys:
+ - 40976EAF437D05B5
+ - 437D05B5
+ - C0B21F32
aptly:
server:
mirror:
xenial-proposed-universe:
- source: http://${_param:linux_system_country_code}.archive.ubuntu.com/ubuntu/
+ source: ${_param:mirror_xenial-proposed-universe_source}
+ distribution: ${_param:mirror_xenial-proposed-universe_distribution}
sources: ${_param:aptly_server_mirror_ubuntu_xenial_sources}
- distribution: xenial-proposed
- components: universe
+ components: ${_param:mirror_xenial-proposed-universe_components}
architectures: amd64
- gpgkeys:
- - 40976EAF437D05B5
- - 437D05B5
- - C0B21F32
+ gpgkeys: ${_param:mirror_xenial-proposed-universe_gpgkeys}
publisher:
component: universe
distributions:
diff --git a/aptly/server/mirror/ubuntu/xenial/ubuntu/xenial-security/main.yml b/aptly/server/mirror/ubuntu/xenial/ubuntu/xenial-security/main.yml
index 24d55ff..dc1309a 100644
--- a/aptly/server/mirror/ubuntu/xenial/ubuntu/xenial-security/main.yml
+++ b/aptly/server/mirror/ubuntu/xenial/ubuntu/xenial-security/main.yml
@@ -2,19 +2,23 @@
_param:
linux_system_country_code: cz
aptly_server_mirror_ubuntu_xenial_sources: ${_param:aptly_server_mirror_ubuntu_sources}
+ mirror_xenial-security-main_source: http://${_param:linux_system_country_code}.archive.ubuntu.com/ubuntu/
+ mirror_xenial-security-main_distribution: xenial-security
+ mirror_xenial-security-main_components: main
+ mirror_xenial-security-main_gpgkeys:
+ - 40976EAF437D05B5
+ - 437D05B5
+ - C0B21F32
aptly:
server:
mirror:
xenial-security-main:
- source: http://${_param:linux_system_country_code}.archive.ubuntu.com/ubuntu/
- distribution: xenial-security
+ source: ${_param:mirror_xenial-security-main_source}
+ distribution: ${_param:mirror_xenial-security-main_distribution}
sources: ${_param:aptly_server_mirror_ubuntu_xenial_sources}
- components: main
+ components: ${_param:mirror_xenial-security-main_components}
architectures: amd64
- gpgkeys:
- - 40976EAF437D05B5
- - 437D05B5
- - C0B21F32
+ gpgkeys: ${_param:mirror_xenial-security-main_gpgkeys}
publisher:
component: main
distributions:
diff --git a/aptly/server/mirror/ubuntu/xenial/ubuntu/xenial-security/multiverse.yml b/aptly/server/mirror/ubuntu/xenial/ubuntu/xenial-security/multiverse.yml
index e503cff..77fcd1c 100644
--- a/aptly/server/mirror/ubuntu/xenial/ubuntu/xenial-security/multiverse.yml
+++ b/aptly/server/mirror/ubuntu/xenial/ubuntu/xenial-security/multiverse.yml
@@ -2,19 +2,23 @@
_param:
linux_system_country_code: cz
aptly_server_mirror_ubuntu_xenial_sources: ${_param:aptly_server_mirror_ubuntu_sources}
+ mirror_xenial-security-multiverse_source: http://${_param:linux_system_country_code}.archive.ubuntu.com/ubuntu/
+ mirror_xenial-security-multiverse_distribution: xenial-security
+ mirror_xenial-security-multiverse_components: multiverse
+ mirror_xenial-security-multiverse_gpgkeys:
+ - 40976EAF437D05B5
+ - 437D05B5
+ - C0B21F32
aptly:
server:
mirror:
xenial-security-multiverse:
- source: http://${_param:linux_system_country_code}.archive.ubuntu.com/ubuntu/
- distribution: xenial-security
+ source: ${_param:mirror_xenial-security-multiverse_source}
+ distribution: ${_param:mirror_xenial-security-multiverse_distribution}
sources: ${_param:aptly_server_mirror_ubuntu_xenial_sources}
- components: multiverse
+ components: ${_param:mirror_xenial-security-multiverse_components}
architectures: amd64
- gpgkeys:
- - 40976EAF437D05B5
- - 437D05B5
- - C0B21F32
+ gpgkeys: ${_param:mirror_xenial-security-multiverse_gpgkeys}
publisher:
component: multiverse
distributions:
diff --git a/aptly/server/mirror/ubuntu/xenial/ubuntu/xenial-security/restricted.yml b/aptly/server/mirror/ubuntu/xenial/ubuntu/xenial-security/restricted.yml
index 3aa3b25..b6046ff 100644
--- a/aptly/server/mirror/ubuntu/xenial/ubuntu/xenial-security/restricted.yml
+++ b/aptly/server/mirror/ubuntu/xenial/ubuntu/xenial-security/restricted.yml
@@ -2,19 +2,23 @@
_param:
linux_system_country_code: cz
aptly_server_mirror_ubuntu_xenial_sources: ${_param:aptly_server_mirror_ubuntu_sources}
+ mirror_xenial-security-restricted_source: http://${_param:linux_system_country_code}.archive.ubuntu.com/ubuntu/
+ mirror_xenial-security-restricted_distribution: xenial-security
+ mirror_xenial-security-restricted_components: restricted
+ mirror_xenial-security-restricted_gpgkeys:
+ - 40976EAF437D05B5
+ - 437D05B5
+ - C0B21F32
aptly:
server:
mirror:
xenial-security-restricted:
- source: http://${_param:linux_system_country_code}.archive.ubuntu.com/ubuntu/
+ source: ${_param:mirror_xenial-security-restricted_source}
+ distribution: ${_param:mirror_xenial-security-restricted_distribution}
sources: ${_param:aptly_server_mirror_ubuntu_xenial_sources}
- distribution: xenial-security
- components: restricted
+ components: ${_param:mirror_xenial-security-restricted_components}
architectures: amd64
- gpgkeys:
- - 40976EAF437D05B5
- - 437D05B5
- - C0B21F32
+ gpgkeys: ${_param:mirror_xenial-security-restricted_gpgkeys}
publisher:
component: restricted
distributions:
diff --git a/aptly/server/mirror/ubuntu/xenial/ubuntu/xenial-security/universe.yml b/aptly/server/mirror/ubuntu/xenial/ubuntu/xenial-security/universe.yml
index b657e2d..0a41112 100644
--- a/aptly/server/mirror/ubuntu/xenial/ubuntu/xenial-security/universe.yml
+++ b/aptly/server/mirror/ubuntu/xenial/ubuntu/xenial-security/universe.yml
@@ -2,19 +2,23 @@
_param:
linux_system_country_code: cz
aptly_server_mirror_ubuntu_xenial_sources: ${_param:aptly_server_mirror_ubuntu_sources}
+ mirror_xenial-security-universe_source: http://${_param:linux_system_country_code}.archive.ubuntu.com/ubuntu/
+ mirror_xenial-security-universe_distribution: xenial-security
+ mirror_xenial-security-universe_components: universe
+ mirror_xenial-security-universe_gpgkeys:
+ - 40976EAF437D05B5
+ - 437D05B5
+ - C0B21F32
aptly:
server:
mirror:
xenial-security-universe:
- source: http://${_param:linux_system_country_code}.archive.ubuntu.com/ubuntu/
+ source: ${_param:mirror_xenial-security-universe_source}
+ distribution: ${_param:mirror_xenial-security-universe_distribution}
sources: ${_param:aptly_server_mirror_ubuntu_xenial_sources}
- distribution: xenial-security
- components: universe
+ components: ${_param:mirror_xenial-security-universe_components}
architectures: amd64
- gpgkeys:
- - 40976EAF437D05B5
- - 437D05B5
- - C0B21F32
+ gpgkeys: ${_param:mirror_xenial-security-universe_gpgkeys}
publisher:
component: universe
distributions:
diff --git a/aptly/server/mirror/ubuntu/xenial/ubuntu/xenial-updates/main.yml b/aptly/server/mirror/ubuntu/xenial/ubuntu/xenial-updates/main.yml
index d84d4f0..a97dcc4 100644
--- a/aptly/server/mirror/ubuntu/xenial/ubuntu/xenial-updates/main.yml
+++ b/aptly/server/mirror/ubuntu/xenial/ubuntu/xenial-updates/main.yml
@@ -2,19 +2,23 @@
_param:
linux_system_country_code: cz
aptly_server_mirror_ubuntu_xenial_sources: ${_param:aptly_server_mirror_ubuntu_sources}
+ mirror_xenial-updates-main_source: http://${_param:linux_system_country_code}.archive.ubuntu.com/ubuntu/
+ mirror_xenial-updates-main_distribution: xenial-updates
+ mirror_xenial-updates-main_components: main
+ mirror_xenial-updates-main_gpgkeys:
+ - 40976EAF437D05B5
+ - 437D05B5
+ - C0B21F32
aptly:
server:
mirror:
xenial-updates-main:
- source: http://${_param:linux_system_country_code}.archive.ubuntu.com/ubuntu/
- distribution: xenial-updates
+ source: ${_param:mirror_xenial-updates-main_source}
+ distribution: ${_param:mirror_xenial-updates-main_distribution}
sources: ${_param:aptly_server_mirror_ubuntu_xenial_sources}
- components: main
+ components: ${_param:mirror_xenial-updates-main_components}
architectures: amd64
- gpgkeys:
- - 40976EAF437D05B5
- - 437D05B5
- - C0B21F32
+ gpgkeys: ${_param:mirror_xenial-updates-main_gpgkeys}
publisher:
component: main
distributions:
diff --git a/aptly/server/mirror/ubuntu/xenial/ubuntu/xenial-updates/multiverse.yml b/aptly/server/mirror/ubuntu/xenial/ubuntu/xenial-updates/multiverse.yml
index ebef47d..2373c56 100644
--- a/aptly/server/mirror/ubuntu/xenial/ubuntu/xenial-updates/multiverse.yml
+++ b/aptly/server/mirror/ubuntu/xenial/ubuntu/xenial-updates/multiverse.yml
@@ -2,19 +2,23 @@
_param:
linux_system_country_code: cz
aptly_server_mirror_ubuntu_xenial_sources: ${_param:aptly_server_mirror_ubuntu_sources}
+ mirror_xenial-updates-multiverse_source: http://${_param:linux_system_country_code}.archive.ubuntu.com/ubuntu/
+ mirror_xenial-updates-multiverse_distribution: xenial-updates
+ mirror_xenial-updates-multiverse_components: multiverse
+ mirror_xenial-updates-multiverse_gpgkeys:
+ - 40976EAF437D05B5
+ - 437D05B5
+ - C0B21F32
aptly:
server:
mirror:
xenial-updates-multiverse:
- source: http://${_param:linux_system_country_code}.archive.ubuntu.com/ubuntu/
- distribution: xenial-updates
+ source: ${_param:mirror_xenial-updates-multiverse_source}
+ distribution: ${_param:mirror_xenial-updates-multiverse_distribution}
sources: ${_param:aptly_server_mirror_ubuntu_xenial_sources}
- components: multiverse
+ components: ${_param:mirror_xenial-updates-multiverse_components}
architectures: amd64
- gpgkeys:
- - 40976EAF437D05B5
- - 437D05B5
- - C0B21F32
+ gpgkeys: ${_param:mirror_xenial-updates-multiverse_gpgkeys}
publisher:
component: multiverse
distributions:
diff --git a/aptly/server/mirror/ubuntu/xenial/ubuntu/xenial-updates/restricted.yml b/aptly/server/mirror/ubuntu/xenial/ubuntu/xenial-updates/restricted.yml
index 4431c1c..74aba0b 100644
--- a/aptly/server/mirror/ubuntu/xenial/ubuntu/xenial-updates/restricted.yml
+++ b/aptly/server/mirror/ubuntu/xenial/ubuntu/xenial-updates/restricted.yml
@@ -2,19 +2,23 @@
_param:
linux_system_country_code: cz
aptly_server_mirror_ubuntu_xenial_sources: ${_param:aptly_server_mirror_ubuntu_sources}
+ mirror_xenial-updates-restricted_source: http://${_param:linux_system_country_code}.archive.ubuntu.com/ubuntu/
+ mirror_xenial-updates-restricted_distribution: xenial-updates
+ mirror_xenial-updates-restricted_components: restricted
+ mirror_xenial-updates-restricted_gpgkeys:
+ - 40976EAF437D05B5
+ - 437D05B5
+ - C0B21F32
aptly:
server:
mirror:
xenial-updates-restricted:
- source: http://${_param:linux_system_country_code}.archive.ubuntu.com/ubuntu/
+ source: ${_param:mirror_xenial-updates-restricted_source}
+ distribution: ${_param:mirror_xenial-updates-restricted_distribution}
sources: ${_param:aptly_server_mirror_ubuntu_xenial_sources}
- distribution: xenial-updates
- components: restricted
+ components: ${_param:mirror_xenial-updates-restricted_components}
architectures: amd64
- gpgkeys:
- - 40976EAF437D05B5
- - 437D05B5
- - C0B21F32
+ gpgkeys: ${_param:mirror_xenial-updates-restricted_gpgkeys}
publisher:
component: restricted
distributions:
diff --git a/aptly/server/mirror/ubuntu/xenial/ubuntu/xenial-updates/universe.yml b/aptly/server/mirror/ubuntu/xenial/ubuntu/xenial-updates/universe.yml
index e085074..cf8c817 100644
--- a/aptly/server/mirror/ubuntu/xenial/ubuntu/xenial-updates/universe.yml
+++ b/aptly/server/mirror/ubuntu/xenial/ubuntu/xenial-updates/universe.yml
@@ -2,19 +2,23 @@
_param:
linux_system_country_code: cz
aptly_server_mirror_ubuntu_xenial_sources: ${_param:aptly_server_mirror_ubuntu_sources}
+ mirror_xenial-updates-universe_source: http://${_param:linux_system_country_code}.archive.ubuntu.com/ubuntu/
+ mirror_xenial-updates-universe_distribution: xenial-updates
+ mirror_xenial-updates-universe_components: universe
+ mirror_xenial-updates-universe_gpgkeys:
+ - 40976EAF437D05B5
+ - 437D05B5
+ - C0B21F32
aptly:
server:
mirror:
xenial-updates-universe:
- source: http://${_param:linux_system_country_code}.archive.ubuntu.com/ubuntu/
+ source: ${_param:mirror_xenial-updates-universe_source}
+ distribution: ${_param:mirror_xenial-updates-universe_distribution}
sources: ${_param:aptly_server_mirror_ubuntu_xenial_sources}
- distribution: xenial-updates
- components: universe
+ components: ${_param:mirror_xenial-updates-universe_components}
architectures: amd64
- gpgkeys:
- - 40976EAF437D05B5
- - 437D05B5
- - C0B21F32
+ gpgkeys: ${_param:mirror_xenial-updates-universe_gpgkeys}
publisher:
component: universe
distributions:
diff --git a/aptly/server/mirror/ubuntu/xenial/ubuntu/xenial/main.yml b/aptly/server/mirror/ubuntu/xenial/ubuntu/xenial/main.yml
index aa5ee5e..4d9db03 100644
--- a/aptly/server/mirror/ubuntu/xenial/ubuntu/xenial/main.yml
+++ b/aptly/server/mirror/ubuntu/xenial/ubuntu/xenial/main.yml
@@ -2,19 +2,23 @@
_param:
linux_system_country_code: cz
aptly_server_mirror_ubuntu_xenial_sources: ${_param:aptly_server_mirror_ubuntu_sources}
+ mirror_xenial-main_source: http://${_param:linux_system_country_code}.archive.ubuntu.com/ubuntu/
+ mirror_xenial-main_distribution: xenial
+ mirror_xenial-main_components: main
+ mirror_xenial-main_gpgkeys:
+ - 40976EAF437D05B5
+ - 437D05B5
+ - C0B21F32
aptly:
server:
mirror:
xenial-main:
- source: http://${_param:linux_system_country_code}.archive.ubuntu.com/ubuntu/
- distribution: xenial
+ source: ${_param:mirror_xenial-main_source}
+ distribution: ${_param:mirror_xenial-main_distribution}
sources: ${_param:aptly_server_mirror_ubuntu_xenial_sources}
- components: main
+ components: ${_param:mirror_xenial-main_components}
architectures: amd64
- gpgkeys:
- - 40976EAF437D05B5
- - 437D05B5
- - C0B21F32
+ gpgkeys: ${_param:mirror_xenial-main_gpgkeys}
publisher:
component: main
distributions:
diff --git a/aptly/server/mirror/ubuntu/xenial/ubuntu/xenial/multiverse.yml b/aptly/server/mirror/ubuntu/xenial/ubuntu/xenial/multiverse.yml
index b2c4b82..a74c520 100644
--- a/aptly/server/mirror/ubuntu/xenial/ubuntu/xenial/multiverse.yml
+++ b/aptly/server/mirror/ubuntu/xenial/ubuntu/xenial/multiverse.yml
@@ -2,19 +2,23 @@
_param:
linux_system_country_code: cz
aptly_server_mirror_ubuntu_xenial_sources: ${_param:aptly_server_mirror_ubuntu_sources}
+ mirror_xenial-multiverse_source: http://${_param:linux_system_country_code}.archive.ubuntu.com/ubuntu/
+ mirror_xenial-multiverse_distribution: xenial
+ mirror_xenial-multiverse_components: multiverse
+ mirror_xenial-multiverse_gpgkeys:
+ - 40976EAF437D05B5
+ - 437D05B5
+ - C0B21F32
aptly:
server:
mirror:
xenial-multiverse:
- source: http://${_param:linux_system_country_code}.archive.ubuntu.com/ubuntu/
- distribution: xenial
+ source: ${_param:mirror_xenial-multiverse_source}
+ distribution: ${_param:mirror_xenial-multiverse_distribution}
sources: ${_param:aptly_server_mirror_ubuntu_xenial_sources}
- components: multiverse
+ components: ${_param:mirror_xenial-multiverse_components}
architectures: amd64
- gpgkeys:
- - 40976EAF437D05B5
- - 437D05B5
- - C0B21F32
+ gpgkeys: ${_param:mirror_xenial-multiverse_gpgkeys}
publisher:
component: multiverse
distributions:
diff --git a/aptly/server/mirror/ubuntu/xenial/ubuntu/xenial/restricted.yml b/aptly/server/mirror/ubuntu/xenial/ubuntu/xenial/restricted.yml
index 31370d6..bde6b36 100644
--- a/aptly/server/mirror/ubuntu/xenial/ubuntu/xenial/restricted.yml
+++ b/aptly/server/mirror/ubuntu/xenial/ubuntu/xenial/restricted.yml
@@ -2,19 +2,23 @@
_param:
linux_system_country_code: cz
aptly_server_mirror_ubuntu_xenial_sources: ${_param:aptly_server_mirror_ubuntu_sources}
+ mirror_xenial-restricted_source: http://${_param:linux_system_country_code}.archive.ubuntu.com/ubuntu/
+ mirror_xenial-restricted_distribution: xenial
+ mirror_xenial-restricted_components: restricted
+ mirror_xenial-restricted_gpgkeys:
+ - 40976EAF437D05B5
+ - 437D05B5
+ - C0B21F32
aptly:
server:
mirror:
xenial-restricted:
- source: http://${_param:linux_system_country_code}.archive.ubuntu.com/ubuntu/
+ source: ${_param:mirror_xenial-restricted_source}
+ distribution: ${_param:mirror_xenial-restricted_distribution}
sources: ${_param:aptly_server_mirror_ubuntu_xenial_sources}
- distribution: xenial
- components: restricted
+ components: ${_param:mirror_xenial-restricted_components}
architectures: amd64
- gpgkeys:
- - 40976EAF437D05B5
- - 437D05B5
- - C0B21F32
+ gpgkeys: ${_param:mirror_xenial-restricted_gpgkeys}
publisher:
component: restricted
distributions:
diff --git a/aptly/server/mirror/ubuntu/xenial/ubuntu/xenial/universe.yml b/aptly/server/mirror/ubuntu/xenial/ubuntu/xenial/universe.yml
index 8c33902..b24cc1a 100644
--- a/aptly/server/mirror/ubuntu/xenial/ubuntu/xenial/universe.yml
+++ b/aptly/server/mirror/ubuntu/xenial/ubuntu/xenial/universe.yml
@@ -2,19 +2,23 @@
_param:
linux_system_country_code: cz
aptly_server_mirror_ubuntu_xenial_sources: ${_param:aptly_server_mirror_ubuntu_sources}
+ mirror_xenial-universe_source: http://${_param:linux_system_country_code}.archive.ubuntu.com/ubuntu/
+ mirror_xenial-universe_distribution: xenial
+ mirror_xenial-universe_components: universe
+ mirror_xenial-universe_gpgkeys:
+ - 40976EAF437D05B5
+ - 437D05B5
+ - C0B21F32
aptly:
server:
mirror:
xenial-universe:
- source: http://${_param:linux_system_country_code}.archive.ubuntu.com/ubuntu/
+ source: ${_param:mirror_xenial-universe_source}
+ distribution: ${_param:mirror_xenial-universe_distribution}
sources: ${_param:aptly_server_mirror_ubuntu_xenial_sources}
- distribution: xenial
- components: universe
+ components: ${_param:mirror_xenial-universe_components}
architectures: amd64
- gpgkeys:
- - 40976EAF437D05B5
- - 437D05B5
- - C0B21F32
+ gpgkeys: ${_param:mirror_xenial-universe_gpgkeys}
publisher:
component: universe
distributions:
diff --git a/aptly/server/mirror/ubuntu/xenial/ubuntucloud.yml b/aptly/server/mirror/ubuntu/xenial/ubuntucloud.yml
index 509c65a..7183d13 100644
--- a/aptly/server/mirror/ubuntu/xenial/ubuntucloud.yml
+++ b/aptly/server/mirror/ubuntu/xenial/ubuntucloud.yml
@@ -1,25 +1,35 @@
parameters:
+ _param:
+ mirror_xenial-updates-newton_source: http://ubuntu-cloud.archive.canonical.com/ubuntu/
+ mirror_xenial-updates-newton_distribution: xenial-updates/newton
+ mirror_xenial-updates-newton_components: main
+ mirror_xenial-updates-newton_gpgkeys:
+ - EC4926EA
+
+ mirror_xenial-updates-ocata_source: http://ubuntu-cloud.archive.canonical.com/ubuntu/
+ mirror_xenial-updates-ocata_distribution: xenial-updates/ocata
+ mirror_xenial-updates-ocata_components: main
+ mirror_xenial-updates-ocata_gpgkeys:
+ - EC4926EA
aptly:
server:
mirror:
xenial-updates-newton:
- source: http://ubuntu-cloud.archive.canonical.com/ubuntu/
- distribution: xenial-updates/newton
- components: main
+ source: ${_param:mirror_xenial-updates-newton_source}
+ distribution: ${_param:mirror_xenial-updates-newton_distribution}
+ components: ${_param:mirror_xenial-updates-newton_components}
architectures: amd64
- gpgkeys:
- - EC4926EA
+ gpgkeys: ${_param:mirror_xenial-updates-newton_gpgkeys}
publisher:
component: newton
distributions:
- ubuntu-xenial/nightly
xenial-updates-ocata:
- source: http://ubuntu-cloud.archive.canonical.com/ubuntu/
- distribution: xenial-updates/ocata
- components: main
+ source: ${_param:mirror_xenial-updates-ocata_source}
+ distribution: ${_param:mirror_xenial-updates-ocata_distribution}
+ components: ${_param:mirror_xenial-updates-ocata_components}
architectures: amd64
- gpgkeys:
- - EC4926EA
+ gpgkeys: ${_param:mirror_xenial-updates-ocata_gpgkeys}
publisher:
component: ocata
distributions: