Change apt_mk_version => mcp_version
* Alligh all variables to one
* Due mcp_version: ${_param:apt_mk_version}
those change still bw compatible
Bug-relateted: PROD-24789 (PROD:24789)
Change-Id: I30b6fb0b1cb66c7d56dbb3a5e15c8bc9606405b5
diff --git a/aptly/server/mirror/ubuntu/trusty/ceph.yml b/aptly/server/mirror/ubuntu/trusty/ceph.yml
index 0c587d4..dd89229 100644
--- a/aptly/server/mirror/ubuntu/trusty/ceph.yml
+++ b/aptly/server/mirror/ubuntu/trusty/ceph.yml
@@ -18,4 +18,4 @@
publisher:
component: ceph
distributions:
- - ubuntu-trusty/${_param:apt_mk_version}
+ - ubuntu-trusty/${_param:mcp_version}
diff --git a/aptly/server/mirror/ubuntu/trusty/mcp/apt_mk/cassandra.yml b/aptly/server/mirror/ubuntu/trusty/mcp/apt_mk/cassandra.yml
index b2b7a42..dfe8992 100644
--- a/aptly/server/mirror/ubuntu/trusty/mcp/apt_mk/cassandra.yml
+++ b/aptly/server/mirror/ubuntu/trusty/mcp/apt_mk/cassandra.yml
@@ -1,6 +1,6 @@
parameters:
_param:
- mirror_mirantis_openstack_trusty_cassandra_source: http://mirror.mirantis.com/${_param:apt_mk_version}/cassandra/trusty/
+ mirror_mirantis_openstack_trusty_cassandra_source: http://mirror.mirantis.com/${_param:mcp_version}/cassandra/trusty/
mirror_mirantis_openstack_trusty_cassandra_distribution: 21x
mirror_mirantis_openstack_trusty_cassandra_components: main
mirror_mirantis_openstack_trusty_cassandra_gpgkeys:
@@ -20,4 +20,4 @@
publisher:
component: 21x
distributions:
- - ubuntu-trusty/cassandra/${_param:apt_mk_version}
\ No newline at end of file
+ - ubuntu-trusty/cassandra/${_param:mcp_version}
\ No newline at end of file
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 c4cbbe8..81b8dd5 100644
--- a/aptly/server/mirror/ubuntu/trusty/mcp/apt_mk/extra.yml
+++ b/aptly/server/mirror/ubuntu/trusty/mcp/apt_mk/extra.yml
@@ -1,7 +1,7 @@
parameters:
_param:
mirror_mirantis_openstack_trusty_extra_source: http://apt.mirantis.com/trusty/
- mirror_mirantis_openstack_trusty_extra_distribution: ${_param:apt_mk_version}
+ mirror_mirantis_openstack_trusty_extra_distribution: ${_param:mcp_version}
mirror_mirantis_openstack_trusty_extra_components: extra
mirror_mirantis_openstack_trusty_extra_key_url: "http://apt.mirantis.com/public.gpg"
mirror_mirantis_openstack_trusty_extra_gpgkeys:
@@ -19,4 +19,4 @@
publisher:
component: extra
distributions:
- - ubuntu-trusty/${_param:apt_mk_version}
\ No newline at end of file
+ - ubuntu-trusty/${_param:mcp_version}
\ No newline at end of file
diff --git a/aptly/server/mirror/ubuntu/trusty/mcp/apt_mk/fluentd.yml b/aptly/server/mirror/ubuntu/trusty/mcp/apt_mk/fluentd.yml
index c396402..efe0032 100644
--- a/aptly/server/mirror/ubuntu/trusty/mcp/apt_mk/fluentd.yml
+++ b/aptly/server/mirror/ubuntu/trusty/mcp/apt_mk/fluentd.yml
@@ -1,6 +1,6 @@
parameters:
_param:
- mirror_mirantis_openstack_trusty_fluentd_source: http://mirror.mirantis.com/${_param:apt_mk_version}/td-agent/trusty
+ mirror_mirantis_openstack_trusty_fluentd_source: http://mirror.mirantis.com/${_param:mcp_version}/td-agent/trusty
mirror_mirantis_openstack_trusty_fluentd_distribution: trusty
mirror_mirantis_openstack_trusty_fluentd_components: contrib
mirror_mirantis_openstack_trusty_fluentd_gpgkeys:
@@ -17,4 +17,4 @@
publisher:
component: contrib
distributions:
- - ubuntu-trusty/fluentd/${_param:apt_mk_version}
+ - ubuntu-trusty/fluentd/${_param:mcp_version}
diff --git a/aptly/server/mirror/ubuntu/trusty/mcp/apt_mk/grafana.yml b/aptly/server/mirror/ubuntu/trusty/mcp/apt_mk/grafana.yml
index a9821cc..f830912 100644
--- a/aptly/server/mirror/ubuntu/trusty/mcp/apt_mk/grafana.yml
+++ b/aptly/server/mirror/ubuntu/trusty/mcp/apt_mk/grafana.yml
@@ -1,6 +1,6 @@
parameters:
_param:
- mirror_mirantis_openstack_trusty_grafana_source: http://mirror.mirantis.com/${_param:apt_mk_version}/grafana/trusty/
+ mirror_mirantis_openstack_trusty_grafana_source: http://mirror.mirantis.com/${_param:mcp_version}/grafana/trusty/
mirror_mirantis_openstack_trusty_grafana_distribution: jessie
mirror_mirantis_openstack_trusty_grafana_components: main
mirror_mirantis_openstack_trusty_grafana_gpgkeys:
@@ -17,4 +17,4 @@
publisher:
component: main
distributions:
- - ubuntu-trusty/grafana/${_param:apt_mk_version}
\ No newline at end of file
+ - ubuntu-trusty/grafana/${_param:mcp_version}
\ No newline at end of file
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 49adf59..66ee76c 100644
--- a/aptly/server/mirror/ubuntu/trusty/mcp/apt_mk/mitaka.yml
+++ b/aptly/server/mirror/ubuntu/trusty/mcp/apt_mk/mitaka.yml
@@ -1,7 +1,7 @@
parameters:
_param:
mirror_mk_openstack_xenial_mitaka_source: http://apt.mirantis.com/trusty/
- mirror_mk_openstack_xenial_mitaka_distribution: ${_param:apt_mk_version}
+ mirror_mk_openstack_xenial_mitaka_distribution: ${_param:mcp_version}
mirror_mk_openstack_xenial_mitaka_components: mitaka
mirror_mk_openstack_xenial_mitaka_key_url: "http://apt.mirantis.com/public.gpg"
mirror_mk_openstack_xenial_mitaka_gpgkeys:
@@ -19,4 +19,4 @@
publisher:
component: mitaka
distributions:
- - ubuntu-trusty/${_param:apt_mk_version}
\ No newline at end of file
+ - ubuntu-trusty/${_param:mcp_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 44c9f8d..a0c9709 100644
--- a/aptly/server/mirror/ubuntu/trusty/mcp/apt_mk/oc31.yml
+++ b/aptly/server/mirror/ubuntu/trusty/mcp/apt_mk/oc31.yml
@@ -1,7 +1,7 @@
parameters:
_param:
mirror_mcp_opencontrail_trusty_oc31_source: http://apt.mirantis.com/trusty/
- mirror_mcp_opencontrail_trusty_oc31_distribution: ${_param:apt_mk_version}
+ mirror_mcp_opencontrail_trusty_oc31_distribution: ${_param:mcp_version}
mirror_mcp_opencontrail_trusty_oc31_components: oc31
mirror_mcp_opencontrail_trusty_oc31_key_url: "http://apt.mirantis.com/public.gpg"
mirror_mcp_opencontrail_trusty_oc31_gpgkeys:
@@ -19,4 +19,4 @@
publisher:
component: oc31
distributions:
- - ubuntu-trusty/${_param:apt_mk_version}
\ No newline at end of file
+ - ubuntu-trusty/${_param:mcp_version}
\ No newline at end of file
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 08f8e48..fde8fba 100644
--- a/aptly/server/mirror/ubuntu/trusty/mcp/apt_mk/oc311.yml
+++ b/aptly/server/mirror/ubuntu/trusty/mcp/apt_mk/oc311.yml
@@ -1,7 +1,7 @@
parameters:
_param:
mirror_mcp_opencontrail_trusty_oc311_source: http://apt.mirantis.com/trusty/
- mirror_mcp_opencontrail_trusty_oc311_distribution: ${_param:apt_mk_version}
+ mirror_mcp_opencontrail_trusty_oc311_distribution: ${_param:mcp_version}
mirror_mcp_opencontrail_trusty_oc311_components: oc311
mirror_mcp_opencontrail_trusty_oc311_key_url: "http://apt.mirantis.com/public.gpg"
mirror_mcp_opencontrail_trusty_oc311_gpgkeys:
@@ -19,4 +19,4 @@
publisher:
component: oc311
distributions:
- - ubuntu-trusty/${_param:apt_mk_version}
\ No newline at end of file
+ - ubuntu-trusty/${_param:mcp_version}
\ No newline at end of file
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 44051ce..4e98fdd 100644
--- a/aptly/server/mirror/ubuntu/trusty/mcp/apt_mk/oc32.yml
+++ b/aptly/server/mirror/ubuntu/trusty/mcp/apt_mk/oc32.yml
@@ -1,7 +1,7 @@
parameters:
_param:
mirror_mcp_opencontrail_trusty_oc32_source: http://apt.mirantis.com/trusty/
- mirror_mcp_opencontrail_trusty_oc32_distribution: ${_param:apt_mk_version}
+ mirror_mcp_opencontrail_trusty_oc32_distribution: ${_param:mcp_version}
mirror_mcp_opencontrail_trusty_oc32_components: oc32
mirror_mcp_opencontrail_trusty_oc32_key_url: "http://apt.mirantis.com/public.gpg"
mirror_mcp_opencontrail_trusty_oc32_gpgkeys:
@@ -19,4 +19,4 @@
publisher:
component: oc32
distributions:
- - ubuntu-trusty/${_param:apt_mk_version}
\ No newline at end of file
+ - ubuntu-trusty/${_param:mcp_version}
\ No newline at end of file
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 8b55076..499fa53 100644
--- a/aptly/server/mirror/ubuntu/trusty/mcp/apt_mk/oc323.yml
+++ b/aptly/server/mirror/ubuntu/trusty/mcp/apt_mk/oc323.yml
@@ -1,7 +1,7 @@
parameters:
_param:
mirror_mcp_opencontrail_trusty_oc323_source: http://apt.mirantis.com/trusty/
- mirror_mcp_opencontrail_trusty_oc323_distribution: ${_param:apt_mk_version}
+ mirror_mcp_opencontrail_trusty_oc323_distribution: ${_param:mcp_version}
mirror_mcp_opencontrail_trusty_oc323_components: oc323
mirror_mcp_opencontrail_trusty_oc323_key_url: "http://apt.mirantis.com/public.gpg"
mirror_mcp_opencontrail_trusty_oc323_gpgkeys:
@@ -19,4 +19,4 @@
publisher:
component: oc323
distributions:
- - ubuntu-trusty/${_param:apt_mk_version}
\ No newline at end of file
+ - ubuntu-trusty/${_param:mcp_version}
\ No newline at end of file
diff --git a/aptly/server/mirror/ubuntu/trusty/mcp/apt_mk/openstack/mitaka.yml b/aptly/server/mirror/ubuntu/trusty/mcp/apt_mk/openstack/mitaka.yml
index ab1a7c6..da2b94c 100644
--- a/aptly/server/mirror/ubuntu/trusty/mcp/apt_mk/openstack/mitaka.yml
+++ b/aptly/server/mirror/ubuntu/trusty/mcp/apt_mk/openstack/mitaka.yml
@@ -2,35 +2,35 @@
_param:
mirror_mirantis_openstack_mitaka_trusty_source: http://apt.mirantis.com/trusty/openstack/mitaka/
- mirror_mirantis_openstack_mitaka_trusty_distribution: ${_param:apt_mk_version}
+ mirror_mirantis_openstack_mitaka_trusty_distribution: ${_param:mcp_version}
mirror_mirantis_openstack_mitaka_trusty_components: main restricted
mirror_mirantis_openstack_mitaka_trusty_key_url: "http://apt.mirantis.com/public.gpg"
mirror_mirantis_openstack_mitaka_trusty_gpgkeys:
- A76882D3
mirror_mirantis_openstack_mitaka_hotfix_trusty_source: http://apt.mirantis.com/trusty/openstack/mitaka/hotfix/
- mirror_mirantis_openstack_mitaka_hotfix_trusty_distribution: ${_param:apt_mk_version}
+ mirror_mirantis_openstack_mitaka_hotfix_trusty_distribution: ${_param:mcp_version}
mirror_mirantis_openstack_mitaka_hotfix_trusty_components: main restricted
mirror_mirantis_openstack_mitaka_hotfix_trusty_key_url: "http://apt.mirantis.com/public.gpg"
mirror_mirantis_openstack_mitaka_hotfix_trusty_gpgkeys:
- A76882D3
mirror_mirantis_openstack_mitaka_security_trusty_source: http://apt.mirantis.com/trusty/openstack/mitaka/security/
- mirror_mirantis_openstack_mitaka_security_trusty_distribution: ${_param:apt_mk_version}
+ mirror_mirantis_openstack_mitaka_security_trusty_distribution: ${_param:mcp_version}
mirror_mirantis_openstack_mitaka_security_trusty_components: main restricted
mirror_mirantis_openstack_mitaka_security_trusty_key_url: "http://apt.mirantis.com/public.gpg"
mirror_mirantis_openstack_mitaka_security_trusty_gpgkeys:
- A76882D3
mirror_mirantis_openstack_mitaka_updates_trusty_source: http://apt.mirantis.com/trusty/openstack/mitaka/updates/
- mirror_mirantis_openstack_mitaka_updates_trusty_distribution: ${_param:apt_mk_version}
+ mirror_mirantis_openstack_mitaka_updates_trusty_distribution: ${_param:mcp_version}
mirror_mirantis_openstack_mitaka_updates_trusty_components: main restricted
mirror_mirantis_openstack_mitaka_updates_trusty_key_url: "http://apt.mirantis.com/public.gpg"
mirror_mirantis_openstack_mitaka_updates_trusty_gpgkeys:
- A76882D3
mirror_mirantis_openstack_mitaka_holdback_trusty_source: http://apt.mirantis.com/trusty/openstack/mitaka/holdback/
- mirror_mirantis_openstack_mitaka_holdback_trusty_distribution: ${_param:apt_mk_version}
+ mirror_mirantis_openstack_mitaka_holdback_trusty_distribution: ${_param:mcp_version}
mirror_mirantis_openstack_mitaka_holdback_trusty_components: main restricted
mirror_mirantis_openstack_mitaka_holdback_trusty_key_url: "http://apt.mirantis.com/public.gpg"
mirror_mirantis_openstack_mitaka_holdback_trusty_gpgkeys:
@@ -48,7 +48,7 @@
publisher:
component: main
distributions:
- - ubuntu-trusty/openstack/mitaka/${_param:apt_mk_version}
+ - ubuntu-trusty/openstack/mitaka/${_param:mcp_version}
mirantis_openstack_mitaka_hotfix_trusty:
source: ${_param:mirror_mirantis_openstack_mitaka_hotfix_trusty_source}
@@ -60,7 +60,7 @@
publisher:
component: main
distributions:
- - ubuntu-trusty/openstack/mitaka/hotfix/${_param:apt_mk_version}
+ - ubuntu-trusty/openstack/mitaka/hotfix/${_param:mcp_version}
mirantis_openstack_mitaka_security_trusty:
source: ${_param:mirror_mirantis_openstack_mitaka_security_trusty_source}
@@ -72,7 +72,7 @@
publisher:
component: main
distributions:
- - ubuntu-trusty/openstack/mitaka/security/${_param:apt_mk_version}
+ - ubuntu-trusty/openstack/mitaka/security/${_param:mcp_version}
# required for alternative horizon plugins/etc..
mirantis_openstack_mitaka_updates_trusty:
@@ -85,7 +85,7 @@
publisher:
component: main
distributions:
- - ubuntu-trusty/openstack/mitaka/updates/${_param:apt_mk_version}
+ - ubuntu-trusty/openstack/mitaka/updates/${_param:mcp_version}
# required for salt formulas
mirantis_openstack_mitaka_holdback_trusty:
@@ -98,5 +98,5 @@
publisher:
component: main
distributions:
- - ubuntu-trusty/openstack/mitaka/holdback/${_param:apt_mk_version}
+ - ubuntu-trusty/openstack/mitaka/holdback/${_param:mcp_version}
diff --git a/aptly/server/mirror/ubuntu/trusty/mcp/apt_mk/openstack/newton.yml b/aptly/server/mirror/ubuntu/trusty/mcp/apt_mk/openstack/newton.yml
index 619fa3a..f4b7edb 100644
--- a/aptly/server/mirror/ubuntu/trusty/mcp/apt_mk/openstack/newton.yml
+++ b/aptly/server/mirror/ubuntu/trusty/mcp/apt_mk/openstack/newton.yml
@@ -2,35 +2,35 @@
_param:
mirror_mirantis_openstack_newton_trusty_source: http://apt.mirantis.com/trusty/openstack/newton/
- mirror_mirantis_openstack_newton_trusty_distribution: ${_param:apt_mk_version}
+ mirror_mirantis_openstack_newton_trusty_distribution: ${_param:mcp_version}
mirror_mirantis_openstack_newton_trusty_components: main restricted
mirror_mirantis_openstack_newton_trusty_key_url: "http://apt.mirantis.com/public.gpg"
mirror_mirantis_openstack_newton_trusty_gpgkeys:
- A76882D3
mirror_mirantis_openstack_newton_hotfix_trusty_source: http://apt.mirantis.com/trusty/openstack/newton/hotfix/
- mirror_mirantis_openstack_newton_hotfix_trusty_distribution: ${_param:apt_mk_version}
+ mirror_mirantis_openstack_newton_hotfix_trusty_distribution: ${_param:mcp_version}
mirror_mirantis_openstack_newton_hotfix_trusty_components: main restricted
mirror_mirantis_openstack_newton_hotfix_trusty_key_url: "http://apt.mirantis.com/public.gpg"
mirror_mirantis_openstack_newton_hotfix_trusty_gpgkeys:
- A76882D3
mirror_mirantis_openstack_newton_security_trusty_source: http://apt.mirantis.com/trusty/openstack/newton/security/
- mirror_mirantis_openstack_newton_security_trusty_distribution: ${_param:apt_mk_version}
+ mirror_mirantis_openstack_newton_security_trusty_distribution: ${_param:mcp_version}
mirror_mirantis_openstack_newton_security_trusty_components: main restricted
mirror_mirantis_openstack_newton_security_trusty_key_url: "http://apt.mirantis.com/public.gpg"
mirror_mirantis_openstack_newton_security_trusty_gpgkeys:
- A76882D3
mirror_mirantis_openstack_newton_updates_trusty_source: http://apt.mirantis.com/trusty/openstack/newton/updates/
- mirror_mirantis_openstack_newton_updates_trusty_distribution: ${_param:apt_mk_version}
+ mirror_mirantis_openstack_newton_updates_trusty_distribution: ${_param:mcp_version}
mirror_mirantis_openstack_newton_updates_trusty_components: main restricted
mirror_mirantis_openstack_newton_updates_trusty_key_url: "http://apt.mirantis.com/public.gpg"
mirror_mirantis_openstack_newton_updates_trusty_gpgkeys:
- A76882D3
mirror_mirantis_openstack_newton_holdback_trusty_source: http://apt.mirantis.com/trusty/openstack/newton/holdback/
- mirror_mirantis_openstack_newton_holdback_trusty_distribution: ${_param:apt_mk_version}
+ mirror_mirantis_openstack_newton_holdback_trusty_distribution: ${_param:mcp_version}
mirror_mirantis_openstack_newton_holdback_trusty_components: main restricted
mirror_mirantis_openstack_newton_holdback_trusty_key_url: "http://apt.mirantis.com/public.gpg"
mirror_mirantis_openstack_newton_holdback_trusty_gpgkeys:
@@ -48,7 +48,7 @@
publisher:
component: main
distributions:
- - ubuntu-trusty/openstack/newton/${_param:apt_mk_version}
+ - ubuntu-trusty/openstack/newton/${_param:mcp_version}
mirantis_openstack_newton_hotfix_trusty:
source: ${_param:mirror_mirantis_openstack_newton_hotfix_trusty_source}
@@ -60,7 +60,7 @@
publisher:
component: main
distributions:
- - ubuntu-trusty/openstack/newton/hotfix/${_param:apt_mk_version}
+ - ubuntu-trusty/openstack/newton/hotfix/${_param:mcp_version}
mirantis_openstack_newton_security_trusty:
source: ${_param:mirror_mirantis_openstack_newton_security_trusty_source}
@@ -72,7 +72,7 @@
publisher:
component: main
distributions:
- - ubuntu-trusty/openstack/newton/security/${_param:apt_mk_version}
+ - ubuntu-trusty/openstack/newton/security/${_param:mcp_version}
# required for alternative horizon plugins/etc..
mirantis_openstack_newton_updates_trusty:
@@ -85,7 +85,7 @@
publisher:
component: main
distributions:
- - ubuntu-trusty/openstack/newton/updates/${_param:apt_mk_version}
+ - ubuntu-trusty/openstack/newton/updates/${_param:mcp_version}
# required for salt formulas
mirantis_openstack_newton_holdback_trusty:
@@ -98,5 +98,5 @@
publisher:
component: main
distributions:
- - ubuntu-trusty/openstack/newton/holdback/${_param:apt_mk_version}
+ - ubuntu-trusty/openstack/newton/holdback/${_param:mcp_version}
diff --git a/aptly/server/mirror/ubuntu/trusty/mcp/apt_mk/openstack/ocata.yml b/aptly/server/mirror/ubuntu/trusty/mcp/apt_mk/openstack/ocata.yml
index 11c287f..c4a97dc 100644
--- a/aptly/server/mirror/ubuntu/trusty/mcp/apt_mk/openstack/ocata.yml
+++ b/aptly/server/mirror/ubuntu/trusty/mcp/apt_mk/openstack/ocata.yml
@@ -2,35 +2,35 @@
_param:
mirror_mirantis_openstack_ocata_trusty_source: http://apt.mirantis.com/trusty/openstack/ocata/
- mirror_mirantis_openstack_ocata_trusty_distribution: ${_param:apt_mk_version}
+ mirror_mirantis_openstack_ocata_trusty_distribution: ${_param:mcp_version}
mirror_mirantis_openstack_ocata_trusty_components: main restricted
mirror_mirantis_openstack_ocata_trusty_key_url: "http://apt.mirantis.com/public.gpg"
mirror_mirantis_openstack_ocata_trusty_gpgkeys:
- A76882D3
mirror_mirantis_openstack_ocata_hotfix_trusty_source: http://apt.mirantis.com/trusty/openstack/ocata/hotfix/
- mirror_mirantis_openstack_ocata_hotfix_trusty_distribution: ${_param:apt_mk_version}
+ mirror_mirantis_openstack_ocata_hotfix_trusty_distribution: ${_param:mcp_version}
mirror_mirantis_openstack_ocata_hotfix_trusty_components: main restricted
mirror_mirantis_openstack_ocata_hotfix_trusty_key_url: "http://apt.mirantis.com/public.gpg"
mirror_mirantis_openstack_ocata_hotfix_trusty_gpgkeys:
- A76882D3
mirror_mirantis_openstack_ocata_security_trusty_source: http://apt.mirantis.com/trusty/openstack/ocata/security/
- mirror_mirantis_openstack_ocata_security_trusty_distribution: ${_param:apt_mk_version}
+ mirror_mirantis_openstack_ocata_security_trusty_distribution: ${_param:mcp_version}
mirror_mirantis_openstack_ocata_security_trusty_components: main restricted
mirror_mirantis_openstack_ocata_security_trusty_key_url: "http://apt.mirantis.com/public.gpg"
mirror_mirantis_openstack_ocata_security_trusty_gpgkeys:
- A76882D3
mirror_mirantis_openstack_ocata_updates_trusty_source: http://apt.mirantis.com/trusty/openstack/ocata/updates/
- mirror_mirantis_openstack_ocata_updates_trusty_distribution: ${_param:apt_mk_version}
+ mirror_mirantis_openstack_ocata_updates_trusty_distribution: ${_param:mcp_version}
mirror_mirantis_openstack_ocata_updates_trusty_components: main restricted
mirror_mirantis_openstack_ocata_updates_trusty_key_url: "http://apt.mirantis.com/public.gpg"
mirror_mirantis_openstack_ocata_updates_trusty_gpgkeys:
- A76882D3
mirror_mirantis_openstack_ocata_holdback_trusty_source: http://apt.mirantis.com/trusty/openstack/ocata/holdback/
- mirror_mirantis_openstack_ocata_holdback_trusty_distribution: ${_param:apt_mk_version}
+ mirror_mirantis_openstack_ocata_holdback_trusty_distribution: ${_param:mcp_version}
mirror_mirantis_openstack_ocata_holdback_trusty_components: main restricted
mirror_mirantis_openstack_ocata_holdback_trusty_key_url: "http://apt.mirantis.com/public.gpg"
mirror_mirantis_openstack_ocata_holdback_trusty_gpgkeys:
@@ -48,7 +48,7 @@
publisher:
component: main
distributions:
- - ubuntu-trusty/openstack/ocata/${_param:apt_mk_version}
+ - ubuntu-trusty/openstack/ocata/${_param:mcp_version}
mirantis_openstack_ocata_hotfix_trusty:
source: ${_param:mirror_mirantis_openstack_ocata_hotfix_trusty_source}
@@ -60,7 +60,7 @@
publisher:
component: main
distributions:
- - ubuntu-trusty/openstack/ocata/hotfix/${_param:apt_mk_version}
+ - ubuntu-trusty/openstack/ocata/hotfix/${_param:mcp_version}
mirantis_openstack_ocata_security_trusty:
source: ${_param:mirror_mirantis_openstack_ocata_security_trusty_source}
@@ -72,7 +72,7 @@
publisher:
component: main
distributions:
- - ubuntu-trusty/openstack/ocata/security/${_param:apt_mk_version}
+ - ubuntu-trusty/openstack/ocata/security/${_param:mcp_version}
# required for alternative horizon plugins/etc..
mirantis_openstack_ocata_updates_trusty:
@@ -85,7 +85,7 @@
publisher:
component: main
distributions:
- - ubuntu-trusty/openstack/ocata/updates/${_param:apt_mk_version}
+ - ubuntu-trusty/openstack/ocata/updates/${_param:mcp_version}
# required for salt formulas
mirantis_openstack_ocata_holdback_trusty:
@@ -98,5 +98,5 @@
publisher:
component: main
distributions:
- - ubuntu-trusty/openstack/ocata/holdback/${_param:apt_mk_version}
+ - ubuntu-trusty/openstack/ocata/holdback/${_param:mcp_version}
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 0a93978..9e66619 100644
--- a/aptly/server/mirror/ubuntu/trusty/mcp/apt_mk/salt.yml
+++ b/aptly/server/mirror/ubuntu/trusty/mcp/apt_mk/salt.yml
@@ -1,7 +1,7 @@
parameters:
_param:
mirror_mirantis_openstack_trusty_salt_source: http://apt.mirantis.com/trusty/
- mirror_mirantis_openstack_trusty_salt_distribution: ${_param:apt_mk_version}
+ mirror_mirantis_openstack_trusty_salt_distribution: ${_param:mcp_version}
mirror_mirantis_openstack_trusty_salt_components: salt
mirror_mirantis_openstack_trusty_salt_key_url: "http://apt.mirantis.com/public.gpg"
mirror_mirantis_openstack_trusty_salt_gpgkeys:
@@ -19,4 +19,4 @@
publisher:
component: salt
distributions:
- - ubuntu-trusty/${_param:apt_mk_version}
\ No newline at end of file
+ - ubuntu-trusty/${_param:mcp_version}
\ No newline at end of file
diff --git a/aptly/server/mirror/ubuntu/trusty/mcp/apt_mk/saltstack/salt-2016-3.yml b/aptly/server/mirror/ubuntu/trusty/mcp/apt_mk/saltstack/salt-2016-3.yml
index 2506306..b01df60 100644
--- a/aptly/server/mirror/ubuntu/trusty/mcp/apt_mk/saltstack/salt-2016-3.yml
+++ b/aptly/server/mirror/ubuntu/trusty/mcp/apt_mk/saltstack/salt-2016-3.yml
@@ -1,6 +1,6 @@
parameters:
_param:
- mirror_mirantis_openstack_trusty_saltstack_2016_3_source: http://mirror.mirantis.com/${_param:apt_mk_version}/saltstack-2016.3/trusty/
+ mirror_mirantis_openstack_trusty_saltstack_2016_3_source: http://mirror.mirantis.com/${_param:mcp_version}/saltstack-2016.3/trusty/
mirror_mirantis_openstack_trusty_saltstack_2016_3_distribution: trusty
mirror_mirantis_openstack_trusty_saltstack_2016_3_components: main
mirror_mirantis_openstack_trusty_saltstack_2016_3_gpgkeys:
@@ -17,4 +17,4 @@
publisher:
component: main
distributions:
- - ubuntu-trusty/salt/2016.3/${_param:apt_mk_version}
\ No newline at end of file
+ - ubuntu-trusty/salt/2016.3/${_param:mcp_version}
\ No newline at end of file
diff --git a/aptly/server/mirror/ubuntu/trusty/mcp/apt_mk/saltstack/salt-2017-7.yml b/aptly/server/mirror/ubuntu/trusty/mcp/apt_mk/saltstack/salt-2017-7.yml
index bcea186..6234182 100644
--- a/aptly/server/mirror/ubuntu/trusty/mcp/apt_mk/saltstack/salt-2017-7.yml
+++ b/aptly/server/mirror/ubuntu/trusty/mcp/apt_mk/saltstack/salt-2017-7.yml
@@ -1,6 +1,6 @@
parameters:
_param:
- mirror_mirantis_openstack_trusty_saltstack_2017_7_source: http://mirror.mirantis.com/${_param:apt_mk_version}/saltstack-2017.7/trusty/
+ mirror_mirantis_openstack_trusty_saltstack_2017_7_source: http://mirror.mirantis.com/${_param:mcp_version}/saltstack-2017.7/trusty/
mirror_mirantis_openstack_trusty_saltstack_2017_7_distribution: trusty
mirror_mirantis_openstack_trusty_saltstack_2017_7_components: main
mirror_mirantis_openstack_trusty_saltstack_2017_7_gpgkeys:
@@ -17,4 +17,4 @@
publisher:
component: main
distributions:
- - ubuntu-trusty/salt/2017.7/${_param:apt_mk_version}
+ - ubuntu-trusty/salt/2017.7/${_param:mcp_version}
diff --git a/aptly/server/mirror/ubuntu/trusty/salt.yml b/aptly/server/mirror/ubuntu/trusty/salt.yml
index 6f88820..9adb3ae 100644
--- a/aptly/server/mirror/ubuntu/trusty/salt.yml
+++ b/aptly/server/mirror/ubuntu/trusty/salt.yml
@@ -17,5 +17,5 @@
publisher:
component: salt
distributions:
- - ubuntu-trusty/${_param:apt_mk_version}
+ - ubuntu-trusty/${_param:mcp_version}