Update model for offline image
* Fix typos for default offline images names
* Update debmirror repos
* Add entropy for aptly container
* Update MAAS configs
Change-Id: I700216f3727023a36e579da08c0f416b67a94cf8
Related-Prod: PROD-32735
diff --git a/defaults/debmirror.yml b/defaults/debmirror.yml
index b572dcc..8c636ac 100644
--- a/defaults/debmirror.yml
+++ b/defaults/debmirror.yml
@@ -2,6 +2,14 @@
_param:
# Global
debmirror_mirrors_base_target_dir: "/srv/volumes/aptly/public/${_param:mcp_version}/"
+ debmirror_mirrors_update_target_dir: "/srv/volumes/aptly/public/update/${_param:mcp_version}/"
+ # TODO : expiremental
+ debmirror_mirrors_common_cache_dir: "/srv/volumes/aptly/public/.common_cache/"
+ # debmirror_mirrors_sync_method set to http because mirror.mirantis.com is under cloud front
+ debmirror_mirrors_sync_method: http
+ debmirror_mirrors_host: "mirror.mirantis.com"
+ debmirror_mirrors_root: "${_param:mcp_version}"
+ debmirror_mirrors_update_root: "update/${_param:mcp_version}"
# Per repo modificators
mirror_mirantis_com_cassandra_xenial_force: False
mirror_mirantis_com_ceph_luminous_xenial_force: False
@@ -11,6 +19,7 @@
mirror_mirantis_com_elasticsearch_curator_5_xenial_force: False
mirror_mirantis_com_extra_xenial_force: False
mirror_mirantis_com_glusterfs_3_8_xenial_force: False
+ mirror_mirantis_com_glusterfs_5_xenial_force: False
mirror_mirantis_com_maas_xenial_force: False
mirror_mirantis_com_oc40_xenial_force: False
mirror_mirantis_com_oc41_xenial_force: False
diff --git a/defaults/docker_images.yml b/defaults/docker_images.yml
index bf5aa0c..54fbfa4 100644
--- a/defaults/docker_images.yml
+++ b/defaults/docker_images.yml
@@ -8,7 +8,7 @@
docker_image_openldap: "${_param:mcp_docker_registry}/mirantis/external/osixia/openldap:1.2.2"
docker_image_postgresql: "${_param:mcp_docker_registry}/mirantis/external/library/postgres:9.6.10"
# 3.4.13, from Feb 15, differ from 3.4.13 upstream verison, from March 14 - update next cycle
- docker_image_mongodb: "${_param:mcp_docker_registry}/mirantis/external/library/mongo:${_param:mcp_version}"
+ docker_image_mongodb: "${_param:mcp_docker_registry}/mirantis/external/mongo:${_param:mcp_version}"
###
# phpldapadmin:0.6.12
docker_image_phpldapadmin: "${_param:mcp_docker_registry}/mirantis/cicd/phpldapadmin:${_param:mcp_version}"
@@ -130,7 +130,7 @@
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:2019.2.5
+ name: prometheus-relay:2019.2.5
- registry: ${_param:mcp_docker_registry}/openstack-docker
target_registry: ${_param:default_local_mirrror_content:docker_client_registry_target_registry}/openstack-docker
name: grafana:${_param:mcp_version}
@@ -145,11 +145,22 @@
name: gainsight_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: prometheus-es-exporter:2019.2.4
+ name: prometheus-es-exporter:2019.2.6
+
+ # OpenContrail 4.1
+ - registry: ${_param:mcp_docker_registry}/opencontrail-oc41
+ target_registry: ${_param:default_local_mirrror_content:docker_client_registry_target_registry}/opencontrail-oc41
+ name: opencontrail-analytics:${_param:opencontrail_docker_image_tag}
+ - registry: ${_param:mcp_docker_registry}/opencontrail-oc41
+ target_registry: ${_param:default_local_mirrror_content:docker_client_registry_target_registry}/opencontrail-oc41
+ name: opencontrail-analyticsdb:${_param:opencontrail_docker_image_tag}
+ - registry: ${_param:mcp_docker_registry}/opencontrail-oc41
+ target_registry: ${_param:default_local_mirrror_content:docker_client_registry_target_registry}/opencontrail-oc41
+ name: opencontrail-controller:${_param:opencontrail_docker_image_tag}
# QA\CVP tool-set's
- - registry: ${_param:mcp_docker_registry}/mirantis/cvp
- target_registry: ${_param:default_local_mirrror_content:docker_client_registry_target_registry}/mirantis/cvp
+ - registry: ${_param:mcp_docker_registry}/mirantis/cicd
+ target_registry: ${_param:default_local_mirrror_content:docker_client_registry_target_registry}/mirantis/cicd
name: ci-tempest:${_param:openstack_version}
- registry: ${_param:mcp_docker_registry}/mirantis/cvp
target_registry: ${_param:default_local_mirrror_content:docker_client_registry_target_registry}/mirantis/cvp
@@ -167,6 +178,6 @@
- registry: ${_param:mcp_docker_registry}/mirantis/cicd
target_registry: ${_param:default_local_mirrror_content:docker_client_registry_target_registry}/mirantis/cicd
name: mysql:${_param:mcp_version}
- - registry: ${_param:mcp_docker_registry}/mirantis/external/library
- target_registry: ${_param:default_local_mirrror_content:docker_client_registry_target_registry}/mirantis/external/library
+ - registry: ${_param:mcp_docker_registry}/mirantis/external
+ target_registry: ${_param:default_local_mirrror_content:docker_client_registry_target_registry}/mirantis/external
name: mongo:${_param:mcp_version}
diff --git a/defaults/linux_system_repo.yml b/defaults/linux_system_repo.yml
index 61aca94..07e96d2 100644
--- a/defaults/linux_system_repo.yml
+++ b/defaults/linux_system_repo.yml
@@ -12,6 +12,7 @@
linux_system_repo_mcp_glusterfs_url: ${_param:linux_system_repo_url}/glusterfs-${_param:linux_system_repo_mcp_glusterfs_version_number}/
linux_system_repo_mcp_influxdb_url: ${_param:linux_system_repo_url}/influxdb/
linux_system_repo_mcp_maas_url: ${_param:linux_system_repo_url}/maas/
+ linux_system_repo_mcp_update_maas_url: ${_param:linux_system_repo_update_url}/maas/
#
linux_system_repo_mcp_elasticsearch_curator_url: ${_param:linux_system_repo_url}/elasticsearch-curator-5/
linux_system_repo_mcp_update_elasticsearch_curator_url: ${_param:linux_system_repo_update_url}/elasticsearch-curator-5/
diff --git a/defaults/maas.yml b/defaults/maas.yml
index 795d4b0..7e073d1 100644
--- a/defaults/maas.yml
+++ b/defaults/maas.yml
@@ -5,14 +5,14 @@
maas_mirror_image_sections:
bootloaders:
keyring: /usr/share/keyrings/ubuntu-cloudimage-keyring.gpg
- upstream: ${_param:linux_system_repo_url}/maas-ephemeral-v3/
+ upstream: ${_param:linux_system_repo_update_url}/maas-ephemeral-v3/
local_dir: /srv/http/${_param:mcp_version}/maas-ephemeral-v3/
count: 1
# i386 need for pxe
filters: ['arch~(i386|amd64)', 'os~(grub*|pxelinux*)']
xenial:
keyring: /usr/share/keyrings/ubuntu-cloudimage-keyring.gpg
- upstream: ${_param:linux_system_repo_url}/maas-ephemeral-v3/
+ upstream: ${_param:linux_system_repo_update_url}/maas-ephemeral-v3/
local_dir: /srv/http/${_param:mcp_version}/maas-ephemeral-v3/
count: 1
filters: ['release~(xenial)', 'arch~(amd64)', 'subarch~(generic|hwe-16*|ga-16*)']