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/defaults/debmirror.yml b/defaults/debmirror.yml
index 4376529..3995118 100644
--- a/defaults/debmirror.yml
+++ b/defaults/debmirror.yml
@@ -1,7 +1,7 @@
parameters:
_param:
# Global
- debmirror_mirrors_base_target_dir: "/srv/volumes/aptly/public/${_param:apt_mk_version}/"
+ debmirror_mirrors_base_target_dir: "/srv/volumes/aptly/public/${_param:mcp_version}/"
# Per repo modificators
mirror_mirantis_com_cassandra_xenial_force: False
mirror_mirantis_com_ceph_luminous_xenial_force: False
diff --git a/defaults/docker_images.yml b/defaults/docker_images.yml
index a7b4c19..05a0b98 100644
--- a/defaults/docker_images.yml
+++ b/defaults/docker_images.yml
@@ -1,20 +1,20 @@
parameters:
_param:
# CI\CD
- docker_image_compose: "${_param:mcp_docker_registry}/mirantis/external/compose:${_param:apt_mk_version}"
- docker_image_registry: "${_param:mcp_docker_registry}/mirantis/external/registry:${_param:apt_mk_version}"
- docker_image_visualizer: "${_param:mcp_docker_registry}/mirantis/external/visualizer:${_param:apt_mk_version}"
+ docker_image_compose: "${_param:mcp_docker_registry}/mirantis/external/compose:${_param:mcp_version}"
+ docker_image_registry: "${_param:mcp_docker_registry}/mirantis/external/registry:${_param:mcp_version}"
+ docker_image_visualizer: "${_param:mcp_docker_registry}/mirantis/external/visualizer:${_param:mcp_version}"
# openldap:1.1.8
- docker_image_openldap: "${_param:mcp_docker_registry}/mirantis/external/openldap:${_param:apt_mk_version}"
+ docker_image_openldap: "${_param:mcp_docker_registry}/mirantis/external/openldap:${_param:mcp_version}"
# library/postgres:9.6 #G
- docker_image_postgresql: "${_param:mcp_docker_registry}/mirantis/external/library/postgres:${_param:apt_mk_version}"
+ docker_image_postgresql: "${_param:mcp_docker_registry}/mirantis/external/library/postgres:${_param:mcp_version}"
# library/mongo:3.4 #G
- docker_image_mongodb: "${_param:mcp_docker_registry}/mirantis/external/library/mongo:${_param:apt_mk_version}"
+ docker_image_mongodb: "${_param:mcp_docker_registry}/mirantis/external/library/mongo:${_param:mcp_version}"
###
# phpldapadmin:0.6.12
- docker_image_phpldapadmin: "${_param:mcp_docker_registry}/mirantis/cicd/phpldapadmin:${_param:apt_mk_version}"
+ docker_image_phpldapadmin: "${_param:mcp_docker_registry}/mirantis/cicd/phpldapadmin:${_param:mcp_version}"
# gerrit:2.13.6
- docker_image_gerrit: "${_param:mcp_docker_registry}/mirantis/cicd/gerrit:${_param:apt_mk_version}"
+ docker_image_gerrit: "${_param:mcp_docker_registry}/mirantis/cicd/gerrit:${_param:mcp_version}"
# mysql:5.6
- docker_image_mysql: "${_param:mcp_docker_registry}/mirantis/cicd/mysql:${_param:apt_mk_version}"
- docker_image_jenkins_slave: ${_param:mcp_docker_registry}/mirantis/cicd/jnlp-slave:${_param:apt_mk_version}
+ docker_image_mysql: "${_param:mcp_docker_registry}/mirantis/cicd/mysql:${_param:mcp_version}"
+ docker_image_jenkins_slave: ${_param:mcp_docker_registry}/mirantis/cicd/jnlp-slave:${_param:mcp_version}
diff --git a/defaults/init.yml b/defaults/init.yml
index 803df1f..b19f2c8 100644
--- a/defaults/init.yml
+++ b/defaults/init.yml
@@ -15,9 +15,12 @@
- system.defaults.gerrit
parameters:
_param:
- apt_mk_version: stable
+ mcp_version: stable
+ # Temporary link to mcp_version.
+ # 'apt_mk_version' will be removed in q4
+ apt_mk_version: ${_param:mcp_version}
linux_system_architecture: amd64
- linux_system_repo_url: "http://mirror.mirantis.com/${_param:apt_mk_version}/"
+ linux_system_repo_url: "http://mirror.mirantis.com/${_param:mcp_version}/"
# linux globals
banner_company_name: COMPANY_NAME
motd_company_name: "${_param:banner_company_name}"
diff --git a/defaults/linux_system_repo.yml b/defaults/linux_system_repo.yml
index 1194dce..b889b0f 100644
--- a/defaults/linux_system_repo.yml
+++ b/defaults/linux_system_repo.yml
@@ -2,11 +2,11 @@
_param:
# Global
linux_repo_refresh_db: true
- linux_system_repo_url: http://mirror.mirantis.com/${_param:apt_mk_version}/
+ linux_system_repo_url: http://mirror.mirantis.com/${_param:mcp_version}/
# Global-updates
- linux_system_repo_update_url: http://mirror.mirantis.com/update/${_param:apt_mk_version}/
+ linux_system_repo_update_url: http://mirror.mirantis.com/update/${_param:mcp_version}/
# Global-hotfix
- linux_system_repo_hotfix_url: http://mirror.mirantis.com/hotfix/${_param:apt_mk_version}/
+ linux_system_repo_hotfix_url: http://mirror.mirantis.com/hotfix/${_param:mcp_version}/
# Per repos
linux_system_repo_mcp_aptly_url: ${_param:linux_system_repo_url}/aptly/
linux_system_repo_mcp_cassandra_url: ${_param:linux_system_repo_url}/cassandra/