update defaults
* Add static files list, for offline build
* Unhardcode mcp_static_images_url
* Unhardcode salt_control_*_image
Change-Id: Ia774d16a0f34362535d4f91d3add47b8ecebf7c1
Prod-related: PROD-26662 (PROD:26662)
diff --git a/defaults/init.yml b/defaults/init.yml
index bcface8..ce011df 100644
--- a/defaults/init.yml
+++ b/defaults/init.yml
@@ -7,6 +7,7 @@
classes:
- system.defaults.linux_system_repo
+- system.defaults.linux_system_file
- system.defaults.openstack
- system.defaults.galera
- system.defaults.rabbitmq
@@ -33,6 +34,7 @@
# Docker artifact globals
mcp_docker_registry: 'docker-prod-local.artifactory.mirantis.com'
mcp_binary_registry: "https://${_param:mcp_docker_registry}/artifactory/binary-prod-local"
+ mcp_static_images_url: "http://images.mirantis.com"
# Opencontrail globals
opencontrail_version: 4.0
# Other
diff --git a/defaults/linux_system_file.yml b/defaults/linux_system_file.yml
new file mode 100644
index 0000000..c8080c4
--- /dev/null
+++ b/defaults/linux_system_file.yml
@@ -0,0 +1,14 @@
+parameters:
+ _param:
+ # 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:
+ 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
+ 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
diff --git a/defaults/salt/init.yml b/defaults/salt/init.yml
index 3193878..2e19089 100644
--- a/defaults/salt/init.yml
+++ b/defaults/salt/init.yml
@@ -44,3 +44,7 @@
salt_control_size_image_layout_stacklight_log: ${_param:salt_control_size_image_layout_default}
salt_control_size_image_layout_stacklight_server: ${_param:salt_control_size_image_layout_default}
salt_control_size_image_layout_stacklight_telemetry: ${_param:salt_control_size_image_layout_default}
+
+ salt_control_trusty_image: ${_param:mcp_static_images_url}/ubuntu-14-04-x64-mcp${_param:mcp_version}.qcow2
+ salt_control_xenial_image: ${_param:mcp_static_images_url}/ubuntu-16-04-x64-mcp${_param:mcp_version}.qcow2
+