Merge "Added update mirror image job"
diff --git a/aptly/server/docker.yml b/aptly/server/docker.yml
index 4e70a92..c33f169 100644
--- a/aptly/server/docker.yml
+++ b/aptly/server/docker.yml
@@ -8,13 +8,15 @@
aptly_gpg_private_key: none
aptly_server_mirror_sources: false
aptly_server_mirror_ubuntu_sources: ${_param:aptly_server_mirror_sources}
+ docker_image_aptly:
+ base: tcpcloud/aptly
aptly:
server:
enabled: true
secure: ${_param:aptly_server_secure}
source:
engine: docker
- image: tcpcloud/aptly
+ image: ${_param:docker_image_aptly:base}
user:
uid: 501
gid: 501
diff --git a/aptly/server/mirror/debian/aptly.yml b/aptly/server/mirror/debian/aptly.yml
index 48a176e..ce05ee6 100644
--- a/aptly/server/mirror/debian/aptly.yml
+++ b/aptly/server/mirror/debian/aptly.yml
@@ -1,14 +1,19 @@
parameters:
+ _param:
+ mirror_aptly_source: http://repo.aptly.info/
+ mirror_aptly_distribution: squeeze
+ mirror_aptly_components: main
+ mirror_aptly_gpgkeys:
+ - 9C7DE460
aptly:
server:
mirror:
aptly:
- source: http://repo.aptly.info/
- distribution: squeeze
- components: main
+ source: ${_param:mirror_aptly_source}
+ distribution: ${_param:mirror_aptly_distribution}
+ components: ${_param:mirror_aptly_components}
architectures: amd64
- gpgkeys:
- - 9C7DE460
+ gpgkeys: ${_param:mirror_aptly_gpgkeys}
publisher:
component: extra
distributions:
diff --git a/aptly/server/mirror/debian/cassandra.yml b/aptly/server/mirror/debian/cassandra.yml
index 846df4e..3a19e84 100644
--- a/aptly/server/mirror/debian/cassandra.yml
+++ b/aptly/server/mirror/debian/cassandra.yml
@@ -1,18 +1,22 @@
parameters:
_param:
apt_mk_version: stable
+ mirror_cassandra-21x_source: http://www.apache.org/dist/cassandra/debian
+ mirror_cassandra-21x_distribution: 21x
+ mirror_cassandra-21x_components: main
+ mirror_cassandra-21x_gpgkeys:
+ - F758CE318D77295D
+ - 2B5C1B00
+ - 0353B12C
aptly:
server:
mirror:
cassandra-21x:
- source: http://www.apache.org/dist/cassandra/debian
- distribution: 21x
- components: main
+ source: ${_param:mirror_cassandra-21x_source}
+ distribution: ${_param:mirror_cassandra-21x_distribution}
+ components: ${_param:mirror_cassandra-21x_components}
architectures: amd64
- gpgkeys:
- - F758CE318D77295D
- - 2B5C1B00
- - 0353B12C
+ gpgkeys: ${_param:mirror_cassandra-21x_gpgkeys}
publisher:
component: extra
distributions:
diff --git a/aptly/server/mirror/debian/elasticsearch.yml b/aptly/server/mirror/debian/elasticsearch.yml
index ece60af..84a21d1 100644
--- a/aptly/server/mirror/debian/elasticsearch.yml
+++ b/aptly/server/mirror/debian/elasticsearch.yml
@@ -1,52 +1,68 @@
parameters:
_param:
apt_mk_version: stable
+ mirror_elasticsearch-2x_source: http://packages.elastic.co/elasticsearch/2.x/debian
+ mirror_elasticsearch-2x_distribution: stable
+ mirror_elasticsearch-2x_components: main
+ mirror_elasticsearch-2x_gpgkeys:
+ - D88E42B4
+ mirror_kibana_source: http://packages.elasticsearch.org/kibana/4.4/debian
+ mirror_kibana_distribution: stable
+ mirror_kibana_components: main
+ mirror_kibana_gpgkeys:
+ - D88E42B4
+ mirror_kibana-46_source: http://packages.elasticsearch.org/kibana/4.6/debian
+ mirror_kibana-46_distribution: stable
+ mirror_kibana-46_components: main
+ mirror_kibana-46_gpgkeys:
+ - D88E42B4
+ mirror_elasticsearch-curator_source: http://packages.elastic.co/curator/4/debian
+ mirror_elasticsearch-curator_distribution: stable
+ mirror_elasticsearch-curator_components: main
+ mirror_elasticsearch-curator_gpgkeys:
+ - D88E42B4
aptly:
server:
mirror:
elasticsearch-2x:
- source: http://packages.elastic.co/elasticsearch/2.x/debian
- distribution: stable
- components: main
+ source: ${_param:mirror_elasticsearch-2x_source}
+ distribution: ${_param:mirror_elasticsearch-2x_distribution}
+ components: ${_param:mirror_elasticsearch-2x_components}
architectures: amd64
- gpgkeys:
- - D88E42B4
+ gpgkeys: ${_param:mirror_elasticsearch-2x_gpgkeys}
publisher:
component: elastic
distributions:
- trusty/${_param:apt_mk_version}
- xenial/${_param:apt_mk_version}
kibana:
- source: http://packages.elasticsearch.org/kibana/4.4/debian
- distribution: stable
- components: main
+ source: ${_param:mirror_kibana_source}
+ distribution: ${_param:mirror_kibana_distribution}
+ components: ${_param:mirror_kibana_components}
architectures: amd64
- gpgkeys:
- - D88E42B4
+ gpgkeys: ${_param:mirror_kibana_gpgkeys}
publisher:
component: elastic
distributions:
- trusty/${_param:apt_mk_version}
- xenial/${_param:apt_mk_version}
kibana-46:
- source: http://packages.elasticsearch.org/kibana/4.6/debian
- distribution: stable
- components: main
+ source: ${_param:mirror_kibana-46_source}
+ distribution: ${_param:mirror_kibana-46_distribution}
+ components: ${_param:mirror_kibana-46_components}
architectures: amd64
- gpgkeys:
- - D88E42B4
+ gpgkeys: ${_param:mirror_kibana-46_gpgkeys}
publisher:
component: elastic
distributions:
- trusty/${_param:apt_mk_version}
- xenial/${_param:apt_mk_version}
elasticsearch-curator:
- source: http://packages.elastic.co/curator/4/debian
- distribution: stable
- components: main
+ source: ${_param:mirror_elasticsearch-curator_source}
+ distribution: ${_param:mirror_elasticsearch-curator_distribution}
+ components: ${_param:mirror_elasticsearch-curator_components}
architectures: amd64
- gpgkeys:
- - D88E42B4
+ gpgkeys: ${_param:mirror_elasticsearch-curator_gpgkeys}
publisher:
component: elastic
distributions:
diff --git a/aptly/server/mirror/debian/jenkins.yml b/aptly/server/mirror/debian/jenkins.yml
index f04f4d9..1392323 100644
--- a/aptly/server/mirror/debian/jenkins.yml
+++ b/aptly/server/mirror/debian/jenkins.yml
@@ -1,28 +1,37 @@
parameters:
+ _param:
+ mirror_jenkins_source: http://pkg.jenkins-ci.org/debian/
+ mirror_jenkins_distribution: binary/
+ mirror_jenkins_components: ""
+ mirror_jenkins_gpgkeys:
+ - D50582E6
+ mirror_jenkins-debian-glue_source: http://jenkins.grml.org/debian/
+ mirror_jenkins-debian-glue_distribution: jenkins-debian-glue
+ mirror_jenkins-debian-glue_components: main
+ # TODO: this key is not uploaded to keyserver, workaround:
+ # su aptly -c 'curl http://jenkins.grml.org/debian/C525F56752D4A654.asc|gpg --no-default-keyring --keyring trustedkeys.gpg --import'
+ mirror_jenkins-debian-glue_gpgkeys:
+ - 52D4A654
aptly:
server:
mirror:
jenkins:
- source: http://pkg.jenkins-ci.org/debian/
- distribution: binary/
- components: ""
+ source: ${_param:mirror_jenkins_source}
+ distribution: ${_param:mirror_jenkins_distribution}
+ components: ${_param:mirror_jenkins_components}
architectures: amd64
- gpgkeys:
- - D50582E6
+ gpgkeys: ${_param:mirror_jenkins_gpgkeys}
publisher:
component: extra
distributions:
- trusty/nightly
- xenial/nightly
jenkins-debian-glue:
- source: http://jenkins.grml.org/debian/
- distribution: jenkins-debian-glue
- components: main
+ source: ${_param:mirror_jenkins-debian-glue_source}
+ distribution: ${_param:mirror_jenkins-debian-glue_distribution}
+ components: ${_param:mirror_jenkins-debian-glue_components}
architectures: amd64
- # TODO: this key is not uploaded to keyserver, workaround:
- # su aptly -c 'curl http://jenkins.grml.org/debian/C525F56752D4A654.asc|gpg --no-default-keyring --keyring trustedkeys.gpg --import'
- gpgkeys:
- - 52D4A654
+ gpgkeys: ${_param:mirror_jenkins-debian-glue_gpgkeys}
publisher:
component: extra
distributions:
diff --git a/aptly/server/mirror/debian/sensu.yml b/aptly/server/mirror/debian/sensu.yml
index 0361538..9e2f5a1 100644
--- a/aptly/server/mirror/debian/sensu.yml
+++ b/aptly/server/mirror/debian/sensu.yml
@@ -1,18 +1,22 @@
parameters:
_param:
apt_mk_version: stable
+ mirror_sensu_source: http://sensu.global.ssl.fastly.net/apt
+ mirror_sensu_distribution: sensu
+ mirror_sensu_components: main
+ mirror_sensu_gpgkeys:
+ - EB9C94BB
aptly:
server:
mirror:
sensu:
- source: http://sensu.global.ssl.fastly.net/apt
- distribution: sensu
- components: main
+ source: ${_param:mirror_sensu_source}
+ distribution: ${_param:mirror_sensu_distribution}
+ components: ${_param:mirror_sensu_components}
architectures: amd64
- gpgkeys:
- - EB9C94BB
+ gpgkeys: ${_param:mirror_sensu_gpgkeys}
publisher:
component: sensu
distributions:
- ubuntu-trusty/${_param:apt_mk_version}
- - 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/trusty/ceph.yml b/aptly/server/mirror/ubuntu/trusty/ceph.yml
index b8e83c2..9d0d950 100644
--- a/aptly/server/mirror/ubuntu/trusty/ceph.yml
+++ b/aptly/server/mirror/ubuntu/trusty/ceph.yml
@@ -2,16 +2,20 @@
_param:
ceph_version: luminous
apt_mk_version: stable
+ mirror_ceph-trusty_source: http://download.ceph.com/debian-${_param:ceph_version}
+ mirror_ceph-trusty_distribution: trusty
+ mirror_ceph-trusty_components: main
+ mirror_ceph-trusty_gpgkeys:
+ - 460F3994
aptly:
server:
mirror:
ceph-trusty:
- source: http://download.ceph.com/debian-${_param:ceph_version}
- distribution: trusty
- components: main
+ source: ${_param:mirror_ceph-trusty_source}
+ distribution: ${_param:mirror_ceph-trusty_distribution}
+ components: ${_param:mirror_ceph-trusty_components}
architectures: amd64
- gpgkeys:
- - 460F3994
+ gpgkeys: ${_param:mirror_ceph-trusty_gpgkeys}
publisher:
component: ceph
distributions:
diff --git a/aptly/server/mirror/ubuntu/trusty/docker.yml b/aptly/server/mirror/ubuntu/trusty/docker.yml
index db97d14..5ee9daf 100644
--- a/aptly/server/mirror/ubuntu/trusty/docker.yml
+++ b/aptly/server/mirror/ubuntu/trusty/docker.yml
@@ -1,14 +1,19 @@
parameters:
+ _param:
+ mirror_docker-trusty_source: 'https://download.docker.com/linux/ubuntu'
+ mirror_docker-trusty_distribution: trusty
+ mirror_docker-trusty_components: stable
+ mirror_docker-trusty_gpgkeys:
+ - 9DC858229FC7DD38854AE2D88D81803C0EBFCD88
aptly:
server:
mirror:
docker-trusty:
- source: 'https://download.docker.com/linux/ubuntu'
- distribution: trusty
- components: stable
+ source: ${_param:mirror_docker-trusty_source}
+ distribution: ${_param:mirror_docker-trusty_distribution}
+ components: ${_param:mirror_docker-trusty_components}
architectures: amd64
- gpgkeys:
- - 9DC858229FC7DD38854AE2D88D81803C0EBFCD88
+ gpgkeys: ${_param:mirror_docker-trusty_gpgkeys}
publisher:
component: docker
distributions:
diff --git a/aptly/server/mirror/ubuntu/trusty/erlang.yml b/aptly/server/mirror/ubuntu/trusty/erlang.yml
index 7a01032..cb173f1 100644
--- a/aptly/server/mirror/ubuntu/trusty/erlang.yml
+++ b/aptly/server/mirror/ubuntu/trusty/erlang.yml
@@ -1,14 +1,19 @@
parameters:
+ _param:
+ mirror_erlang-trusty_source: http://packages.erlang-solutions.com/ubuntu
+ mirror_erlang-trusty_distribution: trusty
+ mirror_erlang-trusty_components: contrib
+ mirror_erlang-trusty_gpgkeys:
+ - A14F4FCA
aptly:
server:
mirror:
erlang-trusty:
- source: http://packages.erlang-solutions.com/ubuntu
- distribution: trusty
- components: contrib
+ source: ${_param:mirror_erlang-trusty_source}
+ distribution: ${_param:mirror_erlang-trusty_distribution}
+ components: ${_param:mirror_erlang-trusty_components}
architectures: amd64
- gpgkeys:
- - A14F4FCA
+ gpgkeys: ${_param:mirror_erlang-trusty_gpgkeys}
publisher:
component: erlang
distributions:
diff --git a/aptly/server/mirror/ubuntu/trusty/foreman.yml b/aptly/server/mirror/ubuntu/trusty/foreman.yml
index 6769691..902f86e 100644
--- a/aptly/server/mirror/ubuntu/trusty/foreman.yml
+++ b/aptly/server/mirror/ubuntu/trusty/foreman.yml
@@ -1,25 +1,35 @@
parameters:
+ _param:
+ mirror_foreman-trusty_source: http://deb.theforeman.org
+ mirror_foreman-trusty_distribution: trusty
+ mirror_foreman-trusty_components: stable
+ mirror_foreman-trusty_gpgkeys:
+ - 1AA043B8
+
+ mirror_foreman-plugins-trusty_source: http://deb.theforeman.org
+ mirror_foreman-plugins-trusty_distribution: plugins
+ mirror_foreman-plugins-trusty_components: stable
+ mirror_foreman-plugins-trusty_gpgkeys:
+ - 1AA043B8
aptly:
server:
mirror:
foreman-trusty:
- source: http://deb.theforeman.org
- distribution: trusty
- components: stable
+ source: ${_param:mirror_foreman-trusty_source}
+ distribution: ${_param:mirror_foreman-trusty_distribution}
+ components: ${_param:mirror_foreman-trusty_components}
architectures: amd64
- gpgkeys:
- - 1AA043B8
+ gpgkeys: ${_param:mirror_foreman-trusty_gpgkeys}
publisher:
component: extra
distributions:
- ubuntu-trusty/nightly
foreman-plugins-trusty:
- source: http://deb.theforeman.org
- distribution: plugins
- components: stable
+ source: ${_param:mirror_foreman-plugins-trusty_source}
+ distribution: ${_param:mirror_foreman-plugins-trusty_distribution}
+ components: ${_param:mirror_foreman-plugins-trusty_components}
architectures: amd64
- gpgkeys:
- - 1AA043B8
+ gpgkeys: ${_param:mirror_foreman-plugins-trusty_gpgkeys}
publisher:
component: extra
distributions:
diff --git a/aptly/server/mirror/ubuntu/trusty/galera.yml b/aptly/server/mirror/ubuntu/trusty/galera.yml
index 61acd31..1a2e749 100644
--- a/aptly/server/mirror/ubuntu/trusty/galera.yml
+++ b/aptly/server/mirror/ubuntu/trusty/galera.yml
@@ -1,14 +1,19 @@
parameters:
+ _param:
+ mirror_galera-trusty_source: http://releases.galeracluster.com/ubuntu/
+ mirror_galera-trusty_distribution: trusty
+ mirror_galera-trusty_components: main
+ mirror_galera-trusty_gpgkeys:
+ - BC19DDBA
aptly:
server:
mirror:
galera-trusty:
- source: http://releases.galeracluster.com/ubuntu/
- distribution: trusty
- components: main
+ source: ${_param:mirror_galera-trusty_source}
+ distribution: ${_param:mirror_galera-trusty_distribution}
+ components: ${_param:mirror_galera-trusty_components}
architectures: amd64
- gpgkeys:
- - BC19DDBA
+ gpgkeys: ${_param:mirror_galera-trusty_gpgkeys}
publisher:
component: galera
distributions:
diff --git a/aptly/server/mirror/ubuntu/trusty/glusterfs.yml b/aptly/server/mirror/ubuntu/trusty/glusterfs.yml
index 4d27bf6..1777777 100644
--- a/aptly/server/mirror/ubuntu/trusty/glusterfs.yml
+++ b/aptly/server/mirror/ubuntu/trusty/glusterfs.yml
@@ -1,17 +1,21 @@
parameters:
_param:
glusterfs_version: 3.8
+ mirror_glusterfs_upstream_trusty_source: http://ppa.launchpad.net/gluster/glusterfs-${_param:glusterfs_version}/ubuntu
+ mirror_glusterfs_upstream_trusty_distribution: trusty
+ mirror_glusterfs_upstream_trusty_components: main
+ mirror_glusterfs_upstream_trusty_gpgkeys:
+ - 3FE869A9
aptly:
server:
mirror:
glusterfs_upstream_trusty:
- source: http://ppa.launchpad.net/gluster/glusterfs-${_param:glusterfs_version}/ubuntu
- distribution: trusty
- components: main
+ source: ${_param:mirror_glusterfs_upstream_trusty_source}
+ distribution: ${_param:mirror_glusterfs_upstream_trusty_distribution}
+ components: ${_param:mirror_glusterfs_upstream_trusty_components}
architectures: amd64
- gpgkeys:
- - 3FE869A9
+ gpgkeys: ${_param:mirror_glusterfs_upstream_trusty_gpgkeys}
publisher:
component: glusterfs
distributions:
- - ubuntu-trusty/nightly
+ - ubuntu-trusty/nightly
\ No newline at end of file
diff --git a/aptly/server/mirror/ubuntu/trusty/grafana.yml b/aptly/server/mirror/ubuntu/trusty/grafana.yml
index 68ff86a..16c4124 100644
--- a/aptly/server/mirror/ubuntu/trusty/grafana.yml
+++ b/aptly/server/mirror/ubuntu/trusty/grafana.yml
@@ -1,14 +1,19 @@
parameters:
+ _param:
+ mirror_grafana-trusty_source: https://packagecloud.io/grafana/stable/debian/
+ mirror_grafana-trusty_distribution: wheezy
+ mirror_grafana-trusty_components: main
+ mirror_grafana-trusty_gpgkeys:
+ - D59097AB
aptly:
server:
mirror:
grafana-trusty:
- source: https://packagecloud.io/grafana/stable/debian/
- distribution: wheezy
- components: main
+ source: ${_param:mirror_grafana-trusty_source}
+ distribution: ${_param:mirror_grafana-trusty_distribution}
+ components: ${_param:mirror_grafana-trusty_components}
architectures: amd64
- gpgkeys:
- - D59097AB
+ gpgkeys: ${_param:mirror_grafana-trusty_gpgkeys}
publisher:
component: grafana
distributions:
diff --git a/aptly/server/mirror/ubuntu/trusty/haproxy.yml b/aptly/server/mirror/ubuntu/trusty/haproxy.yml
index 0b92cb2..ca4c9c5 100644
--- a/aptly/server/mirror/ubuntu/trusty/haproxy.yml
+++ b/aptly/server/mirror/ubuntu/trusty/haproxy.yml
@@ -1,14 +1,19 @@
parameters:
+ _param:
+ mirror_haproxy-trusty_source: http://ppa.launchpad.net/vbernat/haproxy-1.5/ubuntu
+ mirror_haproxy-trusty_distribution: trusty
+ mirror_haproxy-trusty_components: main
+ mirror_haproxy-trusty_gpgkeys:
+ - 1C61B9CD
aptly:
server:
mirror:
haproxy-trusty:
- source: http://ppa.launchpad.net/vbernat/haproxy-1.5/ubuntu
- distribution: trusty
- components: main
+ source: ${_param:mirror_haproxy-trusty_source}
+ distribution: ${_param:mirror_haproxy-trusty_distribution}
+ components: ${_param:mirror_haproxy-trusty_components}
architectures: amd64
- gpgkeys:
- - 1C61B9CD
+ gpgkeys: ${_param:mirror_haproxy-trusty_gpgkeys}
publisher:
component: haproxy
distributions:
diff --git a/aptly/server/mirror/ubuntu/trusty/influxdb.yml b/aptly/server/mirror/ubuntu/trusty/influxdb.yml
index 8d30a05..824cde6 100644
--- a/aptly/server/mirror/ubuntu/trusty/influxdb.yml
+++ b/aptly/server/mirror/ubuntu/trusty/influxdb.yml
@@ -1,14 +1,19 @@
parameters:
+ _param:
+ mirror_influxdb-trusty_source: https://repos.influxdata.com/ubuntu/
+ mirror_influxdb-trusty_distribution: trusty
+ mirror_influxdb-trusty_components: stable
+ mirror_influxdb-trusty_gpgkeys:
+ - 2582E0C5
aptly:
server:
mirror:
influxdb-trusty:
- source: https://repos.influxdata.com/ubuntu/
- distribution: trusty
- components: stable
+ source: ${_param:mirror_influxdb-trusty_source}
+ distribution: ${_param:mirror_influxdb-trusty_distribution}
+ components: ${_param:mirror_influxdb-trusty_components}
architectures: amd64
- gpgkeys:
- - 2582E0C5
+ gpgkeys: ${_param:mirror_influxdb-trusty_gpgkeys}
publisher:
component: influxdb
distributions:
diff --git a/aptly/server/mirror/ubuntu/trusty/mcp/apt_mk/extra.yml b/aptly/server/mirror/ubuntu/trusty/mcp/apt_mk/extra.yml
index 944a590..61fdf17 100644
--- a/aptly/server/mirror/ubuntu/trusty/mcp/apt_mk/extra.yml
+++ b/aptly/server/mirror/ubuntu/trusty/mcp/apt_mk/extra.yml
@@ -1,17 +1,22 @@
parameters:
_param:
apt_mk_version: stable
+ mirror_mirantis_openstack_trusty_extra_source: http://apt-mk.mirantis.com/trusty/
+ mirror_mirantis_openstack_trusty_extra_distribution: ${_param:apt_mk_version}
+ mirror_mirantis_openstack_trusty_extra_components: extra
+ mirror_mirantis_openstack_trusty_extra_key_url: "http://apt-mk.mirantis.com/public.gpg"
+ mirror_mirantis_openstack_trusty_extra_gpgkeys:
+ - A76882D3
aptly:
server:
mirror:
mirantis_openstack_trusty_extra:
- source: http://apt-mk.mirantis.com/trusty/
- distribution: ${_param:apt_mk_version}
- components: extra
+ source: ${_param:mirror_mirantis_openstack_trusty_extra_source}
+ distribution: ${_param:mirror_mirantis_openstack_trusty_extra_distribution}
+ components: ${_param:mirror_mirantis_openstack_trusty_extra_components}
architectures: amd64
- key_url: "http://apt-mk.mirantis.com/public.gpg"
- gpgkeys:
- - A76882D3
+ key_url: ${_param:mirror_mirantis_openstack_trusty_extra_key_url}
+ gpgkeys: ${_param:mirror_mirantis_openstack_trusty_extra_gpgkeys}
publisher:
component: extra
distributions:
diff --git a/aptly/server/mirror/ubuntu/trusty/mcp/apt_mk/mitaka.yml b/aptly/server/mirror/ubuntu/trusty/mcp/apt_mk/mitaka.yml
index 5b9bc63..19e7a01 100644
--- a/aptly/server/mirror/ubuntu/trusty/mcp/apt_mk/mitaka.yml
+++ b/aptly/server/mirror/ubuntu/trusty/mcp/apt_mk/mitaka.yml
@@ -1,18 +1,23 @@
parameters:
_param:
apt_mk_version: stable
+ mirror_mk_openstack_xenial_mitaka_source: http://apt-mk.mirantis.com/trusty/
+ mirror_mk_openstack_xenial_mitaka_distribution: ${_param:apt_mk_version}
+ mirror_mk_openstack_xenial_mitaka_components: mitaka
+ mirror_mk_openstack_xenial_mitaka_key_url: "http://apt-mk.mirantis.com/public.gpg"
+ mirror_mk_openstack_xenial_mitaka_gpgkeys:
+ - A76882D3
aptly:
server:
mirror:
mk_openstack_xenial_mitaka:
- source: http://apt-mk.mirantis.com/xenial/
- distribution: ${_param:apt_mk_version}
- components: mitaka
+ source: ${_param:mirror_mk_openstack_xenial_mitaka_source}
+ distribution: ${_param:mirror_mk_openstack_xenial_mitaka_distribution}
+ components: ${_param:mirror_mk_openstack_xenial_mitaka_components}
architectures: amd64
- key_url: "http://apt-mk.mirantis.com/public.gpg"
- gpgkeys:
- - A76882D3
+ key_url: ${_param:mirror_mk_openstack_xenial_mitaka_key_url}
+ gpgkeys: ${_param:mirror_mk_openstack_xenial_mitaka_gpgkeys}
publisher:
component: mitaka
distributions:
- - ubuntu-xenial/${_param:apt_mk_version}
\ No newline at end of file
+ - ubuntu-trusty/${_param:apt_mk_version}
\ No newline at end of file
diff --git a/aptly/server/mirror/ubuntu/trusty/mcp/apt_mk/oc31.yml b/aptly/server/mirror/ubuntu/trusty/mcp/apt_mk/oc31.yml
index bae9875..3617a1c 100644
--- a/aptly/server/mirror/ubuntu/trusty/mcp/apt_mk/oc31.yml
+++ b/aptly/server/mirror/ubuntu/trusty/mcp/apt_mk/oc31.yml
@@ -1,17 +1,22 @@
parameters:
_param:
apt_mk_version: stable
+ mirror_mcp_opencontrail_trusty_oc31_source: http://apt-mk.mirantis.com/trusty/
+ mirror_mcp_opencontrail_trusty_oc31_distribution: ${_param:apt_mk_version}
+ mirror_mcp_opencontrail_trusty_oc31_components: oc31
+ mirror_mcp_opencontrail_trusty_oc31_key_url: "http://apt-mk.mirantis.com/public.gpg"
+ mirror_mcp_opencontrail_trusty_oc31_gpgkeys:
+ - A76882D3
aptly:
server:
mirror:
mcp_opencontrail_trusty_oc31:
- source: http://apt-mk.mirantis.com/trusty/
- distribution: ${_param:apt_mk_version}
- components: oc31
+ source: ${_param:mirror_mcp_opencontrail_trusty_oc31_source}
+ distribution: ${_param:mirror_mcp_opencontrail_trusty_oc31_distribution}
+ components: ${_param:mirror_mcp_opencontrail_trusty_oc31_components}
architectures: amd64
- key_url: "http://apt-mk.mirantis.com/public.gpg"
- gpgkeys:
- - A76882D3
+ key_url: ${_param:mirror_mcp_opencontrail_trusty_oc31_key_url}
+ gpgkeys: ${_param:mirror_mcp_opencontrail_trusty_oc31_gpgkeys}
publisher:
component: oc31
distributions:
diff --git a/aptly/server/mirror/ubuntu/trusty/mcp/apt_mk/oc311.yml b/aptly/server/mirror/ubuntu/trusty/mcp/apt_mk/oc311.yml
index d60f154..602751d 100644
--- a/aptly/server/mirror/ubuntu/trusty/mcp/apt_mk/oc311.yml
+++ b/aptly/server/mirror/ubuntu/trusty/mcp/apt_mk/oc311.yml
@@ -1,17 +1,22 @@
parameters:
_param:
apt_mk_version: stable
+ mirror_mcp_opencontrail_trusty_oc311_source: http://apt-mk.mirantis.com/trusty/
+ mirror_mcp_opencontrail_trusty_oc311_distribution: ${_param:apt_mk_version}
+ mirror_mcp_opencontrail_trusty_oc311_components: oc311
+ mirror_mcp_opencontrail_trusty_oc311_key_url: "http://apt-mk.mirantis.com/public.gpg"
+ mirror_mcp_opencontrail_trusty_oc311_gpgkeys:
+ - A76882D3
aptly:
server:
mirror:
mcp_opencontrail_trusty_oc311:
- source: http://apt-mk.mirantis.com/trusty/
- distribution: ${_param:apt_mk_version}
- components: oc311
+ source: ${_param:mirror_mcp_opencontrail_trusty_oc311_source}
+ distribution: ${_param:mirror_mcp_opencontrail_trusty_oc311_distribution}
+ components: ${_param:mirror_mcp_opencontrail_trusty_oc311_components}
architectures: amd64
- key_url: "http://apt-mk.mirantis.com/public.gpg"
- gpgkeys:
- - A76882D3
+ key_url: ${_param:mirror_mcp_opencontrail_trusty_oc311_key_url}
+ gpgkeys: ${_param:mirror_mcp_opencontrail_trusty_oc311_gpgkeys}
publisher:
component: oc311
distributions:
diff --git a/aptly/server/mirror/ubuntu/trusty/mcp/apt_mk/oc32.yml b/aptly/server/mirror/ubuntu/trusty/mcp/apt_mk/oc32.yml
index 6fe8489..9b4a7c8 100644
--- a/aptly/server/mirror/ubuntu/trusty/mcp/apt_mk/oc32.yml
+++ b/aptly/server/mirror/ubuntu/trusty/mcp/apt_mk/oc32.yml
@@ -1,17 +1,22 @@
parameters:
_param:
apt_mk_version: stable
+ mirror_mcp_opencontrail_trusty_oc32_source: http://apt-mk.mirantis.com/trusty/
+ mirror_mcp_opencontrail_trusty_oc32_distribution: ${_param:apt_mk_version}
+ mirror_mcp_opencontrail_trusty_oc32_components: oc32
+ mirror_mcp_opencontrail_trusty_oc32_key_url: "http://apt-mk.mirantis.com/public.gpg"
+ mirror_mcp_opencontrail_trusty_oc32_gpgkeys:
+ - A76882D3
aptly:
server:
mirror:
mcp_opencontrail_trusty_oc32:
- source: http://apt-mk.mirantis.com/trusty/
- distribution: ${_param:apt_mk_version}
- components: oc32
+ source: ${_param:mirror_mcp_opencontrail_trusty_oc32_source}
+ distribution: ${_param:mirror_mcp_opencontrail_trusty_oc32_distribution}
+ components: ${_param:mirror_mcp_opencontrail_trusty_oc32_components}
architectures: amd64
- key_url: "http://apt-mk.mirantis.com/public.gpg"
- gpgkeys:
- - A76882D3
+ key_url: ${_param:mirror_mcp_opencontrail_trusty_oc32_key_url}
+ gpgkeys: ${_param:mirror_mcp_opencontrail_trusty_oc32_gpgkeys}
publisher:
component: oc32
distributions:
diff --git a/aptly/server/mirror/ubuntu/trusty/mcp/apt_mk/oc323.yml b/aptly/server/mirror/ubuntu/trusty/mcp/apt_mk/oc323.yml
index e4a9462..cf62aff 100644
--- a/aptly/server/mirror/ubuntu/trusty/mcp/apt_mk/oc323.yml
+++ b/aptly/server/mirror/ubuntu/trusty/mcp/apt_mk/oc323.yml
@@ -1,17 +1,22 @@
parameters:
_param:
apt_mk_version: stable
+ mirror_mcp_opencontrail_trusty_oc323_source: http://apt-mk.mirantis.com/trusty/
+ mirror_mcp_opencontrail_trusty_oc323_distribution: ${_param:apt_mk_version}
+ mirror_mcp_opencontrail_trusty_oc323_components: oc323
+ mirror_mcp_opencontrail_trusty_oc323_key_url: "http://apt-mk.mirantis.com/public.gpg"
+ mirror_mcp_opencontrail_trusty_oc323_gpgkeys:
+ - A76882D3
aptly:
server:
mirror:
mcp_opencontrail_trusty_oc323:
- source: http://apt-mk.mirantis.com/trusty/
- distribution: ${_param:apt_mk_version}
- components: oc323
+ source: ${_param:mirror_mcp_opencontrail_trusty_oc323_source}
+ distribution: ${_param:mirror_mcp_opencontrail_trusty_oc323_distribution}
+ components: ${_param:mirror_mcp_opencontrail_trusty_oc323_components}
architectures: amd64
- key_url: "http://apt-mk.mirantis.com/public.gpg"
- gpgkeys:
- - A76882D3
+ key_url: ${_param:mirror_mcp_opencontrail_trusty_oc323_key_url}
+ gpgkeys: ${_param:mirror_mcp_opencontrail_trusty_oc323_gpgkeys}
publisher:
component: oc323
distributions:
diff --git a/aptly/server/mirror/ubuntu/trusty/mcp/apt_mk/salt.yml b/aptly/server/mirror/ubuntu/trusty/mcp/apt_mk/salt.yml
index 7588830..7b3b85d 100644
--- a/aptly/server/mirror/ubuntu/trusty/mcp/apt_mk/salt.yml
+++ b/aptly/server/mirror/ubuntu/trusty/mcp/apt_mk/salt.yml
@@ -1,17 +1,22 @@
parameters:
_param:
apt_mk_version: stable
+ mirror_mirantis_openstack_trusty_salt_source: http://apt-mk.mirantis.com/trusty/
+ mirror_mirantis_openstack_trusty_salt_distribution: ${_param:apt_mk_version}
+ mirror_mirantis_openstack_trusty_salt_components: salt
+ mirror_mirantis_openstack_trusty_salt_key_url: "http://apt-mk.mirantis.com/public.gpg"
+ mirror_mirantis_openstack_trusty_salt_gpgkeys:
+ - A76882D3
aptly:
server:
mirror:
mirantis_openstack_trusty_salt:
- source: http://apt-mk.mirantis.com/trusty/
- distribution: ${_param:apt_mk_version}
- components: salt
+ source: ${_param:mirror_mirantis_openstack_trusty_salt_source}
+ distribution: ${_param:mirror_mirantis_openstack_trusty_salt_distribution}
+ components: ${_param:mirror_mirantis_openstack_trusty_salt_components}
architectures: amd64
- key_url: "http://apt-mk.mirantis.com/public.gpg"
- gpgkeys:
- - A76882D3
+ key_url: ${_param:mirror_mirantis_openstack_trusty_salt_key_url}
+ gpgkeys: ${_param:mirror_mirantis_openstack_trusty_salt_gpgkeys}
publisher:
component: salt
distributions:
diff --git a/aptly/server/mirror/ubuntu/trusty/mcp/openstack_mitaka.yml b/aptly/server/mirror/ubuntu/trusty/mcp/openstack_mitaka.yml
index d9e54e5..8263ad1 100644
--- a/aptly/server/mirror/ubuntu/trusty/mcp/openstack_mitaka.yml
+++ b/aptly/server/mirror/ubuntu/trusty/mcp/openstack_mitaka.yml
@@ -1,41 +1,73 @@
parameters:
+ _param:
+ mirror_mirantis_openstack_mitaka_trusty_source: http://mirror.fuel-infra.org/mcp-repos/mitaka/trusty
+ mirror_mirantis_openstack_mitaka_trusty_distribution: mitaka
+ mirror_mirantis_openstack_mitaka_trusty_components: main restricted
+ mirror_mirantis_openstack_mitaka_trusty_key_url: "http://mirror.fuel-infra.org/mcp-repos/mitaka/trusty/archive-mcpmitaka.key"
+ mirror_mirantis_openstack_mitaka_trusty_gpgkeys:
+ - 1FA22B08
+
+ mirror_mirantis_openstack_mitaka_hotfix_trusty_source: http://mirror.fuel-infra.org/mcp-repos/mitaka/trusty
+ mirror_mirantis_openstack_mitaka_hotfix_trusty_distribution: mitaka-hotfix
+ mirror_mirantis_openstack_mitaka_hotfix_trusty_components: main restricted
+ mirror_mirantis_openstack_mitaka_hotfix_trusty_key_url: "http://mirror.fuel-infra.org/mcp-repos/mitaka/trusty/archive-mcpmitaka.key"
+ mirror_mirantis_openstack_mitaka_hotfix_trusty_gpgkeys:
+ - 1FA22B08
+
+ mirror_mirantis_openstack_mitaka_security_trusty_source: http://mirror.fuel-infra.org/mcp-repos/mitaka/trusty
+ mirror_mirantis_openstack_mitaka_security_trusty_distribution: mitaka-security
+ mirror_mirantis_openstack_mitaka_security_trusty_components: main restricted
+ mirror_mirantis_openstack_mitaka_security_trusty_key_url: "http://mirror.fuel-infra.org/mcp-repos/mitaka/trusty/archive-mcpmitaka.key"
+ mirror_mirantis_openstack_mitaka_security_trusty_gpgkeys:
+ - 1FA22B08
+
+ mirror_mirantis_openstack_mitaka_updates_trusty_source: http://mirror.fuel-infra.org/mcp-repos/mitaka/trusty
+ mirror_mirantis_openstack_mitaka_updates_trusty_distribution: mitaka-updates
+ mirror_mirantis_openstack_mitaka_updates_trusty_components: main restricted
+ mirror_mirantis_openstack_mitaka_updates_trusty_key_url: "http://mirror.fuel-infra.org/mcp-repos/mitaka/trusty/archive-mcpmitaka.key"
+ mirror_mirantis_openstack_mitaka_updates_trusty_gpgkeys:
+ - 1FA22B08
+
+ mirror_mirantis_openstack_mitaka_holdback_trusty_source: http://mirror.fuel-infra.org/mcp-repos/mitaka/trusty
+ mirror_mirantis_openstack_mitaka_holdback_trusty_distribution: mitaka-holdback
+ mirror_mirantis_openstack_mitaka_holdback_trusty_components: main restricted
+ mirror_mirantis_openstack_mitaka_holdback_trusty_key_url: "http://mirror.fuel-infra.org/mcp-repos/mitaka/trusty/archive-mcpmitaka.key"
+ mirror_mirantis_openstack_mitaka_holdback_trusty_gpgkeys:
+ - 1FA22B08
aptly:
server:
mirror:
mirantis_openstack_mitaka_trusty:
- source: http://mirror.fuel-infra.org/mcp-repos/mitaka/trusty
- distribution: mitaka
- components: main restricted
+ source: ${_param:mirror_mirantis_openstack_mitaka_trusty_source}
+ distribution: ${_param:mirror_mirantis_openstack_mitaka_trusty_distribution}
+ components: ${_param:mirror_mirantis_openstack_mitaka_trusty_components}
architectures: amd64
- key_url: "http://mirror.fuel-infra.org/mcp-repos/mitaka/trusty/archive-mcpmitaka.key"
- gpgkeys:
- - 1FA22B08
+ key_url: ${_param:mirror_mirantis_openstack_mitaka_trusty_key_url}
+ gpgkeys: ${_param:mirror_mirantis_openstack_mitaka_trusty_gpgkeys}
publisher:
component: main
distributions:
- ubuntu-trusty/mitaka
mirantis_openstack_mitaka_hotfix_trusty:
- source: http://mirror.fuel-infra.org/mcp-repos/mitaka/trusty
- distribution: mitaka-hotfix
- components: main restricted
+ source: ${_param:mirror_mirantis_openstack_mitaka_hotfix_trusty_source}
+ distribution: ${_param:mirror_mirantis_openstack_mitaka_hotfix_trusty_distribution}
+ components: ${_param:mirror_mirantis_openstack_mitaka_hotfix_trusty_components}
architectures: amd64
- key_url: "http://mirror.fuel-infra.org/mcp-repos/mitaka/trusty/archive-mcpmitaka.key"
- gpgkeys:
- - 1FA22B08
+ key_url: ${_param:mirror_mirantis_openstack_mitaka_hotfix_trusty_key_url}
+ gpgkeys: ${_param:mirror_mirantis_openstack_mitaka_hotfix_trusty_gpgkeys}
publisher:
component: main
distributions:
- ubuntu-trusty/mitaka-hotfix
mirantis_openstack_mitaka_security_trusty:
- source: http://mirror.fuel-infra.org/mcp-repos/mitaka/trusty
- distribution: mitaka-security
- components: main restricted
+ source: ${_param:mirror_mirantis_openstack_mitaka_security_trusty_source}
+ distribution: ${_param:mirror_mirantis_openstack_mitaka_security_trusty_distribution}
+ components: ${_param:mirror_mirantis_openstack_mitaka_security_trusty_components}
architectures: amd64
- key_url: "http://mirror.fuel-infra.org/mcp-repos/mitaka/trusty/archive-mcpmitaka.key"
- gpgkeys:
- - 1FA22B08
+ key_url: ${_param:mirror_mirantis_openstack_mitaka_security_trusty_key_url}
+ gpgkeys: ${_param:mirror_mirantis_openstack_mitaka_security_trusty_gpgkeys}
publisher:
component: main
distributions:
@@ -43,13 +75,12 @@
# required for alternative horizon plugins/etc..
mirantis_openstack_mitaka_updates_trusty:
- source: http://mirror.fuel-infra.org/mcp-repos/mitaka/trusty
- distribution: mitaka-updates
- components: main restricted
+ source: ${_param:mirror_mirantis_openstack_mitaka_updates_trusty_source}
+ distribution: ${_param:mirror_mirantis_openstack_mitaka_updates_trusty_distribution}
+ components: ${_param:mirror_mirantis_openstack_mitaka_updates_trusty_components}
architectures: amd64
- key_url: "http://mirror.fuel-infra.org/mcp-repos/mitaka/trusty/archive-mcpmitaka.key"
- gpgkeys:
- - 1FA22B08
+ key_url: ${_param:mirror_mirantis_openstack_mitaka_updates_trusty_key_url}
+ gpgkeys: ${_param:mirror_mirantis_openstack_mitaka_updates_trusty_gpgkeys}
publisher:
component: main
distributions:
@@ -57,15 +88,13 @@
# required for salt formulas
mirantis_openstack_mitaka_holdback_trusty:
- source: http://mirror.fuel-infra.org/mcp-repos/mitaka/trusty
- distribution: mitaka-holdback
- components: main restricted
+ source: ${_param:mirror_mirantis_openstack_mitaka_holdback_trusty_source}
+ distribution: ${_param:mirror_mirantis_openstack_mitaka_holdback_trusty_distribution}
+ components: ${_param:mirror_mirantis_openstack_mitaka_holdback_trusty_components}
architectures: amd64
- key_url: "http://mirror.fuel-infra.org/mcp-repos/mitaka/trusty/archive-mcpmitaka.key"
- gpgkeys:
- - 1FA22B08
+ key_url: ${_param:mirror_mirantis_openstack_mitaka_holdback_trusty_key_url}
+ gpgkeys: ${_param:mirror_mirantis_openstack_mitaka_holdback_trusty_gpgkeys}
publisher:
component: main
distributions:
- - ubuntu-trusty/mitaka-holdback
-
+ - ubuntu-trusty/mitaka-holdback
\ No newline at end of file
diff --git a/aptly/server/mirror/ubuntu/trusty/mos8.yml b/aptly/server/mirror/ubuntu/trusty/mos8.yml
index c85363f..a9c1ce1 100644
--- a/aptly/server/mirror/ubuntu/trusty/mos8.yml
+++ b/aptly/server/mirror/ubuntu/trusty/mos8.yml
@@ -1,14 +1,34 @@
parameters:
+ _param:
+ mirror_mirantis-openstack-8.0-trusty_source: http://mirror.fuel-infra.org/mos-repos/ubuntu/8.0-mu-3/
+ mirror_mirantis-openstack-8.0-trusty_distribution: mos8.0
+ mirror_mirantis-openstack-8.0-trusty_components: main restricted
+ mirror_mirantis-openstack-8.0-trusty_key_url: "http://mirror.fuel-infra.org/mos-repos/ubuntu/8.0-mu-3/archive-mos8.0.key"
+ mirror_mirantis-openstack-8.0-trusty_gpgkeys:
+ - 1FA22B08
+
+ mirror_mirantis-openstack-8.0-proposed-trusty_source: http://mirror.fuel-infra.org/mos-repos/ubuntu/8.0-mu-3/
+ mirror_mirantis-openstack-8.0-proposed-trusty_distribution: mos8.0-proposed
+ mirror_mirantis-openstack-8.0-proposed-trusty_components: main restricted
+ mirror_mirantis-openstack-8.0-proposed-trusty_key_url: "http://mirror.fuel-infra.org/mos-repos/ubuntu/8.0-mu-3/archive-mos8.0.key"
+ mirror_mirantis-openstack-8.0-proposed-trusty_gpgkeys:
+ - 1FA22B08
+
+ mirror_mirantis-openstack-8.0-updates-trusty_source: http://mirror.fuel-infra.org/mos-repos/ubuntu/8.0-mu-3/
+ mirror_mirantis-openstack-8.0-updates-trusty_distribution: mos8.0-updates
+ mirror_mirantis-openstack-8.0-updates-trusty_components: main restricted
+ mirror_mirantis-openstack-8.0-updates-trusty_key_url: "http://mirror.fuel-infra.org/mos-repos/ubuntu/8.0-mu-3/archive-mos8.0.key"
+ mirror_mirantis-openstack-8.0-updates-trusty_gpgkeys:
+ - 1FA22B08
aptly:
server:
mirror:
mirantis-openstack-8.0-trusty:
- source: http://mirror.fuel-infra.org/mos-repos/ubuntu/8.0-mu-3/
- distribution: mos8.0
- components: main restricted
+ source: ${_param:mirror_mirantis-openstack-8.0-trusty_source}
+ distribution: ${_param:mirror_mirantis-openstack-8.0-trusty_distribution}
+ components: ${_param:mirror_mirantis-openstack-8.0-trusty_components}
architectures: amd64
- gpgkeys:
- - 1FA22B08
+ gpgkeys: ${_param:mirror_mirantis-openstack-8.0-trusty_gpgkeys}
publisher:
component: main
distributions:
@@ -27,13 +47,12 @@
# distributions:
# - mos8/mos8.0-hotfix
mirantis-openstack-8.0-proposed-trusty:
- source: http://mirror.fuel-infra.org/mos-repos/ubuntu/8.0-mu-3/
- distribution: mos8.0-proposed
- components: main restricted
+ source: ${_param:mirror_mirantis-openstack-8.0-proposed-trusty_source}
+ distribution: ${_param:mirror_mirantis-openstack-8.0-proposed-trusty_distribution}
+ components: ${_param:mirror_mirantis-openstack-8.0-proposed-trusty_components}
architectures: amd64
- key_url: "http://mirror.fuel-infra.org/mos-repos/ubuntu/8.0-mu-3/archive-mos8.0.key"
- gpgkeys:
- - 1FA22B08
+ key_url: ${_param:mirror_mirantis-openstack-8.0-proposed-trusty_key_url}
+ gpgkeys: ${_param:mirror_mirantis-openstack-8.0-proposed-trusty_gpgkeys}
publisher:
component: main
distributions:
@@ -52,13 +71,12 @@
# distributions:
# - mos8/mos8.0-security
mirantis-openstack-8.0-updates-trusty:
- source: http://mirror.fuel-infra.org/mos-repos/ubuntu/8.0-mu-3/
- distribution: mos8.0-updates
- components: main restricted
+ source: ${_param:mirror_mirantis-openstack-8.0-updates-trusty_source}
+ distribution: ${_param:mirror_mirantis-openstack-8.0-updates-trusty_distribution}
+ components: ${_param:mirror_mirantis-openstack-8.0-updates-trusty_components}
architectures: amd64
- key_url: "http://mirror.fuel-infra.org/mos-repos/ubuntu/8.0-mu-3/archive-mos8.0.key"
- gpgkeys:
- - 1FA22B08
+ key_url: ${_param:mirror_mirantis-openstack-8.0-updates-trusty_key_url}
+ gpgkeys: ${_param:mirror_mirantis-openstack-8.0-updates-trusty_gpgkeys}
publisher:
component: main
distributions:
diff --git a/aptly/server/mirror/ubuntu/trusty/mos9.yml b/aptly/server/mirror/ubuntu/trusty/mos9.yml
index 29415ab..1d7b7a4 100644
--- a/aptly/server/mirror/ubuntu/trusty/mos9.yml
+++ b/aptly/server/mirror/ubuntu/trusty/mos9.yml
@@ -1,14 +1,41 @@
parameters:
+ _param:
+ mirror_mirantis-openstack-9.0-trusty_source: http://mirror.fuel-infra.org/mos-repos/ubuntu/9.0/
+ mirror_mirantis-openstack-9.0-trusty_distribution: mos9.0
+ mirror_mirantis-openstack-9.0-trusty_components: main restricted
+ mirror_mirantis-openstack-9.0-trusty_key_url: "http://mirror.fuel-infra.org/mos-repos/ubuntu/9.0/archive-mos9.0.key"
+ mirror_mirantis-openstack-9.0-trusty_gpgkeys:
+ - 1FA22B08
+
+ mirror_mirantis-openstack-9.0-proposed-trusty_source: http://mirror.fuel-infra.org/mos-repos/ubuntu/9.0/
+ mirror_mirantis-openstack-9.0-proposed-trusty_distribution: mos9.0-proposed
+ mirror_mirantis-openstack-9.0-proposed-trusty_components: main restricted
+ mirror_mirantis-openstack-9.0-proposed-trusty_key_url: "http://mirror.fuel-infra.org/mos-repos/ubuntu/9.0/archive-mos9.0.key"
+ mirror_mirantis-openstack-9.0-proposed-trusty_gpgkeys:
+ - 1FA22B08
+
+ mirror_mirantis-openstack-9.0-updates-trusty_source: http://mirror.fuel-infra.org/mos-repos/ubuntu/9.0/
+ mirror_mirantis-openstack-9.0-updates-trusty_distribution: mos9.0-updates
+ mirror_mirantis-openstack-9.0-updates-trusty_components: main restricted
+ mirror_mirantis-openstack-9.0-updates-trusty_key_url: "http://mirror.fuel-infra.org/mos-repos/ubuntu/9.0/archive-mos9.0.key"
+ mirror_mirantis-openstack-9.0-updates-trusty_gpgkeys:
+ - 1FA22B08
+
+ mirror_mirantis-openstack-9.0-extras-murano_source: http://mirror.fuel-infra.org/extras/murano-plugin-repos/release/1.2.0/ubuntu/9.0/
+ mirror_mirantis-openstack-9.0-extras-murano_distribution: mos9.0
+ mirror_mirantis-openstack-9.0-extras-murano_components: main restricted
+ mirror_mirantis-openstack-9.0-extras-murano_key_url: "http://mirror.fuel-infra.org/mos-repos/ubuntu/9.0/archive-mos9.0.key"
+ mirror_mirantis-openstack-9.0-extras-murano_gpgkeys:
+ - 1FA22B08
aptly:
server:
mirror:
mirantis-openstack-9.0-trusty:
- source: http://mirror.fuel-infra.org/mos-repos/ubuntu/9.0/
- distribution: mos9.0
- components: main restricted
+ source: ${_param:mirror_mirantis-openstack-9.0-trusty_source}
+ distribution: ${_param:mirror_mirantis-openstack-9.0-trusty_distribution}
+ components: ${_param:mirror_mirantis-openstack-9.0-trusty_components}
architectures: amd64
- gpgkeys:
- - 1FA22B08
+ gpgkeys: ${_param:mirror_mirantis-openstack-9.0-trusty_gpgkeys}
publisher:
component: main
distributions:
@@ -26,13 +53,12 @@
# distributions:
# - mos9/mos9.0-hotfix
mirantis-openstack-9.0-proposed-trusty:
- source: http://mirror.fuel-infra.org/mos-repos/ubuntu/9.0/
- distribution: mos9.0-proposed
- components: main restricted
+ source: ${_param:mirror_mirantis-openstack-9.0-proposed-trusty_source}
+ distribution: ${_param:mirror_mirantis-openstack-9.0-proposed-trusty_distribution}
+ components: ${_param:mirror_mirantis-openstack-9.0-proposed-trusty_components}
architectures: amd64
- key_url: "http://mirror.fuel-infra.org/mos-repos/ubuntu/9.0/archive-mos9.0.key"
- gpgkeys:
- - 1FA22B08
+ key_url: ${_param:mirror_mirantis-openstack-9.0-proposed-trusty_key_url}
+ gpgkeys: ${_param:mirror_mirantis-openstack-9.0-proposed-trusty_gpgkeys}
publisher:
component: main
distributions:
@@ -51,25 +77,23 @@
# distributions:
# - mos9/mos9.0-security
mirantis-openstack-9.0-updates-trusty:
- source: http://mirror.fuel-infra.org/mos-repos/ubuntu/9.0/
- distribution: mos9.0-updates
- components: main restricted
+ source: ${_param:mirror_mirantis-openstack-9.0-updates-trusty_source}
+ distribution: ${_param:mirror_mirantis-openstack-9.0-updates-trusty_distribution}
+ components: ${_param:mirror_mirantis-openstack-9.0-updates-trusty_}
architectures: amd64
- key_url: "http://mirror.fuel-infra.org/mos-repos/ubuntu/9.0/archive-mos9.0.key"
- gpgkeys:
- - 1FA22B08
+ key_url: ${_param:mirror_mirantis-openstack-9.0-updates-trusty_key_url}
+ gpgkeys: ${_param:mirror_mirantis-openstack-9.0-updates-trusty_gpgkeys}
publisher:
component: main
distributions:
- mos9/mos9.0-updates
mirantis-openstack-9.0-extras-murano:
- source: http://mirror.fuel-infra.org/extras/murano-plugin-repos/release/1.2.0/ubuntu/9.0/
- distribution: mos9.0
- components: main restricted
+ source: ${_param:mirror_mirantis-openstack-9.0-extras-murano_source}
+ distribution: ${_param:mirror_mirantis-openstack-9.0-extras-murano_distribution}
+ components: ${_param:mirror_mirantis-openstack-9.0-extras-murano_components}
architectures: amd64
- key_url: "http://mirror.fuel-infra.org/mos-repos/ubuntu/9.0/archive-mos9.0.key"
- gpgkeys:
- - 1FA22B08
+ key_url: ${_param:mirror_mirantis-openstack-9.0-extras-murano_key_url}
+ gpgkeys: ${_param:mirror_mirantis-openstack-9.0-extras-murano_gpgkeys}
publisher:
component: murano
distributions:
diff --git a/aptly/server/mirror/ubuntu/trusty/rabbitmq.yml b/aptly/server/mirror/ubuntu/trusty/rabbitmq.yml
index 0b40092..5caa9b5 100644
--- a/aptly/server/mirror/ubuntu/trusty/rabbitmq.yml
+++ b/aptly/server/mirror/ubuntu/trusty/rabbitmq.yml
@@ -1,14 +1,19 @@
parameters:
+ _param:
+ mirror_rabbitmq-testing-trusty_source: http://www.rabbitmq.com/debian/
+ mirror_rabbitmq-testing-trusty_distribution: testing
+ mirror_rabbitmq-testing-trusty_components: main
+ mirror_rabbitmq-testing-trusty_gpgkeys:
+ - 056E8E56
aptly:
server:
mirror:
rabbitmq-testing-trusty:
- source: http://www.rabbitmq.com/debian/
- distribution: testing
- components: main
+ source: ${_param:mirror_rabbitmq-testing-trusty_source}
+ distribution: ${_param:mirror_rabbitmq-testing-trusty_distribution}
+ components: ${_param:mirror_rabbitmq-testing-trusty_components}
architectures: amd64
- gpgkeys:
- - 056E8E56
+ gpgkeys: ${_param:mirror_rabbitmq-testing-trusty_gpgkeys}
publisher:
component: rabbitmq
distributions:
diff --git a/aptly/server/mirror/ubuntu/trusty/salt.yml b/aptly/server/mirror/ubuntu/trusty/salt.yml
index 4c243b8..89bf1c5 100644
--- a/aptly/server/mirror/ubuntu/trusty/salt.yml
+++ b/aptly/server/mirror/ubuntu/trusty/salt.yml
@@ -1,16 +1,20 @@
parameters:
_param:
apt_mk_version: stable
+ mirror_salt-2016-3-trusty_source: http://repo.saltstack.com/apt/ubuntu/14.04/amd64/2016.3
+ mirror_salt-2016-3-trusty_distribution: trusty
+ mirror_salt-2016-3-trusty_components: main
+ mirror_salt-2016-3-trusty_gpgkeys:
+ - DE57BFBE
aptly:
server:
mirror:
salt-2016.3-trusty:
- source: http://repo.saltstack.com/apt/ubuntu/14.04/amd64/2016.3
- distribution: trusty
- components: main
+ source: ${_param:mirror_salt-2016-3-trusty_source}
+ distribution: ${_param:mirror_salt-2016-3-trusty_distribution}
+ components: ${_param:mirror_salt-2016-3-trusty_components}
architectures: amd64
- gpgkeys:
- - DE57BFBE
+ gpgkeys: ${_param:mirror_salt-2016-3-trusty_gpgkeys}
publisher:
component: salt
distributions:
diff --git a/aptly/server/mirror/ubuntu/trusty/sssd.yml b/aptly/server/mirror/ubuntu/trusty/sssd.yml
index 59436a0..3b23542 100644
--- a/aptly/server/mirror/ubuntu/trusty/sssd.yml
+++ b/aptly/server/mirror/ubuntu/trusty/sssd.yml
@@ -1,14 +1,19 @@
parameters:
+ _param:
+ mirror_sssd-trusty_source: http://ppa.launchpad.net/sssd/updates/ubuntu
+ mirror_sssd-trusty_distribution: trusty
+ mirror_sssd-trusty_components: main
+ mirror_sssd-trusty_gpgkeys:
+ - CA45F42B
aptly:
server:
mirror:
sssd-trusty:
- source: http://ppa.launchpad.net/sssd/updates/ubuntu
- distribution: trusty
- components: main
+ source: ${_param:mirror_sssd-trusty_source}
+ distribution: ${_param:mirror_sssd-trusty_distribution}
+ components: ${_param:mirror_sssd-trusty_components}
architectures: amd64
- gpgkeys:
- - CA45F42B
+ gpgkeys: ${_param:mirror_sssd-trusty_gpgkeys}
publisher:
component: extra
distributions:
diff --git a/aptly/server/mirror/ubuntu/trusty/tcpcloud.yml b/aptly/server/mirror/ubuntu/trusty/tcpcloud.yml
index c1196d7..08e2f54 100644
--- a/aptly/server/mirror/ubuntu/trusty/tcpcloud.yml
+++ b/aptly/server/mirror/ubuntu/trusty/tcpcloud.yml
@@ -2,78 +2,100 @@
aptly:
server:
mirror:
+ mirror_tcpcloud-nightly-main-trusty_source: http://apt.tcpcloud.eu/nightly
+ mirror_tcpcloud-nightly-main-trusty_distribution: trusty
+ mirror_tcpcloud-nightly-main-trusty_components: main security
+ mirror_tcpcloud-nightly-main-trusty_key_url: "http://apt.tcpcloud.eu/public.gpg"
+ mirror_tcpcloud-nightly-main-trusty_gpgkeys:
+ - 3EF02D1C
+ mirror_tcpcloud-nightly-tcp-trusty_source: http://apt.tcpcloud.eu/nightly
+ mirror_tcpcloud-nightly-tcp-trusty_distribution: trusty
+ mirror_tcpcloud-nightly-tcp-trusty_components: tcp
+ mirror_tcpcloud-nightly-tcp-trusty_key_url: "http://apt.tcpcloud.eu/public.gpg"
+ mirror_tcpcloud-nightly-tcp-trusty_gpgkeys:
+ - 3EF02D1C
+
+ mirror_tcpcloud-nightly-extra-trusty_source: http://apt.tcpcloud.eu/nightly
+ mirror_tcpcloud-nightly-extra-trusty_distribution: trusty
+ mirror_tcpcloud-nightly-extra-trusty_components: extra
+ mirror_tcpcloud-nightly-tcp-trusty_key_url: "http://apt.tcpcloud.eu/public.gpg"
+ mirror_tcpcloud-nightly-extra-trusty_gpgkeys:
+ - 3EF02D1C
+
+ mirror_tcpcloud-nightly-salt-trusty_source: http://apt.tcpcloud.eu/nightly
+ mirror_tcpcloud-nightly-salt-trusty_distribution: trusty
+ mirror_tcpcloud-nightly-salt-trusty_components: tcp-salt
+ mirror_tcpcloud-nightly-tcp-trusty_key_url: "http://apt.tcpcloud.eu/public.gpg"
+ mirror_tcpcloud-nightly-salt-trusty_gpgkeys:
+ - 3EF02D1C
+
+ mirror_tcpcloud-nightly-oc30-trusty_source: http://apt.tcpcloud.eu/nightly
+ mirror_tcpcloud-nightly-oc30-trusty_distribution: trusty
+ mirror_tcpcloud-nightly-oc30-trusty_components: oc30
+ mirror_tcpcloud-nightly-tcp-trusty_key_url: "http://apt.tcpcloud.eu/public.gpg"
+ mirror_tcpcloud-nightly-oc30-trusty_gpgkeys:
+ - 3EF02D1C
+
+ mirror_tcpcloud-nightly-elastic-trusty_source: http://apt.tcpcloud.eu/nightly
+ mirror_tcpcloud-nightly-elastic-trusty_distribution: trusty
+ mirror_tcpcloud-nightly-elastic-trusty_components: elastic
+ mirror_tcpcloud-nightly-tcp-trusty_key_url: "http://apt.tcpcloud.eu/public.gpg"
+ mirror_tcpcloud-nightly-elastic-trusty_gpgkeys:
+ - 3EF02D1C
#TOOD: 4x the lower below
- #tcpcloud-[stable/testing]-xxx-[trusty/xenial]:
+ #tcpcloud-[stable/testing]-xxx-[trusty/trusty]:
#
# Other components
# salt tcp-salt extra liberty mitaka oc30 security mitaka
tcpcloud-nightly-main-trusty:
- source: http://apt.tcpcloud.eu/nightly
- distribution: trusty
+ source: ${_param:mirror_tcpcloud-nightly-main-trusty_source}
+ distribution: ${_param:mirror_tcpcloud-nightly-main-trusty_distribution}
#TODO: extra component might not be needed; tcp is just for heka
- components: main security
+ components: ${_param:mirror_tcpcloud-nightly-main-trusty_components}
architectures: amd64
- key_url: "http://apt.tcpcloud.eu/public.gpg"
- gpgkeys:
- - 3EF02D1C
+ key_url: ${_param:mirror_tcpcloud-nightly-main-trusty_key_url}
+ gpgkeys: ${_param:mirror_tcpcloud-nightly-main-trusty_gpgkeys}
publisher:
component: tcp-main
distributions:
- ubuntu-trusty/nightly
- tcpcloud-nightly-main-trusty:
- source: http://apt.tcpcloud.eu/nightly
- distribution: trusty
+ tcpcloud-nightly-tcp-trusty:
+ source: ${_param:mirror_tcpcloud-nightly-tcp-trusty_source}
+ distribution: ${_param:mirror_tcpcloud-nightly-tcp-trusty_distribution}
#TODO: extra component might not be needed; tcp is just for heka
- components: tcp
+ components: ${_param:mirror_tcpcloud-nightly-tcp-trusty_components}
architectures: amd64
- key_url: "http://apt.tcpcloud.eu/public.gpg"
- gpgkeys:
- - 3EF02D1C
+ key_url: ${_param:mirror_tcpcloud-nightly-tcp-trusty_key_url}
+ gpgkeys: ${_param:mirror_tcpcloud-nightly-tcp-trusty_gpgkeys}
publisher:
component: tcp
distributions:
- ubuntu-trusty/nightly
tcpcloud-nightly-extra-trusty:
- source: http://apt.tcpcloud.eu/nightly
- distribution: trusty
+ source: ${_param:mirror_tcpcloud-nightly-extra-trusty_source}
+ distribution: ${_param:mirror_tcpcloud-nightly-extra-trusty_distribution}
#TODO: extra component might not be needed; tcp is just for heka
- components: extra
+ components: ${_param:mirror_tcpcloud-nightly-extra-trusty_components}
architectures: amd64
- key_url: "http://apt.tcpcloud.eu/public.gpg"
- gpgkeys:
- - 3EF02D1C
+ key_url: ${_param:mirror_tcpcloud-nightly-extra-trusty_key_url}
+ gpgkeys: ${_param:mirror_tcpcloud-nightly-extra-trusty_gpgkeys}
publisher:
component: tcp-extra
distributions:
- ubuntu-trusty/nightly
- # required for alternative horizon plugins/etc..
- tcpcloud-nightly-liberty-trusty:
- source: http://apt.tcpcloud.eu/nightly
- distribution: trusty
- components: liberty
- architectures: amd64
- key_url: "http://apt.tcpcloud.eu/public.gpg"
- gpgkeys:
- - 3EF02D1C
- publisher:
- component: tcp-liberty
- distributions:
- - ubuntu-trusty/nightly
-
# required for salt formulas
tcpcloud-nightly-salt-trusty:
- source: http://apt.tcpcloud.eu/nightly
- distribution: trusty
- components: tcp-salt
+ source: ${_param:mirror_tcpcloud-nightly-salt-trusty_source}
+ distribution: ${_param:mirror_tcpcloud-nightly-salt-trusty_distribution}
+ components: ${_param:mirror_tcpcloud-nightly-salt-trusty_components}
architectures: amd64
- key_url: "http://apt.tcpcloud.eu/public.gpg"
- gpgkeys:
- - 3EF02D1C
+ key_url: ${_param:mirror_tcpcloud-nightly-salt-trusty_key_url}
+ gpgkeys: ${_param:mirror_tcpcloud-nightly-salt-trusty_gpgkeys}
publisher:
component: tcp-salt
distributions:
@@ -81,13 +103,12 @@
# required for opencontrail formulas
tcpcloud-nightly-oc30-trusty:
- source: http://apt.tcpcloud.eu/nightly
- distribution: trusty
- components: oc30
+ source: ${_param:mirror_tcpcloud-nightly-oc30-trusty_source}
+ distribution: ${_param:mirror_tcpcloud-nightly-oc30-trusty_distribution}
+ components: ${_param:mirror_tcpcloud-nightly-oc30-trusty_components}
architectures: amd64
- key_url: "http://apt.tcpcloud.eu/public.gpg"
- gpgkeys:
- - 3EF02D1C
+ key_url: ${_param:mirror_tcpcloud-nightly-oc30-trusty_key_url}
+ gpgkeys: ${_param:mirror_tcpcloud-nightly-oc30-trusty_gpgkeys}
publisher:
component: tcp-oc30
distributions:
@@ -95,15 +116,13 @@
# elastic, kibana is there
tcpcloud-nightly-elastic-trusty:
- source: http://apt.tcpcloud.eu/nightly
- distribution: trusty
- components: elastic
+ source: ${_param:mirror_tcpcloud-nightly-elastic-trusty_source}
+ distribution: ${_param:mirror_tcpcloud-nightly-elastic-trusty_distribution}
+ components: ${_param:mirror_tcpcloud-nightly-elastic-trusty_components}
architectures: amd64
- key_url: "http://apt.tcpcloud.eu/public.gpg"
- gpgkeys:
- - 3EF02D1C
+ key_url: ${_param:mirror_tcpcloud-nightly-elastic-trusty_key_url}
+ gpgkeys: ${_param:mirror_tcpcloud-nightly-elastic-trusty_gpgkeys}
publisher:
component: tcp-elastic
distributions:
- - ubuntu-trusty/nightly
-
+ - ubuntu-trusty/nightly
\ No newline at end of file
diff --git a/aptly/server/mirror/ubuntu/trusty/ubuntu/trusty-backports/main.yml b/aptly/server/mirror/ubuntu/trusty/ubuntu/trusty-backports/main.yml
index 8edff1f..3625d51 100644
--- a/aptly/server/mirror/ubuntu/trusty/ubuntu/trusty-backports/main.yml
+++ b/aptly/server/mirror/ubuntu/trusty/ubuntu/trusty-backports/main.yml
@@ -2,19 +2,23 @@
_param:
linux_system_country_code: cz
aptly_server_mirror_ubuntu_trusty_sources: ${_param:aptly_server_mirror_ubuntu_sources}
+ mirror_trusty-backports-main_source: http://${_param:linux_system_country_code}.archive.ubuntu.com/ubuntu/
+ mirror_trusty-backports-main_distribution: trusty-backports
+ mirror_trusty-backports-main_components: main
+ mirror_trusty-backports-main_gpgkeys:
+ - 40976EAF437D05B5
+ - 437D05B5
+ - C0B21F32
aptly:
server:
mirror:
- trusty-main:
- source: http://${_param:linux_system_country_code}.archive.ubuntu.com/ubuntu/
- distribution: trusty-backports
+ trusty-backports-main:
+ source: ${_param:mirror_trusty-backports-main_source}
+ distribution: ${_param:mirror_trusty-backports-main_distribution}
sources: ${_param:aptly_server_mirror_ubuntu_trusty_sources}
- components: main
+ components: ${_param:mirror_trusty-backports-main_components}
architectures: amd64
- gpgkeys:
- - 40976EAF437D05B5
- - 437D05B5
- - C0B21F32
+ gpgkeys: ${_param:mirror_trusty-backports-main_gpgkeys}
publisher:
component: main
distributions:
diff --git a/aptly/server/mirror/ubuntu/trusty/ubuntu/trusty-backports/multiverse.yml b/aptly/server/mirror/ubuntu/trusty/ubuntu/trusty-backports/multiverse.yml
index 1985b2d..96dc420 100644
--- a/aptly/server/mirror/ubuntu/trusty/ubuntu/trusty-backports/multiverse.yml
+++ b/aptly/server/mirror/ubuntu/trusty/ubuntu/trusty-backports/multiverse.yml
@@ -2,19 +2,23 @@
_param:
linux_system_country_code: cz
aptly_server_mirror_ubuntu_trusty_sources: ${_param:aptly_server_mirror_ubuntu_sources}
+ mirror_trusty-backports-multiverse_source: http://${_param:linux_system_country_code}.archive.ubuntu.com/ubuntu/
+ mirror_trusty-backports-multiverse_distribution: trusty-backports
+ mirror_trusty-backports-multiverse_components: multiverse
+ mirror_trusty-backports-multiverse_gpgkeys:
+ - 40976EAF437D05B5
+ - 437D05B5
+ - C0B21F32
aptly:
server:
mirror:
- trusty-multiverse:
- source: http://${_param:linux_system_country_code}.archive.ubuntu.com/ubuntu/
- distribution: trusty-backports
+ trusty-backports-multiverse:
+ source: ${_param:mirror_trusty-backports-multiverse_source}
+ distribution: ${_param:mirror_trusty-backports-multiverse_distribution}
sources: ${_param:aptly_server_mirror_ubuntu_trusty_sources}
- components: multiverse
+ components: ${_param:mirror_trusty-backports-multiverse_components}
architectures: amd64
- gpgkeys:
- - 40976EAF437D05B5
- - 437D05B5
- - C0B21F32
+ gpgkeys: ${_param:mirror_trusty-backports-multiverse_gpgkeys}
publisher:
component: multiverse
distributions:
diff --git a/aptly/server/mirror/ubuntu/trusty/ubuntu/trusty-backports/restricted.yml b/aptly/server/mirror/ubuntu/trusty/ubuntu/trusty-backports/restricted.yml
index 68c18be..712bebc 100644
--- a/aptly/server/mirror/ubuntu/trusty/ubuntu/trusty-backports/restricted.yml
+++ b/aptly/server/mirror/ubuntu/trusty/ubuntu/trusty-backports/restricted.yml
@@ -2,19 +2,23 @@
_param:
linux_system_country_code: cz
aptly_server_mirror_ubuntu_trusty_sources: ${_param:aptly_server_mirror_ubuntu_sources}
+ mirror_trusty-backports-restricted_source: http://${_param:linux_system_country_code}.archive.ubuntu.com/ubuntu/
+ mirror_trusty-backports-restricted_distribution: trusty-backports
+ mirror_trusty-backports-restricted_components: restricted
+ mirror_trusty-backports-restricted_gpgkeys:
+ - 40976EAF437D05B5
+ - 437D05B5
+ - C0B21F32
aptly:
server:
mirror:
- trusty-restricted:
- source: http://${_param:linux_system_country_code}.archive.ubuntu.com/ubuntu/
+ trusty-backports-restricted:
+ source: ${_param:mirror_trusty-backports-restricted_source}
+ distribution: ${_param:mirror_trusty-backports-restricted_distribution}
sources: ${_param:aptly_server_mirror_ubuntu_trusty_sources}
- distribution: trusty-backports
- components: restricted
+ components: ${_param:mirror_trusty-backports-restricted_components}
architectures: amd64
- gpgkeys:
- - 40976EAF437D05B5
- - 437D05B5
- - C0B21F32
+ gpgkeys: ${_param:mirror_trusty-backports-restricted_gpgkeys}
publisher:
component: restricted
distributions:
diff --git a/aptly/server/mirror/ubuntu/trusty/ubuntu/trusty-backports/universe.yml b/aptly/server/mirror/ubuntu/trusty/ubuntu/trusty-backports/universe.yml
index 4bf2165..f18b504 100644
--- a/aptly/server/mirror/ubuntu/trusty/ubuntu/trusty-backports/universe.yml
+++ b/aptly/server/mirror/ubuntu/trusty/ubuntu/trusty-backports/universe.yml
@@ -2,19 +2,23 @@
_param:
linux_system_country_code: cz
aptly_server_mirror_ubuntu_trusty_sources: ${_param:aptly_server_mirror_ubuntu_sources}
+ mirror_trusty-backports-universe_source: http://${_param:linux_system_country_code}.archive.ubuntu.com/ubuntu/
+ mirror_trusty-backports-universe_distribution: trusty-backports
+ mirror_trusty-backports-universe_components: universe
+ mirror_trusty-backports-universe_gpgkeys:
+ - 40976EAF437D05B5
+ - 437D05B5
+ - C0B21F32
aptly:
server:
mirror:
- trusty-universe:
- source: http://${_param:linux_system_country_code}.archive.ubuntu.com/ubuntu/
+ trusty-backports-universe:
+ source: ${_param:mirror_trusty-backports-universe_source}
+ distribution: ${_param:mirror_trusty-backports-universe_distribution}
sources: ${_param:aptly_server_mirror_ubuntu_trusty_sources}
- distribution: trusty-backports
- components: universe
+ components: ${_param:mirror_trusty-backports-universe_components}
architectures: amd64
- gpgkeys:
- - 40976EAF437D05B5
- - 437D05B5
- - C0B21F32
+ gpgkeys: ${_param:mirror_trusty-backports-universe_gpgkeys}
publisher:
component: universe
distributions:
diff --git a/aptly/server/mirror/ubuntu/trusty/ubuntu/trusty-proposed/main.yml b/aptly/server/mirror/ubuntu/trusty/ubuntu/trusty-proposed/main.yml
index 744e9c7..7164628 100644
--- a/aptly/server/mirror/ubuntu/trusty/ubuntu/trusty-proposed/main.yml
+++ b/aptly/server/mirror/ubuntu/trusty/ubuntu/trusty-proposed/main.yml
@@ -2,19 +2,23 @@
_param:
linux_system_country_code: cz
aptly_server_mirror_ubuntu_trusty_sources: ${_param:aptly_server_mirror_ubuntu_sources}
+ mirror_trusty-proposed-main_source: http://${_param:linux_system_country_code}.archive.ubuntu.com/ubuntu/
+ mirror_trusty-proposed-main_distribution: trusty-proposed
+ mirror_trusty-proposed-main_components: main
+ mirror_trusty-proposed-main_gpgkeys:
+ - 40976EAF437D05B5
+ - 437D05B5
+ - C0B21F32
aptly:
server:
mirror:
- trusty-main:
- source: http://${_param:linux_system_country_code}.archive.ubuntu.com/ubuntu/
- distribution: trusty-proposed
+ trusty-proposed-main:
+ source: ${_param:mirror_trusty-proposed-main_source}
+ distribution: ${_param:mirror_trusty-proposed-main_distribution}
sources: ${_param:aptly_server_mirror_ubuntu_trusty_sources}
- components: main
+ components: ${_param:mirror_trusty-proposed-main_components}
architectures: amd64
- gpgkeys:
- - 40976EAF437D05B5
- - 437D05B5
- - C0B21F32
+ gpgkeys: ${_param:mirror_trusty-proposed-main_gpgkeys}
publisher:
component: main
distributions:
diff --git a/aptly/server/mirror/ubuntu/trusty/ubuntu/trusty-proposed/multiverse.yml b/aptly/server/mirror/ubuntu/trusty/ubuntu/trusty-proposed/multiverse.yml
index cd79014..9227036 100644
--- a/aptly/server/mirror/ubuntu/trusty/ubuntu/trusty-proposed/multiverse.yml
+++ b/aptly/server/mirror/ubuntu/trusty/ubuntu/trusty-proposed/multiverse.yml
@@ -2,19 +2,23 @@
_param:
linux_system_country_code: cz
aptly_server_mirror_ubuntu_trusty_sources: ${_param:aptly_server_mirror_ubuntu_sources}
+ mirror_trusty-proposed-multiverse_source: http://${_param:linux_system_country_code}.archive.ubuntu.com/ubuntu/
+ mirror_trusty-proposed-multiverse_distribution: trusty-proposed
+ mirror_trusty-proposed-multiverse_components: multiverse
+ mirror_trusty-proposed-multiverse_gpgkeys:
+ - 40976EAF437D05B5
+ - 437D05B5
+ - C0B21F32
aptly:
server:
mirror:
- trusty-multiverse:
- source: http://${_param:linux_system_country_code}.archive.ubuntu.com/ubuntu/
- distribution: trusty-proposed
+ trusty-proposed-multiverse:
+ source: ${_param:mirror_trusty-proposed-multiverse_source}
+ distribution: ${_param:mirror_trusty-proposed-multiverse_distribution}
sources: ${_param:aptly_server_mirror_ubuntu_trusty_sources}
- components: multiverse
+ components: ${_param:mirror_trusty-proposed-multiverse_components}
architectures: amd64
- gpgkeys:
- - 40976EAF437D05B5
- - 437D05B5
- - C0B21F32
+ gpgkeys: ${_param:mirror_trusty-proposed-multiverse_gpgkeys}
publisher:
component: multiverse
distributions:
diff --git a/aptly/server/mirror/ubuntu/trusty/ubuntu/trusty-proposed/restricted.yml b/aptly/server/mirror/ubuntu/trusty/ubuntu/trusty-proposed/restricted.yml
index c9c1966..f5378b9 100644
--- a/aptly/server/mirror/ubuntu/trusty/ubuntu/trusty-proposed/restricted.yml
+++ b/aptly/server/mirror/ubuntu/trusty/ubuntu/trusty-proposed/restricted.yml
@@ -2,19 +2,23 @@
_param:
linux_system_country_code: cz
aptly_server_mirror_ubuntu_trusty_sources: ${_param:aptly_server_mirror_ubuntu_sources}
+ mirror_trusty-proposed-restricted_source: http://${_param:linux_system_country_code}.archive.ubuntu.com/ubuntu/
+ mirror_trusty-proposed-restricted_distribution: trusty-proposed
+ mirror_trusty-proposed-restricted_components: restricted
+ mirror_trusty-proposed-restricted_gpgkeys:
+ - 40976EAF437D05B5
+ - 437D05B5
+ - C0B21F32
aptly:
server:
mirror:
- trusty-restricted:
- source: http://${_param:linux_system_country_code}.archive.ubuntu.com/ubuntu/
+ trusty-proposed-restricted:
+ source: ${_param:mirror_trusty-proposed-restricted_source}
+ distribution: ${_param:mirror_trusty-proposed-restricted_distribution}
sources: ${_param:aptly_server_mirror_ubuntu_trusty_sources}
- distribution: trusty-proposed
- components: restricted
+ components: ${_param:mirror_trusty-proposed-restricted_components}
architectures: amd64
- gpgkeys:
- - 40976EAF437D05B5
- - 437D05B5
- - C0B21F32
+ gpgkeys: ${_param:mirror_trusty-proposed-restricted_gpgkeys}
publisher:
component: restricted
distributions:
diff --git a/aptly/server/mirror/ubuntu/trusty/ubuntu/trusty-proposed/universe.yml b/aptly/server/mirror/ubuntu/trusty/ubuntu/trusty-proposed/universe.yml
index 2049b68..b6f321b 100644
--- a/aptly/server/mirror/ubuntu/trusty/ubuntu/trusty-proposed/universe.yml
+++ b/aptly/server/mirror/ubuntu/trusty/ubuntu/trusty-proposed/universe.yml
@@ -2,19 +2,23 @@
_param:
linux_system_country_code: cz
aptly_server_mirror_ubuntu_trusty_sources: ${_param:aptly_server_mirror_ubuntu_sources}
+ mirror_trusty-proposed-universe_source: http://${_param:linux_system_country_code}.archive.ubuntu.com/ubuntu/
+ mirror_trusty-proposed-universe_distribution: trusty-proposed
+ mirror_trusty-proposed-universe_components: universe
+ mirror_trusty-proposed-universe_gpgkeys:
+ - 40976EAF437D05B5
+ - 437D05B5
+ - C0B21F32
aptly:
server:
mirror:
- trusty-universe:
- source: http://${_param:linux_system_country_code}.archive.ubuntu.com/ubuntu/
+ trusty-proposed-universe:
+ source: ${_param:mirror_trusty-proposed-universe_source}
+ distribution: ${_param:mirror_trusty-proposed-universe_distribution}
sources: ${_param:aptly_server_mirror_ubuntu_trusty_sources}
- distribution: trusty-proposed
- components: universe
+ components: ${_param:mirror_trusty-proposed-universe_components}
architectures: amd64
- gpgkeys:
- - 40976EAF437D05B5
- - 437D05B5
- - C0B21F32
+ gpgkeys: ${_param:mirror_trusty-proposed-universe_gpgkeys}
publisher:
component: universe
distributions:
diff --git a/aptly/server/mirror/ubuntu/trusty/ubuntu/trusty-security/main.yml b/aptly/server/mirror/ubuntu/trusty/ubuntu/trusty-security/main.yml
index 1068a48..1a797f7 100644
--- a/aptly/server/mirror/ubuntu/trusty/ubuntu/trusty-security/main.yml
+++ b/aptly/server/mirror/ubuntu/trusty/ubuntu/trusty-security/main.yml
@@ -2,19 +2,23 @@
_param:
linux_system_country_code: cz
aptly_server_mirror_ubuntu_trusty_sources: ${_param:aptly_server_mirror_ubuntu_sources}
+ mirror_trusty-security-main_source: http://${_param:linux_system_country_code}.archive.ubuntu.com/ubuntu/
+ mirror_trusty-security-main_distribution: trusty-security
+ mirror_trusty-security-main_components: main
+ mirror_trusty-security-main_gpgkeys:
+ - 40976EAF437D05B5
+ - 437D05B5
+ - C0B21F32
aptly:
server:
mirror:
- trusty-main:
- source: http://${_param:linux_system_country_code}.archive.ubuntu.com/ubuntu/
- distribution: trusty-security
+ trusty-security-main:
+ source: ${_param:mirror_trusty-security-main_source}
+ distribution: ${_param:mirror_trusty-security-main_distribution}
sources: ${_param:aptly_server_mirror_ubuntu_trusty_sources}
- components: main
+ components: ${_param:mirror_trusty-security-main_components}
architectures: amd64
- gpgkeys:
- - 40976EAF437D05B5
- - 437D05B5
- - C0B21F32
+ gpgkeys: ${_param:mirror_trusty-security-main_gpgkeys}
publisher:
component: main
distributions:
diff --git a/aptly/server/mirror/ubuntu/trusty/ubuntu/trusty-security/multiverse.yml b/aptly/server/mirror/ubuntu/trusty/ubuntu/trusty-security/multiverse.yml
index db7b0ed..b38e42b 100644
--- a/aptly/server/mirror/ubuntu/trusty/ubuntu/trusty-security/multiverse.yml
+++ b/aptly/server/mirror/ubuntu/trusty/ubuntu/trusty-security/multiverse.yml
@@ -2,19 +2,23 @@
_param:
linux_system_country_code: cz
aptly_server_mirror_ubuntu_trusty_sources: ${_param:aptly_server_mirror_ubuntu_sources}
+ mirror_trusty-security-multiverse_source: http://${_param:linux_system_country_code}.archive.ubuntu.com/ubuntu/
+ mirror_trusty-security-multiverse_distribution: trusty-security
+ mirror_trusty-security-multiverse_components: multiverse
+ mirror_trusty-security-multiverse_gpgkeys:
+ - 40976EAF437D05B5
+ - 437D05B5
+ - C0B21F32
aptly:
server:
mirror:
- trusty-multiverse:
- source: http://${_param:linux_system_country_code}.archive.ubuntu.com/ubuntu/
- distribution: trusty-security
+ trusty-security-multiverse:
+ source: ${_param:mirror_trusty-security-multiverse_source}
+ distribution: ${_param:mirror_trusty-security-multiverse_distribution}
sources: ${_param:aptly_server_mirror_ubuntu_trusty_sources}
- components: multiverse
+ components: ${_param:mirror_trusty-security-multiverse_components}
architectures: amd64
- gpgkeys:
- - 40976EAF437D05B5
- - 437D05B5
- - C0B21F32
+ gpgkeys: ${_param:mirror_trusty-security-multiverse_gpgkeys}
publisher:
component: multiverse
distributions:
diff --git a/aptly/server/mirror/ubuntu/trusty/ubuntu/trusty-security/restricted.yml b/aptly/server/mirror/ubuntu/trusty/ubuntu/trusty-security/restricted.yml
index 8c93486..76d2b4a 100644
--- a/aptly/server/mirror/ubuntu/trusty/ubuntu/trusty-security/restricted.yml
+++ b/aptly/server/mirror/ubuntu/trusty/ubuntu/trusty-security/restricted.yml
@@ -2,19 +2,23 @@
_param:
linux_system_country_code: cz
aptly_server_mirror_ubuntu_trusty_sources: ${_param:aptly_server_mirror_ubuntu_sources}
+ mirror_trusty-security-restricted_source: http://${_param:linux_system_country_code}.archive.ubuntu.com/ubuntu/
+ mirror_trusty-security-restricted_distribution: trusty-security
+ mirror_trusty-security-restricted_components: restricted
+ mirror_trusty-security-restricted_gpgkeys:
+ - 40976EAF437D05B5
+ - 437D05B5
+ - C0B21F32
aptly:
server:
mirror:
- trusty-restricted:
- source: http://${_param:linux_system_country_code}.archive.ubuntu.com/ubuntu/
+ trusty-security-restricted:
+ source: ${_param:mirror_trusty-security-restricted_source}
+ distribution: ${_param:mirror_trusty-security-restricted_distribution}
sources: ${_param:aptly_server_mirror_ubuntu_trusty_sources}
- distribution: trusty-security
- components: restricted
+ components: ${_param:mirror_trusty-security-restricted_components}
architectures: amd64
- gpgkeys:
- - 40976EAF437D05B5
- - 437D05B5
- - C0B21F32
+ gpgkeys: ${_param:mirror_trusty-security-restricted_gpgkeys}
publisher:
component: restricted
distributions:
diff --git a/aptly/server/mirror/ubuntu/trusty/ubuntu/trusty-security/universe.yml b/aptly/server/mirror/ubuntu/trusty/ubuntu/trusty-security/universe.yml
index bcc7da3..33d42f5 100644
--- a/aptly/server/mirror/ubuntu/trusty/ubuntu/trusty-security/universe.yml
+++ b/aptly/server/mirror/ubuntu/trusty/ubuntu/trusty-security/universe.yml
@@ -2,19 +2,23 @@
_param:
linux_system_country_code: cz
aptly_server_mirror_ubuntu_trusty_sources: ${_param:aptly_server_mirror_ubuntu_sources}
+ mirror_trusty-security-universe_source: http://${_param:linux_system_country_code}.archive.ubuntu.com/ubuntu/
+ mirror_trusty-security-universe_distribution: trusty-security
+ mirror_trusty-security-universe_components: universe
+ mirror_trusty-security-universe_gpgkeys:
+ - 40976EAF437D05B5
+ - 437D05B5
+ - C0B21F32
aptly:
server:
mirror:
- trusty-universe:
- source: http://${_param:linux_system_country_code}.archive.ubuntu.com/ubuntu/
+ trusty-security-universe:
+ source: ${_param:mirror_trusty-security-universe_source}
+ distribution: ${_param:mirror_trusty-security-universe_distribution}
sources: ${_param:aptly_server_mirror_ubuntu_trusty_sources}
- distribution: trusty-security
- components: universe
+ components: ${_param:mirror_trusty-security-universe_components}
architectures: amd64
- gpgkeys:
- - 40976EAF437D05B5
- - 437D05B5
- - C0B21F32
+ gpgkeys: ${_param:mirror_trusty-security-universe_gpgkeys}
publisher:
component: universe
distributions:
diff --git a/aptly/server/mirror/ubuntu/trusty/ubuntu/trusty-updates/main.yml b/aptly/server/mirror/ubuntu/trusty/ubuntu/trusty-updates/main.yml
index 8e86162..d7db631 100644
--- a/aptly/server/mirror/ubuntu/trusty/ubuntu/trusty-updates/main.yml
+++ b/aptly/server/mirror/ubuntu/trusty/ubuntu/trusty-updates/main.yml
@@ -2,19 +2,23 @@
_param:
linux_system_country_code: cz
aptly_server_mirror_ubuntu_trusty_sources: ${_param:aptly_server_mirror_ubuntu_sources}
+ mirror_trusty-updates-main_source: http://${_param:linux_system_country_code}.archive.ubuntu.com/ubuntu/
+ mirror_trusty-updates-main_distribution: trusty-updates
+ mirror_trusty-updates-main_components: main
+ mirror_trusty-updates-main_gpgkeys:
+ - 40976EAF437D05B5
+ - 437D05B5
+ - C0B21F32
aptly:
server:
mirror:
- trusty-main:
- source: http://${_param:linux_system_country_code}.archive.ubuntu.com/ubuntu/
- distribution: trusty-updates
+ trusty-updates-main:
+ source: ${_param:mirror_trusty-updates-main_source}
+ distribution: ${_param:mirror_trusty-updates-main_distribution}
sources: ${_param:aptly_server_mirror_ubuntu_trusty_sources}
- components: main
+ components: ${_param:mirror_trusty-updates-main_components}
architectures: amd64
- gpgkeys:
- - 40976EAF437D05B5
- - 437D05B5
- - C0B21F32
+ gpgkeys: ${_param:mirror_trusty-updates-main_gpgkeys}
publisher:
component: main
distributions:
diff --git a/aptly/server/mirror/ubuntu/trusty/ubuntu/trusty-updates/multiverse.yml b/aptly/server/mirror/ubuntu/trusty/ubuntu/trusty-updates/multiverse.yml
index 1e6d543..518b0ff 100644
--- a/aptly/server/mirror/ubuntu/trusty/ubuntu/trusty-updates/multiverse.yml
+++ b/aptly/server/mirror/ubuntu/trusty/ubuntu/trusty-updates/multiverse.yml
@@ -2,19 +2,23 @@
_param:
linux_system_country_code: cz
aptly_server_mirror_ubuntu_trusty_sources: ${_param:aptly_server_mirror_ubuntu_sources}
+ mirror_trusty-updates-multiverse_source: http://${_param:linux_system_country_code}.archive.ubuntu.com/ubuntu/
+ mirror_trusty-updates-multiverse_distribution: trusty-updates
+ mirror_trusty-updates-multiverse_components: multiverse
+ mirror_trusty-updates-multiverse_gpgkeys:
+ - 40976EAF437D05B5
+ - 437D05B5
+ - C0B21F32
aptly:
server:
mirror:
- trusty-multiverse:
- source: http://${_param:linux_system_country_code}.archive.ubuntu.com/ubuntu/
- distribution: trusty-updates
+ trusty-updates-multiverse:
+ source: ${_param:mirror_trusty-updates-multiverse_source}
+ distribution: ${_param:mirror_trusty-updates-multiverse_distribution}
sources: ${_param:aptly_server_mirror_ubuntu_trusty_sources}
- components: multiverse
+ components: ${_param:mirror_trusty-updates-multiverse_components}
architectures: amd64
- gpgkeys:
- - 40976EAF437D05B5
- - 437D05B5
- - C0B21F32
+ gpgkeys: ${_param:mirror_trusty-updates-multiverse_gpgkeys}
publisher:
component: multiverse
distributions:
diff --git a/aptly/server/mirror/ubuntu/trusty/ubuntu/trusty-updates/restricted.yml b/aptly/server/mirror/ubuntu/trusty/ubuntu/trusty-updates/restricted.yml
index 278376d..1b7ea0f 100644
--- a/aptly/server/mirror/ubuntu/trusty/ubuntu/trusty-updates/restricted.yml
+++ b/aptly/server/mirror/ubuntu/trusty/ubuntu/trusty-updates/restricted.yml
@@ -2,19 +2,23 @@
_param:
linux_system_country_code: cz
aptly_server_mirror_ubuntu_trusty_sources: ${_param:aptly_server_mirror_ubuntu_sources}
+ mirror_trusty-updates-restricted_source: http://${_param:linux_system_country_code}.archive.ubuntu.com/ubuntu/
+ mirror_trusty-updates-restricted_distribution: trusty-updates
+ mirror_trusty-updates-restricted_components: restricted
+ mirror_trusty-updates-restricted_gpgkeys:
+ - 40976EAF437D05B5
+ - 437D05B5
+ - C0B21F32
aptly:
server:
mirror:
- trusty-restricted:
- source: http://${_param:linux_system_country_code}.archive.ubuntu.com/ubuntu/
+ trusty-updates-restricted:
+ source: ${_param:mirror_trusty-updates-restricted_source}
+ distribution: ${_param:mirror_trusty-updates-restricted_distribution}
sources: ${_param:aptly_server_mirror_ubuntu_trusty_sources}
- distribution: trusty-updates
- components: restricted
+ components: ${_param:mirror_trusty-updates-restricted_components}
architectures: amd64
- gpgkeys:
- - 40976EAF437D05B5
- - 437D05B5
- - C0B21F32
+ gpgkeys: ${_param:mirror_trusty-updates-restricted_gpgkeys}
publisher:
component: restricted
distributions:
diff --git a/aptly/server/mirror/ubuntu/trusty/ubuntu/trusty-updates/universe.yml b/aptly/server/mirror/ubuntu/trusty/ubuntu/trusty-updates/universe.yml
index 632abbb..3f4d815 100644
--- a/aptly/server/mirror/ubuntu/trusty/ubuntu/trusty-updates/universe.yml
+++ b/aptly/server/mirror/ubuntu/trusty/ubuntu/trusty-updates/universe.yml
@@ -2,19 +2,23 @@
_param:
linux_system_country_code: cz
aptly_server_mirror_ubuntu_trusty_sources: ${_param:aptly_server_mirror_ubuntu_sources}
+ mirror_trusty-updates-universe_source: http://${_param:linux_system_country_code}.archive.ubuntu.com/ubuntu/
+ mirror_trusty-updates-universe_distribution: trusty-updates
+ mirror_trusty-updates-universe_components: universe
+ mirror_trusty-updates-universe_gpgkeys:
+ - 40976EAF437D05B5
+ - 437D05B5
+ - C0B21F32
aptly:
server:
mirror:
- trusty-universe:
- source: http://${_param:linux_system_country_code}.archive.ubuntu.com/ubuntu/
+ trusty-updates-universe:
+ source: ${_param:mirror_trusty-updates-universe_source}
+ distribution: ${_param:mirror_trusty-updates-universe_distribution}
sources: ${_param:aptly_server_mirror_ubuntu_trusty_sources}
- distribution: trusty-updates
- components: universe
+ components: ${_param:mirror_trusty-updates-universe_components}
architectures: amd64
- gpgkeys:
- - 40976EAF437D05B5
- - 437D05B5
- - C0B21F32
+ gpgkeys: ${_param:mirror_trusty-updates-universe_gpgkeys}
publisher:
component: universe
distributions:
diff --git a/aptly/server/mirror/ubuntu/trusty/ubuntu/trusty/main.yml b/aptly/server/mirror/ubuntu/trusty/ubuntu/trusty/main.yml
index 08559a6..3a054e7 100644
--- a/aptly/server/mirror/ubuntu/trusty/ubuntu/trusty/main.yml
+++ b/aptly/server/mirror/ubuntu/trusty/ubuntu/trusty/main.yml
@@ -2,19 +2,23 @@
_param:
linux_system_country_code: cz
aptly_server_mirror_ubuntu_trusty_sources: ${_param:aptly_server_mirror_ubuntu_sources}
+ mirror_trusty-main_source: http://${_param:linux_system_country_code}.archive.ubuntu.com/ubuntu/
+ mirror_trusty-main_distribution: trusty
+ mirror_trusty-main_components: main
+ mirror_trusty-main_gpgkeys:
+ - 40976EAF437D05B5
+ - 437D05B5
+ - C0B21F32
aptly:
server:
mirror:
trusty-main:
- source: http://${_param:linux_system_country_code}.archive.ubuntu.com/ubuntu/
- distribution: trusty
+ source: ${_param:mirror_trusty-main_source}
+ distribution: ${_param:mirror_trusty-main_distribution}
sources: ${_param:aptly_server_mirror_ubuntu_trusty_sources}
- components: main
+ components: ${_param:mirror_trusty-main_components}
architectures: amd64
- gpgkeys:
- - 40976EAF437D05B5
- - 437D05B5
- - C0B21F32
+ gpgkeys: ${_param:mirror_trusty-main_gpgkeys}
publisher:
component: main
distributions:
diff --git a/aptly/server/mirror/ubuntu/trusty/ubuntu/trusty/multiverse.yml b/aptly/server/mirror/ubuntu/trusty/ubuntu/trusty/multiverse.yml
index 1748832..37a0b05 100644
--- a/aptly/server/mirror/ubuntu/trusty/ubuntu/trusty/multiverse.yml
+++ b/aptly/server/mirror/ubuntu/trusty/ubuntu/trusty/multiverse.yml
@@ -2,19 +2,23 @@
_param:
linux_system_country_code: cz
aptly_server_mirror_ubuntu_trusty_sources: ${_param:aptly_server_mirror_ubuntu_sources}
+ mirror_trusty-multiverse_source: http://${_param:linux_system_country_code}.archive.ubuntu.com/ubuntu/
+ mirror_trusty-multiverse_distribution: trusty
+ mirror_trusty-multiverse_components: multiverse
+ mirror_trusty-multiverse_gpgkeys:
+ - 40976EAF437D05B5
+ - 437D05B5
+ - C0B21F32
aptly:
server:
mirror:
trusty-multiverse:
- source: http://${_param:linux_system_country_code}.archive.ubuntu.com/ubuntu/
- distribution: trusty
+ source: ${_param:mirror_trusty-multiverse_source}
+ distribution: ${_param:mirror_trusty-multiverse_distribution}
sources: ${_param:aptly_server_mirror_ubuntu_trusty_sources}
- components: multiverse
+ components: ${_param:mirror_trusty-multiverse_components}
architectures: amd64
- gpgkeys:
- - 40976EAF437D05B5
- - 437D05B5
- - C0B21F32
+ gpgkeys: ${_param:mirror_trusty-multiverse_gpgkeys}
publisher:
component: multiverse
distributions:
diff --git a/aptly/server/mirror/ubuntu/trusty/ubuntu/trusty/restricted.yml b/aptly/server/mirror/ubuntu/trusty/ubuntu/trusty/restricted.yml
index 8004636..dca087a 100644
--- a/aptly/server/mirror/ubuntu/trusty/ubuntu/trusty/restricted.yml
+++ b/aptly/server/mirror/ubuntu/trusty/ubuntu/trusty/restricted.yml
@@ -2,19 +2,23 @@
_param:
linux_system_country_code: cz
aptly_server_mirror_ubuntu_trusty_sources: ${_param:aptly_server_mirror_ubuntu_sources}
+ mirror_trusty-restricted_source: http://${_param:linux_system_country_code}.archive.ubuntu.com/ubuntu/
+ mirror_trusty-restricted_distribution: trusty
+ mirror_trusty-restricted_components: restricted
+ mirror_trusty-restricted_gpgkeys:
+ - 40976EAF437D05B5
+ - 437D05B5
+ - C0B21F32
aptly:
server:
mirror:
trusty-restricted:
- source: http://${_param:linux_system_country_code}.archive.ubuntu.com/ubuntu/
+ source: ${_param:mirror_trusty-restricted_source}
+ distribution: ${_param:mirror_trusty-restricted_distribution}
sources: ${_param:aptly_server_mirror_ubuntu_trusty_sources}
- distribution: trusty
- components: restricted
+ components: ${_param:mirror_trusty-restricted_components}
architectures: amd64
- gpgkeys:
- - 40976EAF437D05B5
- - 437D05B5
- - C0B21F32
+ gpgkeys: ${_param:mirror_trusty-restricted_gpgkeys}
publisher:
component: restricted
distributions:
diff --git a/aptly/server/mirror/ubuntu/trusty/ubuntu/trusty/universe.yml b/aptly/server/mirror/ubuntu/trusty/ubuntu/trusty/universe.yml
index ac3ba70..a112b94 100644
--- a/aptly/server/mirror/ubuntu/trusty/ubuntu/trusty/universe.yml
+++ b/aptly/server/mirror/ubuntu/trusty/ubuntu/trusty/universe.yml
@@ -2,19 +2,23 @@
_param:
linux_system_country_code: cz
aptly_server_mirror_ubuntu_trusty_sources: ${_param:aptly_server_mirror_ubuntu_sources}
+ mirror_trusty-universe_source: http://${_param:linux_system_country_code}.archive.ubuntu.com/ubuntu/
+ mirror_trusty-universe_distribution: trusty
+ mirror_trusty-universe_components: universe
+ mirror_trusty-universe_gpgkeys:
+ - 40976EAF437D05B5
+ - 437D05B5
+ - C0B21F32
aptly:
server:
mirror:
trusty-universe:
- source: http://${_param:linux_system_country_code}.archive.ubuntu.com/ubuntu/
+ source: ${_param:mirror_trusty-universe_source}
+ distribution: ${_param:mirror_trusty-universe_distribution}
sources: ${_param:aptly_server_mirror_ubuntu_trusty_sources}
- distribution: trusty
- components: universe
+ components: ${_param:mirror_trusty-universe_components}
architectures: amd64
- gpgkeys:
- - 40976EAF437D05B5
- - 437D05B5
- - C0B21F32
+ gpgkeys: ${_param:mirror_trusty-universe_gpgkeys}
publisher:
component: universe
distributions:
diff --git a/aptly/server/mirror/ubuntu/trusty/ubuntucloud.yml b/aptly/server/mirror/ubuntu/trusty/ubuntucloud.yml
index b66d34c..e8d1f54 100644
--- a/aptly/server/mirror/ubuntu/trusty/ubuntucloud.yml
+++ b/aptly/server/mirror/ubuntu/trusty/ubuntucloud.yml
@@ -1,4 +1,16 @@
parameters:
+ _param:
+ mirror_trusty-updates-liberty_source: http://ubuntu-cloud.archive.canonical.com/ubuntu/
+ mirror_trusty-updates-liberty_distribution: trusty-updates/liberty
+ mirror_trusty-updates-liberty_components: main
+ mirror_trusty-updates-liberty_gpgkeys:
+ - EC4926EA
+
+ mirror_trusty-updates-mitaka_source: http://ubuntu-cloud.archive.canonical.com/ubuntu/
+ mirror_trusty-updates-mitaka_distribution: trusty-updates/mitaka
+ mirror_trusty-updates-mitaka_components: main
+ mirror_trusty-updates-mitaka_gpgkeys:
+ - EC4926EA
aptly:
server:
mirror:
@@ -24,24 +36,25 @@
# component: kilo
# distributions:
# - trusty
+ aptly:
+ server:
+ mirror:
trusty-updates-liberty:
- source: http://ubuntu-cloud.archive.canonical.com/ubuntu/
- distribution: trusty-updates/liberty
- components: main
+ source: ${_param:mirror_trusty-updates-liberty_source}
+ distribution: ${_param:mirror_trusty-updates-liberty_distribution}
+ components: ${_param:mirror_trusty-updates-liberty_components}
architectures: amd64
- gpgkeys:
- - EC4926EA
+ gpgkeys: ${_param:mirror_trusty-updates-liberty_gpgkeys}
publisher:
component: liberty
distributions:
- ubuntu-trusty/nightly
trusty-updates-mitaka:
- source: http://ubuntu-cloud.archive.canonical.com/ubuntu/
- distribution: trusty-updates/mitaka
- components: main
+ source: ${_param:mirror_trusty-updates-mitaka_source}
+ distribution: ${_param:mirror_trusty-updates-mitaka_distribution}
+ components: ${_param:mirror_trusty-updates-mitaka_components}
architectures: amd64
- gpgkeys:
- - EC4926EA
+ gpgkeys: ${_param:mirror_trusty-updates-mitaka_gpgkeys}
publisher:
component: mitaka
distributions:
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:
diff --git a/ceph/client/container.yml b/ceph/client/container.yml
index d200a1d..8c6afaf 100644
--- a/ceph/client/container.yml
+++ b/ceph/client/container.yml
@@ -3,3 +3,26 @@
parameters:
_param:
ceph_client_prefix_dir: /srv/volumes/ceph
+ ceph_auth_client_required: cephx
+ ceph:
+ client:
+ config:
+ global:
+ fsid: ${_param:ceph_fsid}
+ mon_initial_members: ${_param:ceph_mon_initial_members}
+ mon_host: ${_param:ceph_mon_host}
+ auth_client_required: ${_param:ceph_auth_client_required}
+ public_network: ${_param:ceph_public_network}
+ cluster_network: ${_param:ceph_cluster_network}
+ osd_fs_mount_options_xfs: rw,noatime
+ osd_fs_type: xfs
+ osd:
+ filestore_xattr_use_omap: True
+ osd_journal_size: 7500
+ mon:
+ mon_debug_dump_transactions: False
+ client:
+ rbd_cache_size: 268435456
+ rbd_cache_max_dirty: 134217728
+ rbd_cache_max_dirty_age: 5
+ rbd_cache: True
diff --git a/devops_portal/service/rundeck.yml b/devops_portal/service/rundeck.yml
index 946e0c2..542974e 100644
--- a/devops_portal/service/rundeck.yml
+++ b/devops_portal/service/rundeck.yml
@@ -1,4 +1,8 @@
parameters:
+ _param:
+ oss_rundeck_user: ${_param:rundeck_admin_username}
+ oss_rundeck_password: ${_param:rundeck_admin_password}
+ oss_rundeck_token: ${_param:rundeck_admin_token}
devops_portal:
config:
service:
@@ -10,9 +14,9 @@
proxy_read_timeout: 300
send_timeout: 300
credentials:
- username: ${_param:rundeck_admin_username}
- password: ${_param:rundeck_admin_password}
- token: ${_param:rundeck_admin_token}
+ username: ${_param:oss_rundeck_user}
+ password: ${_param:oss_rundeck_password}
+ token: ${_param:oss_rundeck_token}
endpoint:
address: ${_param:haproxy_rundeck_bind_host}
port: ${_param:haproxy_rundeck_bind_port}
diff --git a/devops_portal/service/security_monkey.yml b/devops_portal/service/security_monkey.yml
index 9fce180..36b79f6 100644
--- a/devops_portal/service/security_monkey.yml
+++ b/devops_portal/service/security_monkey.yml
@@ -1,4 +1,7 @@
parameters:
+ _param:
+ oss_security_monkey_user: ${_param:security_monkey_user}
+ oss_security_monkey_password: ${_param:security_monkey_password}
devops_portal:
config:
service:
@@ -14,5 +17,5 @@
port: ${_param:security_monkey_bind_port}
https: ${_param:security_monkey_ssl:enabled}
credentials:
- username: ${_param:security_monkey_user}
- password: ${_param:security_monkey_password}
+ username: ${_param:oss_security_monkey_user}
+ password: ${_param:oss_security_monkey_password}
diff --git a/docker/client.yml b/docker/client.yml
index 4691ddb..df11493 100644
--- a/docker/client.yml
+++ b/docker/client.yml
@@ -1,10 +1,12 @@
classes:
- service.docker.client
parameters:
+ _param:
+ docker_image_compose: docker/compose:1.8.0
docker:
client:
enabled: true
compose:
source:
engine: docker
- image: "docker/compose:1.8.0"
+ image: ${_param:docker_image_compose}
diff --git a/jenkins/client/approved_scripts.yml b/jenkins/client/approved_scripts.yml
index 6afd67e..12a7e9f 100644
--- a/jenkins/client/approved_scripts.yml
+++ b/jenkins/client/approved_scripts.yml
@@ -99,6 +99,7 @@
- staticMethod java.util.regex.Pattern quote java.lang.String
- staticMethod java.util.stream.Collectors joining java.lang.CharSequence
- staticMethod jenkins.model.Jenkins getInstance
+ - staticMethod org.codehaus.groovy.runtime.DefaultGroovyMethods asBoolean java.util.regex.Matcher
- staticMethod org.codehaus.groovy.runtime.DefaultGroovyMethods collect java.util.Map groovy.lang.Closure
- staticMethod org.codehaus.groovy.runtime.DefaultGroovyMethods eachFile java.io.File groovy.io.FileType groovy.lang.Closure
- staticMethod org.codehaus.groovy.runtime.DefaultGroovyMethods find java.util.Collection groovy.lang.Closure
diff --git a/jenkins/client/job/custompatches.yml b/jenkins/client/job/custompatches.yml
new file mode 100644
index 0000000..e7a7eed
--- /dev/null
+++ b/jenkins/client/job/custompatches.yml
@@ -0,0 +1,43 @@
+parameters:
+ jenkins:
+ client:
+ job:
+ custompatches:
+ concurrent: true
+ discard:
+ build:
+ keep_num: 20
+ display_name: Custom Patches - find and upload to review
+ name: custom-patches
+ param:
+ GERRIT_URI:
+ type: string
+ default: ''
+ description: "Gerrit URI to the projec"
+ GERRIT_CREDENTIALS:
+ default: mcp-ci-gerrit
+ type: string
+ description: "Name of creadentials to use when connecting to gerrit"
+ TARGET_GERRIT_URI:
+ default: ''
+ type: string
+ description: "Link to the target on gerrit, if not set GERRIT_URI is picked"
+ OLD_BRANCH:
+ default: ''
+ type: string
+ description: "Old branch on GERRIT_URI to take patches from, tupically previous release"
+ NEW_BRANCH:
+ default: ''
+ type: string
+ description: "New branch to compare with and push patches to, tupically current release"
+ DRY_RUN:
+ default: 'false'
+ type: boolean
+ description: "Do not upload custom patches on review, just log them"
+ scm:
+ script: custompatches.groovy
+ type: git
+ url: "${_param:jenkins_gerrit_url}/openstack-ci/openstack-pipelines"
+ credentials: "gerrit"
+ type: workflow-scm
+
diff --git a/jenkins/client/job/docker/build-images.yml b/jenkins/client/job/docker/build-images.yml
index 61f1e6d..a953d95 100644
--- a/jenkins/client/job/docker/build-images.yml
+++ b/jenkins/client/job/docker/build-images.yml
@@ -11,6 +11,8 @@
repo: mk
- name: prometheus
repo: mcp
+ - name: opencontrail
+ repo: mk
template:
discard:
build:
diff --git a/jenkins/client/job/docker/init.yml b/jenkins/client/job/docker/init.yml
index 64dc03f..63c3f27 100644
--- a/jenkins/client/job/docker/init.yml
+++ b/jenkins/client/job/docker/init.yml
@@ -21,6 +21,7 @@
- name: jenkins
branch: "master"
tags: ""
+ dockerfile: "Dockerfile"
- name: jenkins
branch: "2.32.3"
tags: "2.32"
diff --git a/jenkins/client/job/k8s-test/init.yml b/jenkins/client/job/k8s-test/init.yml
index 0157bb8..0cdaa09 100644
--- a/jenkins/client/job/k8s-test/init.yml
+++ b/jenkins/client/job/k8s-test/init.yml
@@ -1,2 +1,3 @@
classes:
-- system.jenkins.client.job.k8s-test.mcp-k8s-test-pipeline
\ No newline at end of file
+- system.jenkins.client.job.k8s-test.mcp-k8s-test-pipeline
+- system.jenkins.client.job.k8s-test.mcp-k8s-merge-pipeline
\ No newline at end of file
diff --git a/jenkins/client/job/k8s-test/mcp-k8s-merge-pipeline.yml b/jenkins/client/job/k8s-test/mcp-k8s-merge-pipeline.yml
new file mode 100644
index 0000000..f209aa2
--- /dev/null
+++ b/jenkins/client/job/k8s-test/mcp-k8s-merge-pipeline.yml
@@ -0,0 +1,36 @@
+parameters:
+ jenkins:
+ client:
+ job:
+ mcp_k8s_merge_pipeline:
+ type: workflow-scm
+ name: mcp-k8s-merge-pipeline
+ display_name: "Kubernetes merge pipeline"
+ discard:
+ build:
+ keep_num: 20
+ concurrent: false
+ scm:
+ type: git
+ url: "${_param:jenkins_gerrit_url}/kubernetes-ci/kubernetes-pipelines"
+ credentials: "gerrit"
+ script: pipelines/mcp-k8s-test-pipeline.groovy
+ trigger:
+ gerrit:
+ project:
+ kubernetes/kubernetes:
+ branches:
+ - compare_type: "ANT"
+ name: "**mcp**"
+ message:
+ build_successful: "Build successful"
+ build_unstable: "Build unstable"
+ build_failure: "Build failed"
+ event:
+ change:
+ - merged
+ param:
+ KUBE_DOCKER_REGISTRY:
+ type: string
+ default: 'docker-dev-local.docker.mirantis.net'
+ description: 'Docker registry for binaries and images'
diff --git a/jenkins/client/job/k8s-test/mcp-k8s-test-pipeline.yml b/jenkins/client/job/k8s-test/mcp-k8s-test-pipeline.yml
index 645b80d..c872c64 100644
--- a/jenkins/client/job/k8s-test/mcp-k8s-test-pipeline.yml
+++ b/jenkins/client/job/k8s-test/mcp-k8s-test-pipeline.yml
@@ -35,10 +35,11 @@
comment:
- addedContains:
commentAddedCommentContains: '(recheck|reverify)'
+ gerrit-build-unstable-verified-value: 1
param:
KUBE_DOCKER_REGISTRY:
type: string
- default: 'docker-dev-virtual.docker.mirantis.net'
+ default: 'docker-dev-local.docker.mirantis.net'
description: 'Docker registry for binaries and images'
CALICO_DOCKER_REGISTRY:
type: string
@@ -46,16 +47,8 @@
description: 'Docker registry for published Calico images'
K8S_BASE_IMAGE:
type: string
- default: '{docker-prod-virtual}/mirantis/base-images/debian-base:20161223134732'
+ default: 'mirantis/base-images/debian-base:20161223134732'
description: 'Base Docker image to build k8s'
- DOCKER_IMAGE_UNIT:
- type: string
- default: '{docker-prod-virtual}/mirantis/k8s-tests-images/k8s-tests-unit:latest'
- desription: 'Docker image for k8s unit tests'
- DOCKER_IMAGE_INTEGRATION:
- type: string
- default: '{docker-prod-virtual}/mirantis/k8s-tests-images/k8s-tests-integration:latest'
- desription: 'Docker image for k8s integration tests'
CALICO_CNI_IMAGE_REPO:
type: string
default: 'calico/cni'
diff --git a/jenkins/client/job/oscore/init.yml b/jenkins/client/job/oscore/init.yml
new file mode 100644
index 0000000..171ff6e
--- /dev/null
+++ b/jenkins/client/job/oscore/init.yml
@@ -0,0 +1,10 @@
+classes:
+ - system.jenkins.client.job.oscore.tests
+parameters:
+ jenkins:
+ client:
+ view:
+ "OSCORE":
+ enabled: true
+ type: ListView
+ include_regex: "^oscore-.*"
\ No newline at end of file
diff --git a/jenkins/client/job/oscore/tests.yml b/jenkins/client/job/oscore/tests.yml
new file mode 100644
index 0000000..4897cb0
--- /dev/null
+++ b/jenkins/client/job/oscore/tests.yml
@@ -0,0 +1,267 @@
+parameters:
+ jenkins:
+ client:
+ job_template:
+ test-openstack-component-periodic:
+ name: "{{job_prefix}}-{{milestone}}-{{model}}-{{openstack_version}}-{{formula_pkg_revision}}"
+ template:
+ discard:
+ build:
+ keep_num: 30
+ artifact:
+ keep_num: 30
+ type: workflow-scm
+ concurrent: true
+ scm:
+ type: git
+ url: "${_param:jenkins_gerrit_url}/openstack-ci/openstack-pipelines.git"
+ credentials: "mcp-gerrit"
+ branch: 'master'
+ script: test-openstack-component-pipeline.groovy
+ trigger:
+ timer:
+ spec: "0 21 * * *"
+ param:
+ # general
+ HEAT_STACK_ZONE:
+ type: string
+ description: AZ
+ default: 'mcp-oscore'
+ OPENSTACK_VERSION:
+ type: string
+ description: Version of openstack to test
+ default: "{{openstack_version}}"
+ PROJECT:
+ type: string
+ description: Project to test
+ default: "all"
+ STACK_TEST_JOB:
+ type: string
+ description: Job for environment deployment
+ default: "{{stack_test_job}}"
+ STACK_TYPE:
+ type: string
+ default: "{{stack_type}}"
+ STACK_INSTALL:
+ type: string
+ description: components to install
+ default: 'core,openstack,ovs'
+ STACK_DELETE:
+ type: boolean
+ default: 'true'
+ description: Don't enable it if you need to use the lab after
+ STACK_CLEANUP_JOB:
+ type: string
+ default: "{{stack_cleanup_job}}"
+ # salt
+ SALT_OVERRIDES:
+ type: text
+ default: ""
+ description: YAML with overrides for Salt deployment
+ FORMULA_PKG_REVISION:
+ type: string
+ description: Version of formulas for salt-master bootstrap
+ default: "{{formula_pkg_revision}}"
+ EXTRA_REPO:
+ type: string
+ description: Optional extra repository to run tests with
+ default: ''
+ EXTRA_REPO_PIN:
+ type: string
+ description: Optional extra repository pin definition
+ default: ''
+ EXTRA_REPO_PRIORITY:
+ type: string
+ description: Optional extra repository pin priority
+ default: ''
+ # openstack api
+ OPENSTACK_API_URL:
+ type: string
+ default: "https://cloud-cz.bud.mirantis.net:5000"
+ OPENSTACK_API_CREDENTIALS:
+ type: string
+ default: "openstack-devcloud-credentials"
+ OPENSTACK_API_PROJECT:
+ type: string
+ default: "mcp-oscore"
+ OPENSTACK_API_PROJECT_DOMAIN:
+ type: string
+ default: "default"
+ OPENSTACK_API_PROJECT_ID:
+ type: string
+ default: ""
+ OPENSTACK_API_USER_DOMAIN:
+ type: string
+ default: "default"
+ OPENSTACK_API_CLIENT:
+ type: string
+ default: ""
+ OPENSTACK_API_VERSION:
+ type: string
+ default: "3"
+ # test
+ TEST_MILESTONE:
+ type: string
+ description: Product milestone
+ default: "{{milestone}}"
+ TEST_TEMPEST_TARGET:
+ type: string
+ description: Node to run tests
+ default: "{{tempest_target}}"
+ TEST_TEMPEST_PATTERN:
+ type: string
+ description: Run tests matched to pattern only
+ default: "tempest"
+ TEST_MODEL:
+ type: string
+ description: Environment salt model
+ default: "{{model}}"
+ TEST_PASS_THRESHOLD:
+ type: string
+ description: Tests pass rate to consider build successful
+ default: "{{test_threshold}}"
+ FAIL_ON_TESTS:
+ type: boolean
+ default: 'true'
+ description: Whether to fail build on test results
+ test-runner-template:
+ name: "{{job_prefix}}-{{test_type}}-runner"
+ template:
+ discard:
+ build:
+ keep_num: 30
+ artifact:
+ keep_num: 30
+ type: workflow-scm
+ concurrent: true
+ scm:
+ type: git
+ url: "${_param:jenkins_gerrit_url}/openstack-ci/openstack-pipelines.git"
+ credentials: "mcp-gerrit"
+ branch: 'master'
+ script: run-openstack-tests.groovy
+ param:
+ # general
+ FAIL_ON_TESTS:
+ type: boolean
+ default: 'true'
+ description: Whether to fail build on test results
+ TEST_MILESTONE:
+ type: string
+ description: Product milestone
+ OPENSTACK_VERSION:
+ type: string
+ description: Version of openstack to test
+ PROJECT:
+ type: string
+ description: Name of project being tested
+ PROC_RESULTS_JOB:
+ type: string
+ description: Job for results processing
+ default: "{{proc_results_job}}"
+ # salt
+ SALT_MASTER_CREDENTIALS:
+ type: string
+ default: "salt-qa-credentials"
+ SALT_MASTER_URL:
+ type: string
+ default: ""
+ # test
+ TESTRAIL:
+ type: boolean
+ default: 'false'
+ description: Upload results to testrail or not
+ TEST_TEMPEST_TARGET:
+ type: string
+ description: Salt target to run tests
+ TEST_TEMPEST_IMAGE:
+ type: string
+ description: Node to run tests
+ default: 'docker-prod-local.artifactory.mirantis.com/mirantis/oscore/rally-tempest'
+ TEST_TEMPEST_PATTERN:
+ type: string
+ description: Run tests matched to pattern only
+ TEST_MODEL:
+ type: string
+ description: Environment salt model
+ TEST_DOCKER_INSTALL:
+ type: boolean
+ default: 'true'
+ description: Whether to install docker for tempest
+ TEST_PASS_THRESHOLD:
+ type: string
+ description: Tests pass rate to consider build successful
+ default: "90"
+ results-checker-template:
+ name: "{{job_prefix}}-{{test_type}}-results-checker"
+ template:
+ discard:
+ build:
+ keep_num: 30
+ artifact:
+ keep_num: 30
+ type: workflow-scm
+ concurrent: true
+ scm:
+ type: git
+ url: "${_param:jenkins_gerrit_url}/openstack-ci/openstack-pipelines.git"
+ credentials: "mcp-gerrit"
+ branch: 'master'
+ script: process-openstack-test-results.groovy
+ param:
+ # general
+ FAIL_ON_TESTS:
+ type: boolean
+ default: 'false'
+ description: Whether to fail build on test results
+ OPENSTACK_VERSION:
+ type: string
+ description: Version of openstack to test
+ TARGET_JOB:
+ type: string
+ description: Job to analyse results from
+ TARGET_BUILD_NUMBER:
+ type: string
+ description: Build number to analyse results from
+ # test
+ TESTRAIL:
+ type: boolean
+ default: 'false'
+ description: Whether to upload results to testrail or not
+ TESTRAIL_QA_CREDENTIALS:
+ type: string
+ default: "{{testrail_credentials}}"
+ description: Credentials for results upload to testrail
+ TEST_TEMPEST_TARGET:
+ type: string
+ description: Node to run tests
+ TEST_MILESTONE:
+ type: string
+ description: Product milestone
+ TEST_SUITE:
+ type: string
+ description: Testrail test suite
+ default: >-
+ 'Tempest 16.0.0 with designate tests'
+ TEST_PLAN:
+ type: string
+ description: Testrail test plan
+ default: ''
+ TEST_GROUP:
+ type: string
+ description: Testrail test group
+ default: ''
+ TEST_REPORTER_IMAGE:
+ type: string
+ description: Docker image of testrail reporter tool
+ default: "{{test_reporter_image}}"
+ TEST_MODEL:
+ type: string
+ description: Environment salt model
+ TEST_DATE:
+ type: string
+ description: "TEST run date"
+ TEST_PASS_THRESHOLD:
+ type: string
+ description: Tests pass rate to consider build successful
+ default: "90"
diff --git a/jenkins/client/job/validate.yml b/jenkins/client/job/validate.yml
index 0544f80..88b0435 100644
--- a/jenkins/client/job/validate.yml
+++ b/jenkins/client/job/validate.yml
@@ -32,56 +32,85 @@
SALT_MASTER_CREDENTIALS:
type: string
default: "salt"
+ description: Credentials to the Salt API
TEST_IMAGE:
type: string
default: "docker-prod-local.artifactory.mirantis.com/mirantis/oss/qa-tools"
+ description: Docker image to setup testing environment
TARGET_NODE:
type: string
default: ""
+ description: Target node where this job will be executed from
RUN_RALLY_TESTS:
type: boolean
default: 'true'
+ description: If chosen then Rally tests will be executed
RUN_TEMPEST_TESTS:
type: boolean
default: 'true'
+ description: If chosen then Tempest tests will be executed
RUN_K8S_TESTS:
type: boolean
default: 'true'
+ description: If chosen then K8S tests will be executed
TEMPEST_TEST_SET:
type: choice
choices:
- smoke
- full
+ description: Set of Tempest tests to run
+ TEST_K8S_NODE:
+ type: string
+ default: ""
+ description: Kubernetes node to run tests from
TEST_K8S_API_SERVER:
type: string
default: "http://127.0.0.1:8080"
+ description: API server parameter for K8S tests
TEST_K8S_CONFORMANCE_IMAGE:
type: string
default: "docker-dev-virtual.docker.mirantis.net/mirantis/kubernetes/k8s-conformance:v1.7.5-2_1504192939316"
+ description: Docker image to run K8S tests
RUN_SPT_TESTS:
type: boolean
default: 'true'
+ description: If chosen then SPT tests will be executed
SPT_SSH_USER:
type: string
default: "root"
+ description: Username that is used to ssh between cluster nodes
FLOATING_NETWORK:
type: string
default: ""
+ description: External(floating) network name (used in both SPT and Rally)
SPT_IMAGE:
type: string
default: ""
+ description: Image that is used for network-VM-to-VM-iperf-tests tests
SPT_IMAGE_USER:
type: string
default: ""
+ description: Username that is used to ssh to SPT_IMAGE
SPT_FLAVOR:
type: string
default: ""
- AVAILABILITY_ZONE:
- type: string
- default: "nova"
+ description: Flavor name for SPT_IMAGE (make sure you have required flavor created)
RALLY_IMAGE:
type: string
default: "cirros"
RALLY_FLAVOR:
type: string
default: "m1.tiny"
+ description: Flavor name for Rally scenarios
+ AVAILABILITY_ZONE:
+ type: string
+ default: "nova"
+ description: Name of availability zone
+ GENERATE_REPORT:
+ type: boolean
+ default: 'true'
+ description: If chosen then at the end of the test run HTML report will be generated
+ ACCUMULATE_RESULTS:
+ type: boolean
+ default: 'true'
+ description: If chosen then previous build results will be used in the current build
diff --git a/linux/system/single/init.yml b/linux/system/single/init.yml
index 1e68380..8de2dda 100644
--- a/linux/system/single/init.yml
+++ b/linux/system/single/init.yml
@@ -17,7 +17,7 @@
package:
cloud-init:
version: purged
- unattended-updates:
+ unattended-upgrades:
version: purged
mcelog:
version: latest
diff --git a/nova/compute/cluster.yml b/nova/compute/cluster.yml
index 4d07a3e..5d0e6a1 100644
--- a/nova/compute/cluster.yml
+++ b/nova/compute/cluster.yml
@@ -93,3 +93,4 @@
user:
public_key: ${_param:nova_compute_ssh_public}
private_key: ${_param:nova_compute_ssh_private}
+ my_ip: ${_param:single_address}
diff --git a/nova/compute/single.yml b/nova/compute/single.yml
index f50b937..b915145 100644
--- a/nova/compute/single.yml
+++ b/nova/compute/single.yml
@@ -89,3 +89,4 @@
user:
public_key: ${_param:nova_compute_ssh_public}
private_key: ${_param:nova_compute_ssh_private}
+ my_ip: ${_param:single_address}
diff --git a/openssh/server/team/support.yml b/openssh/server/team/support.yml
index f78ceac..1b09ef0 100644
--- a/openssh/server/team/support.yml
+++ b/openssh/server/team/support.yml
@@ -86,8 +86,6 @@
- ${linux:system:user:nkabanova:name}
- ${linux:system:user:rsoto:name}
- ${linux:system:user:rsafonov:name}
- - ${linux:system:user:smachtmes:name}
- - ${linux:system:user:zkhurasani:name}
# L2OPS
- ${linux:system:user:aepifanov:name}
- ${linux:system:user:apetrenko:name}
@@ -104,12 +102,9 @@
- ${linux:system:user:oliemieshko:name}
- ${linux:system:user:sovsianikov:name}
- ${linux:system:user:pmichalec:name}
- - ${linux:system:user:pmathews:name}
- ${linux:system:user:pcizinsky:name}
- ${linux:system:user:osmola:name}
- - ${linux:system:user:cade:name}
- ${linux:system:user:jmosher:name}
- - ${linux:system:user:ecantwell:name}
- ${linux:system:user:lmercl:name}
sudo:
enabled: true
diff --git a/salt/control/cluster/stacklight_log_cluster.yml b/salt/control/cluster/stacklight_log_cluster.yml
index 330e301..e4c08b6 100644
--- a/salt/control/cluster/stacklight_log_cluster.yml
+++ b/salt/control/cluster/stacklight_log_cluster.yml
@@ -5,7 +5,7 @@
stacklight.log:
cpu: 32
ram: 65536
- disk_profile: small
+ disk_profile: xxxxlarge
net_profile: default
cluster:
internal:
diff --git a/salt/control/cluster/stacklight_server_cluster.yml b/salt/control/cluster/stacklight_server_cluster.yml
index 0055d20..6e7da61 100644
--- a/salt/control/cluster/stacklight_server_cluster.yml
+++ b/salt/control/cluster/stacklight_server_cluster.yml
@@ -5,7 +5,7 @@
stacklight.server:
cpu: 32
ram: 65536
- disk_profile: small
+ disk_profile: xxlarge
net_profile: default
cluster:
internal:
diff --git a/salt/control/cluster/stacklight_telemetry_cluster.yml b/salt/control/cluster/stacklight_telemetry_cluster.yml
index bfd14b0..1b39b61 100644
--- a/salt/control/cluster/stacklight_telemetry_cluster.yml
+++ b/salt/control/cluster/stacklight_telemetry_cluster.yml
@@ -5,7 +5,7 @@
stacklight.telemetry:
cpu: 32
ram: 65536
- disk_profile: small
+ disk_profile: xxxlarge
net_profile: default
cluster:
internal: