Offline conent update
* Fix amphora path
* add SL images
gainsight_elasticsearch
sf_notifier
* fix version control variable
Change-Id: Ic9e9fa02084cb2305fffd117c6f0de1c18fe6cef
Prod-related: PROD-26922 (PROD:26922)
(cherry picked from commit 4fa7b1b9fe65461ddfe311993cb61901caef3835)
diff --git a/defaults/docker_images.yml b/defaults/docker_images.yml
index 18a6c14..6dba818 100644
--- a/defaults/docker_images.yml
+++ b/defaults/docker_images.yml
@@ -56,10 +56,10 @@
# CI/CD
- registry: ${_param:mcp_docker_registry}/mirantis/external
target_registry: ${_param:default_local_mirrror_content:docker_client_registry_target_registry}/mirantis/external
- name: registry:${_param:apt_mk_version}
+ name: registry:${_param:mcp_version}
- registry: ${_param:mcp_docker_registry}/mirantis/external
target_registry: ${_param:default_local_mirrror_content:docker_client_registry_target_registry}/mirantis/external
- name: visualizer:${_param:apt_mk_version}
+ name: visualizer:${_param:mcp_version}
- registry: ${_param:mcp_docker_registry}/mirantis/external/docker
target_registry: ${_param:default_local_mirrror_content:docker_client_registry_target_registry}/mirantis/external/docker
name: compose:1.17.1
@@ -71,75 +71,81 @@
name: postgres:9.6.10
- registry: ${_param:mcp_docker_registry}/mirantis/cicd
target_registry: ${_param:default_local_mirrror_content:docker_client_registry_target_registry}/mirantis/cicd
- name: phpldapadmin:${_param:apt_mk_version}
+ name: phpldapadmin:${_param:mcp_version}
- registry: ${_param:mcp_docker_registry}/mirantis/cicd
target_registry: ${_param:default_local_mirrror_content:docker_client_registry_target_registry}/mirantis/cicd
- name: aptly:${_param:apt_mk_version}
+ name: aptly:${_param:mcp_version}
- registry: ${_param:mcp_docker_registry}/mirantis/cicd
target_registry: ${_param:default_local_mirrror_content:docker_client_registry_target_registry}/mirantis/cicd
- name: aptly-public:${_param:apt_mk_version}
+ name: aptly-public:${_param:mcp_version}
- registry: ${_param:mcp_docker_registry}/mirantis/cicd
target_registry: ${_param:default_local_mirrror_content:docker_client_registry_target_registry}/mirantis/cicd
- name: aptly-publisher:${_param:apt_mk_version}
+ name: aptly-publisher:${_param:mcp_version}
- registry: ${_param:mcp_docker_registry}/mirantis/cicd
target_registry: ${_param:default_local_mirrror_content:docker_client_registry_target_registry}/mirantis/cicd
- name: jnlp-slave:${_param:apt_mk_version}
+ name: jnlp-slave:${_param:mcp_version}
- registry: ${_param:mcp_docker_registry}/mirantis/cicd
target_registry: ${_param:default_local_mirrror_content:docker_client_registry_target_registry}/mirantis/cicd
- name: jenkins:${_param:apt_mk_version}
+ name: jenkins:${_param:mcp_version}
- registry: ${_param:mcp_docker_registry}/mirantis/cicd
target_registry: ${_param:default_local_mirrror_content:docker_client_registry_target_registry}/mirantis/cicd
- name: gerrit:${_param:apt_mk_version}
+ name: gerrit:${_param:mcp_version}
# stacklight
- registry: ${_param:mcp_docker_registry}/openstack-docker
target_registry: ${_param:default_local_mirrror_content:docker_client_registry_target_registry}/openstack-docker
- name: alertmanager:${_param:apt_mk_version}
+ name: alertmanager:${_param:mcp_version}
- registry: ${_param:mcp_docker_registry}/mirantis/external
target_registry: ${_param:default_local_mirrror_content:docker_client_registry_target_registry}/mirantis/external
- name: alerta-web:${_param:apt_mk_version}
+ name: alerta-web:${_param:mcp_version}
- registry: ${_param:mcp_docker_registry}/openstack-docker
target_registry: ${_param:default_local_mirrror_content:docker_client_registry_target_registry}/openstack-docker
- name: pushgateway:${_param:apt_mk_version}
+ name: pushgateway:${_param:mcp_version}
- registry: ${_param:mcp_docker_registry}/openstack-docker
target_registry: ${_param:default_local_mirrror_content:docker_client_registry_target_registry}/openstack-docker
- name: prometheus:${_param:apt_mk_version}
+ name: prometheus:${_param:mcp_version}
- registry: ${_param:mcp_docker_registry}/openstack-docker
target_registry: ${_param:default_local_mirrror_content:docker_client_registry_target_registry}/openstack-docker
- name: gainsight:${_param:apt_mk_version}
+ name: gainsight:${_param:mcp_version}
- registry: ${_param:mcp_docker_registry}/openstack-docker
target_registry: ${_param:default_local_mirrror_content:docker_client_registry_target_registry}/openstack-docker
- name: telegraf:${_param:apt_mk_version}
+ name: telegraf:${_param:mcp_version}
- registry: ${_param:mcp_docker_registry}/openstack-docker
target_registry: ${_param:default_local_mirrror_content:docker_client_registry_target_registry}/openstack-docker
- name: remote_storage_adapter:${_param:apt_mk_version}
+ name: remote_storage_adapter:${_param:mcp_version}
- registry: ${_param:mcp_docker_registry}/openstack-docker
target_registry: ${_param:default_local_mirrror_content:docker_client_registry_target_registry}/openstack-docker
- name: prometheus_relay:${_param:apt_mk_version}
+ name: prometheus_relay:${_param:mcp_version}
- registry: ${_param:mcp_docker_registry}/openstack-docker
target_registry: ${_param:default_local_mirrror_content:docker_client_registry_target_registry}/openstack-docker
- name: grafana:${_param:apt_mk_version}
+ name: grafana:${_param:mcp_version}
- registry: ${_param:mcp_docker_registry}/openstack-docker
target_registry: ${_param:default_local_mirrror_content:docker_client_registry_target_registry}/openstack-docker
- name: heka:${_param:apt_mk_version}
+ name: heka:${_param:mcp_version}
- registry: ${_param:mcp_docker_registry}/mirantis/external
target_registry: ${_param:default_local_mirrror_content:docker_client_registry_target_registry}/mirantis/external
- name: elasticsearch:${_param:apt_mk_version}
+ name: elasticsearch:${_param:mcp_version}
+ - registry: ${_param:mcp_docker_registry}/openstack-docker
+ target_registry: ${_param:default_local_mirrror_content:docker_client_registry_target_registry}/openstack-docker
+ name: sf_notifier:${_param:mcp_version}
+ - registry: ${_param:mcp_docker_registry}/openstack-docker
+ target_registry: ${_param:default_local_mirrror_content:docker_client_registry_target_registry}/openstack-docker
+ name: gainsight_elasticsearch:${_param:mcp_version}
# QA\CVP tool-set's
- registry: ${_param:mcp_docker_registry}/mirantis/oss
target_registry: ${_param:default_local_mirrror_content:docker_client_registry_target_registry}/mirantis/oss
- name: qa-tools:${_param:apt_mk_version}
+ name: qa-tools:${_param:mcp_version}
- registry: ${_param:mcp_docker_registry}/mirantis/cvp
target_registry: ${_param:default_local_mirrror_content:docker_client_registry_target_registry}/mirantis/cvp
- name: cvp-rally:${_param:apt_mk_version}
+ name: cvp-rally:${_param:mcp_version}
- registry: ${_param:mcp_docker_registry}/mirantis/cvp
target_registry: ${_param:default_local_mirrror_content:docker_client_registry_target_registry}/mirantis/cvp
- name: cvp-spt:${_param:apt_mk_version}
+ name: cvp-spt:${_param:mcp_version}
- registry: ${_param:mcp_docker_registry}/mirantis/cvp
target_registry: ${_param:default_local_mirrror_content:docker_client_registry_target_registry}/mirantis/cvp
- name: cvp-sanity-checks:${_param:apt_mk_version}
+ name: cvp-sanity-checks:${_param:mcp_version}
#
- registry: ${_param:mcp_docker_registry}/mirantis/cicd
target_registry: ${_param:default_local_mirrror_content:docker_client_registry_target_registry}/mirantis/cicd
- name: mysql:${_param:apt_mk_version}
+ name: mysql:${_param:mcp_version}
diff --git a/defaults/linux_system_file.yml b/defaults/linux_system_file.yml
index bc3b36d..c37c030 100644
--- a/defaults/linux_system_file.yml
+++ b/defaults/linux_system_file.yml
@@ -13,16 +13,16 @@
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
amphora-x64-haproxy-pike.qcow2:
- name: /srv/http/docker-prod-local.artifactory.mirantis.com/mirantis/openstack/octavia/images/${_param:mcp_version}/pike/amphora-x64-haproxy.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
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/docker-prod-local.artifactory.mirantis.com/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
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/docker-prod-local.artifactory.mirantis.com/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
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/docker-prod-local.artifactory.mirantis.com/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