Offline related updates
* Unfify offline content variable
Collect all data in 'default_local_mirrror_content'
variable would allow to extend default set in future
w\o removing|renaming original one
- add git mirror list
* Add amphora image for pike|queens
* debmirror:ubuntu
- add requirment for dogtag
* Misc:
remove duplicate in defaults - linux_system_repo_url
Prod-related: PROD-26662 (PROD:26662)
Bug-fix: PROD-26807 (PROD:26807)
Change-Id: I77f0a3648a0a74f70d29ba388e194c51725744f0
diff --git a/debmirror/mirror_mirantis_com/ubuntu/xenial.yml b/debmirror/mirror_mirantis_com/ubuntu/xenial.yml
index fad8e17..bc0a9d7 100644
--- a/debmirror/mirror_mirantis_com/ubuntu/xenial.yml
+++ b/debmirror/mirror_mirantis_com/ubuntu/xenial.yml
@@ -188,3 +188,4 @@
807: "--include='/main(.*)zfs-doc'" # Some extra fs dep's for MAAS provision stage.PROD-21531
808: --include='main/.*(linux-libc(-|_|)|libgcc1_).*amd64.deb'
809: --include='main/(x/xml-core|s/sgml-base|libxml|.*xmlsec1|.*python(3|)-zope.interface)'
+ 810: --include='universe/p/plexus-(container-default|interactivity-api)/' # PROD-26807 Req.for DogTag
diff --git a/defaults/docker_images.yml b/defaults/docker_images.yml
index ec4c5d6..18a6c14 100644
--- a/defaults/docker_images.yml
+++ b/defaults/docker_images.yml
@@ -49,95 +49,97 @@
# List of images, to be placed into offline image, during separate image build process
# WARNING: registry|target_registry and names - must be exactly same as list above!
- local_registry_mirror_image_list:
- # CI/CD
- - registry: ${_param:mcp_docker_registry}/mirantis/external
- target_registry: ${_param:local_docker_client_registry_target_registry}/mirantis/external
- name: registry:${_param:apt_mk_version}
- - registry: ${_param:mcp_docker_registry}/mirantis/external
- target_registry: ${_param:local_docker_client_registry_target_registry}/mirantis/external
- name: visualizer:${_param:apt_mk_version}
- - registry: ${_param:mcp_docker_registry}/mirantis/external/docker
- target_registry: ${_param:local_docker_client_registry_target_registry}/mirantis/external/docker
- name: compose:1.17.1
- - registry: ${_param:mcp_docker_registry}/mirantis/external/osixia
- target_registry: ${_param:local_docker_client_registry_target_registry}/mirantis/external/osixia
- name: openldap:1.2.2
- - registry: ${_param:mcp_docker_registry}/mirantis/external/library
- target_registry: ${_param:local_docker_client_registry_target_registry}/mirantis/external/library
- name: postgres:9.6.10
- - registry: ${_param:mcp_docker_registry}/mirantis/cicd
- target_registry: ${_param:local_docker_client_registry_target_registry}/mirantis/cicd
- name: phpldapadmin:${_param:apt_mk_version}
+ default_local_mirrror_content:
+ # Stub parameter, to render target local_registry_mirror_image_list
+ docker_client_registry_target_registry: "apt:5000"
+ docker_client_registry_image:
+ # 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}
+ - 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}
+ - 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
+ - registry: ${_param:mcp_docker_registry}/mirantis/external/osixia
+ target_registry: ${_param:default_local_mirrror_content:docker_client_registry_target_registry}/mirantis/external/osixia
+ name: openldap:1.2.2
+ - registry: ${_param:mcp_docker_registry}/mirantis/external/library
+ target_registry: ${_param:default_local_mirrror_content:docker_client_registry_target_registry}/mirantis/external/library
+ 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}
- - registry: ${_param:mcp_docker_registry}/mirantis/cicd
- target_registry: ${_param:local_docker_client_registry_target_registry}/mirantis/cicd
- name: aptly:${_param:apt_mk_version}
- - registry: ${_param:mcp_docker_registry}/mirantis/cicd
- target_registry: ${_param:local_docker_client_registry_target_registry}/mirantis/cicd
- name: aptly-public:${_param:apt_mk_version}
- - registry: ${_param:mcp_docker_registry}/mirantis/cicd
- target_registry: ${_param:local_docker_client_registry_target_registry}/mirantis/cicd
- name: aptly-publisher:${_param:apt_mk_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}
+ - 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}
+ - 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}
- - registry: ${_param:mcp_docker_registry}/mirantis/cicd
- target_registry: ${_param:local_docker_client_registry_target_registry}/mirantis/cicd
- name: jnlp-slave:${_param:apt_mk_version}
- - registry: ${_param:mcp_docker_registry}/mirantis/cicd
- target_registry: ${_param:local_docker_client_registry_target_registry}/mirantis/cicd
- name: jenkins:${_param:apt_mk_version}
- - registry: ${_param:mcp_docker_registry}/mirantis/cicd
- target_registry: ${_param:local_docker_client_registry_target_registry}/mirantis/cicd
- name: gerrit:${_param:apt_mk_version}
- # stacklight
- - registry: ${_param:mcp_docker_registry}/openstack-docker
- target_registry: ${_param:local_docker_client_registry_target_registry}/openstack-docker
- name: alertmanager:${_param:apt_mk_version}
- - registry: ${_param:mcp_docker_registry}/mirantis/external
- target_registry: ${_param:local_docker_client_registry_target_registry}/mirantis/external
- name: alerta-web:${_param:apt_mk_version}
- - registry: ${_param:mcp_docker_registry}/openstack-docker
- target_registry: ${_param:local_docker_client_registry_target_registry}/openstack-docker
- name: pushgateway:${_param:apt_mk_version}
- - registry: ${_param:mcp_docker_registry}/openstack-docker
- target_registry: ${_param:local_docker_client_registry_target_registry}/openstack-docker
- name: prometheus:${_param:apt_mk_version}
- - registry: ${_param:mcp_docker_registry}/openstack-docker
- target_registry: ${_param:local_docker_client_registry_target_registry}/openstack-docker
- name: gainsight:${_param:apt_mk_version}
- - registry: ${_param:mcp_docker_registry}/openstack-docker
- target_registry: ${_param:local_docker_client_registry_target_registry}/openstack-docker
- name: telegraf:${_param:apt_mk_version}
- - registry: ${_param:mcp_docker_registry}/openstack-docker
- target_registry: ${_param:local_docker_client_registry_target_registry}/openstack-docker
- name: remote_storage_adapter:${_param:apt_mk_version}
- - registry: ${_param:mcp_docker_registry}/openstack-docker
- target_registry: ${_param:local_docker_client_registry_target_registry}/openstack-docker
- name: prometheus_relay:${_param:apt_mk_version}
- - registry: ${_param:mcp_docker_registry}/openstack-docker
- target_registry: ${_param:local_docker_client_registry_target_registry}/openstack-docker
- name: grafana:${_param:apt_mk_version}
- - registry: ${_param:mcp_docker_registry}/openstack-docker
- target_registry: ${_param:local_docker_client_registry_target_registry}/openstack-docker
- name: heka:${_param:apt_mk_version}
- - registry: ${_param:mcp_docker_registry}/mirantis/external
- target_registry: ${_param:local_docker_client_registry_target_registry}/mirantis/external
- name: elasticsearch:${_param:apt_mk_version}
- # QA\CVP tool-set's
- - registry: ${_param:mcp_docker_registry}/mirantis/oss
- target_registry: ${_param:local_docker_client_registry_target_registry}/mirantis/oss
- name: qa-tools:${_param:apt_mk_version}
- - registry: ${_param:mcp_docker_registry}/mirantis/cvp
- target_registry: ${_param:local_docker_client_registry_target_registry}/mirantis/cvp
- name: cvp-rally:${_param:apt_mk_version}
- - registry: ${_param:mcp_docker_registry}/mirantis/cvp
- target_registry: ${_param:local_docker_client_registry_target_registry}/mirantis/cvp
- name: cvp-spt:${_param:apt_mk_version}
- - registry: ${_param:mcp_docker_registry}/mirantis/cvp
- target_registry: ${_param:local_docker_client_registry_target_registry}/mirantis/cvp
- name: cvp-sanity-checks:${_param:apt_mk_version}
- #
- - registry: ${_param:mcp_docker_registry}/mirantis/cicd
- target_registry: ${_param:local_docker_client_registry_target_registry}/mirantis/cicd
- name: mysql:${_param:apt_mk_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}
+ - 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}
+ - 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}
+ # 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}
+ - 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}
+ - 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}
+ - 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}
+ - 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}
+ - 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}
+ - 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}
+ - 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}
+ - 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}
+ - 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}
+ - 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}
+ # 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}
+ - 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}
+ - 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}
+ - 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}
+ #
+ - 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}
diff --git a/defaults/git/init.yml b/defaults/git/init.yml
new file mode 100644
index 0000000..14dd599
--- /dev/null
+++ b/defaults/git/init.yml
@@ -0,0 +1,21 @@
+parameters:
+ _param:
+ # List of repos, to be placed into offline image, during separate image build process
+ # By default, will be avaible http_server
+ # WARNING: file path and names - must be exactly same as in any other place in reclass-system or model!
+ default_local_mirrror_content:
+ git_server_repos:
+ - name: mk-pipelines
+ url: https://github.com/Mirantis/mk-pipelines.git
+ - name: pipeline-library
+ url: https://github.com/Mirantis/pipeline-library.git
+ - name: cvp-sanity-checks
+ url: https://github.com/Mirantis/cvp-sanity-checks.git
+ - name: cvp-spt
+ url: https://github.com/Mirantis/cvp-spt.git
+ - name: stacklight-pytest
+ url: https://github.com/Mirantis/stacklight-pytest
+ - name: cvp-configuration
+ url: https://github.com/Mirantis/cvp-configuration.git
+ - name: rundeck-cis-jobs
+ url: https://github.com/Mirantis/rundeck-cis-jobs.git
diff --git a/defaults/init.yml b/defaults/init.yml
index 4231078..f3cd738 100644
--- a/defaults/init.yml
+++ b/defaults/init.yml
@@ -8,6 +8,7 @@
classes:
- system.defaults.linux_system_repo
- system.defaults.linux_system_file
+- system.defaults.git
- system.defaults.openstack
- system.defaults.galera
- system.defaults.rabbitmq
@@ -24,7 +25,6 @@
# '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:mcp_version}/"
# linux globals
banner_company_name: COMPANY_NAME
motd_company_name: "${_param:banner_company_name}"
@@ -42,5 +42,3 @@
# Make sure this global variable is defined everywhere, where used it is already set on cluster level
cluster_public_host: '127.0.0.1'
single_address: '127.0.0.1'
- # Stub parameter, to render target local_registry_mirror_image_list
- local_docker_client_registry_target_registry: "apt:5000"
diff --git a/defaults/linux_system_file.yml b/defaults/linux_system_file.yml
index c8080c4..153c200 100644
--- a/defaults/linux_system_file.yml
+++ b/defaults/linux_system_file.yml
@@ -3,8 +3,8 @@
# List of files, to be placed into offline image, during separate image build process
# By default, will be avaible http_server
# WARNING: file path and names - must be exactly same as in any other place in reclass-system!
- local_http_files_list:
- file:
+ 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
@@ -12,3 +12,17 @@
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
+ 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/docker-prod-local.artifactory.mirantis.com/mirantis/openstack/octavia/images/${_param:mcp_version}/pike/amphora-x64-haproxy.qcow2
+ hash: /srv/http/docker-prod-local.artifactory.mirantis.com/mirantis/openstack/octavia/images/${_param:mcp_version}/pike/amphora-x64-haproxy.qcow2.md5
+ amphora-x64-haproxy-pike.qcow2:
+ 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
+ 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
+ hash: /srv/http/docker-prod-local.artifactory.mirantis.com/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