Unbind qcow2 images from mcp_version param
PROD-34364 PROD-34140
Change-Id: Idf4a36e05ab9a70daa90c79be421a58c6e95c551
diff --git a/defaults/linux_system_file.yml b/defaults/linux_system_file.yml
index de7b524..032be7e 100644
--- a/defaults/linux_system_file.yml
+++ b/defaults/linux_system_file.yml
@@ -6,26 +6,26 @@
default_local_mirrror_content:
linux_system_file:
ubuntu-16-04-x64.qcow2:
- name: /srv/http/images.mirantis.com/ubuntu-16-04-x64-mcp${_param:mcp_version}.qcow2
- source: ${_param:mcp_static_images_url}/ubuntu-16-04-x64-mcp${_param:mcp_version}.qcow2
- hash: ${_param:mcp_static_images_url}/ubuntu-16-04-x64-mcp${_param:mcp_version}.qcow2.md5
+ name: /srv/http/images.mirantis.com/ubuntu-16-04-x64-mcp2019.2.0.qcow2
+ source: ${_param:mcp_static_images_url}/ubuntu-16-04-x64-mcp2019.2.0.qcow2
+ hash: ${_param:mcp_static_images_url}/ubuntu-16-04-x64-mcp2019.2.0.qcow2.md5
ubuntu-16-04-x64.qcow2.md5:
- name: /srv/http/images.mirantis.com/ubuntu-16-04-x64-mcp${_param:mcp_version}.qcow2.md5
- source: ${_param:mcp_static_images_url}/ubuntu-16-04-x64-mcp${_param:mcp_version}.qcow2.md5
+ name: /srv/http/images.mirantis.com/ubuntu-16-04-x64-mcp2019.2.0.qcow2.md5
+ source: ${_param:mcp_static_images_url}/ubuntu-16-04-x64-mcp2019.2.0.qcow2.md5
amphora-x64-haproxy-pike.qcow2:
- source: ${_param:mcp_binary_registry}/mirantis/openstack/octavia/images/${_param:mcp_version}/pike/amphora-x64-haproxy.qcow2
- name: /srv/http/artifactory.mirantis.com/artifactory/binary-prod-local/mirantis/openstack/octavia/images/${_param:mcp_version}/pike/amphora-x64-haproxy.qcow2
- hash: ${_param:mcp_binary_registry}/mirantis/openstack/octavia/images/${_param:mcp_version}/pike/amphora-x64-haproxy.qcow2.md5
+ source: ${_param:mcp_binary_registry}/mirantis/openstack/octavia/images/2019.2.6/pike/amphora-x64-haproxy.qcow2
+ name: /srv/http/artifactory.mirantis.com/artifactory/binary-prod-local/mirantis/openstack/octavia/images/2019.2.6/pike/amphora-x64-haproxy.qcow2
+ hash: ${_param:mcp_binary_registry}/mirantis/openstack/octavia/images/2019.2.6/pike/amphora-x64-haproxy.qcow2.md5
amphora-x64-haproxy-pike.qcow2.md5:
- source: ${_param:mcp_binary_registry}/mirantis/openstack/octavia/images/${_param:mcp_version}/pike/amphora-x64-haproxy.qcow2.md5
- name: /srv/http/artifactory.mirantis.com/artifactory/binary-prod-local/mirantis/openstack/octavia/images/${_param:mcp_version}/pike/amphora-x64-haproxy.qcow2.md5
+ source: ${_param:mcp_binary_registry}/mirantis/openstack/octavia/images/2019.2.6/pike/amphora-x64-haproxy.qcow2.md5
+ name: /srv/http/artifactory.mirantis.com/artifactory/binary-prod-local/mirantis/openstack/octavia/images/2019.2.6/pike/amphora-x64-haproxy.qcow2.md5
amphora-x64-haproxy-queens.qcow2:
- source: ${_param:mcp_binary_registry}/mirantis/openstack/octavia/images/${_param:mcp_version}/queens/amphora-x64-haproxy.qcow2
- name: /srv/http/artifactory.mirantis.com/artifactory/binary-prod-local/mirantis/openstack/octavia/images/${_param:mcp_version}/queens/amphora-x64-haproxy.qcow2
- hash: ${_param:mcp_binary_registry}/mirantis/openstack/octavia/images/${_param:mcp_version}/queens/amphora-x64-haproxy.qcow2.md5
+ source: ${_param:mcp_binary_registry}/mirantis/openstack/octavia/images/2019.2.6/queens/amphora-x64-haproxy.qcow2
+ name: /srv/http/artifactory.mirantis.com/artifactory/binary-prod-local/mirantis/openstack/octavia/images/2019.2.6/queens/amphora-x64-haproxy.qcow2
+ hash: ${_param:mcp_binary_registry}/mirantis/openstack/octavia/images/2019.2.6/queens/amphora-x64-haproxy.qcow2.md5
amphora-x64-haproxy-queens.qcow2.md5:
- source: ${_param:mcp_binary_registry}/mirantis/openstack/octavia/images/${_param:mcp_version}/queens/amphora-x64-haproxy.qcow2.md5
- name: /srv/http/artifactory.mirantis.com/artifactory/binary-prod-local/mirantis/openstack/octavia/images/${_param:mcp_version}/queens/amphora-x64-haproxy.qcow2.md5
+ source: ${_param:mcp_binary_registry}/mirantis/openstack/octavia/images/2019.2.6/queens/amphora-x64-haproxy.qcow2.md5
+ name: /srv/http/artifactory.mirantis.com/artifactory/binary-prod-local/mirantis/openstack/octavia/images/2019.2.6/queens/amphora-x64-haproxy.qcow2.md5
cirros-0.4.0-x86_64-disk.img:
source: ${_param:mcp_binary_registry}/mirantis/external/images/cirros/0.4.0/cirros-0.4.0-x86_64-disk.img
name: /srv/http/artifactory.mirantis.com/artifactory/binary-prod-local/mirantis/external/images/cirros/0.4.0/cirros-0.4.0-x86_64-disk.img
diff --git a/defaults/openstack/init.yml b/defaults/openstack/init.yml
index c269b05..6049f84 100644
--- a/defaults/openstack/init.yml
+++ b/defaults/openstack/init.yml
@@ -239,7 +239,7 @@
octavia_health_manager_node03_address: 192.168.10.12
#
amphora_image_name: amphora-x64-haproxy
- amphora_image_url: "${_param:mcp_binary_registry}/mirantis/openstack/octavia/images/${_param:mcp_version}/${_param:openstack_version}/amphora-x64-haproxy.qcow2"
+ amphora_image_url: "${_param:mcp_binary_registry}/mirantis/openstack/octavia/images/2019.2.6/${_param:openstack_version}/amphora-x64-haproxy.qcow2"
glance_image_cirros_name: 'TestCirros-0.4.0'
glance_image_cirros_location: "${_param:mcp_binary_registry}/mirantis/external/images/cirros/0.4.0/cirros-0.4.0-x86_64-disk.img"