Merge "OpenContrail update pipeline job for 4.X versions"
diff --git a/barbican/client/v1/signed_images/octavia.yml b/barbican/client/v1/signed_images/octavia.yml
index ae708cf..ecc06e5 100644
--- a/barbican/client/v1/signed_images/octavia.yml
+++ b/barbican/client/v1/signed_images/octavia.yml
@@ -4,9 +4,6 @@
parameters:
_param:
octavia_image_cert_key: '/etc/octavia/certs/image.key'
- amphora_image_name: "amphora-x64-haproxy"
-
-
barbican:
client:
signed_images:
@@ -17,4 +14,4 @@
secret_name: 'OctaviaAmphoraSecret'
cert_key: ${_param:octavia_image_cert_key}
name: ${_param:amphora_image_name}
- cloud_name: octavia_identity
\ No newline at end of file
+ cloud_name: octavia_identity
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/openstack/init.yml b/defaults/openstack/init.yml
index cd8c070..5af6809 100644
--- a/defaults/openstack/init.yml
+++ b/defaults/openstack/init.yml
@@ -138,6 +138,9 @@
octavia_health_manager_node01_address: 192.168.10.10
octavia_health_manager_node02_address: 192.168.10.11
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"
# HAproxy
haproxy_openstack_web_bind_port: ${_param:horizon_public_port}
#
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
+
diff --git a/glance/client/image/octavia.yml b/glance/client/image/octavia.yml
index 582f1bc..3160cdd 100644
--- a/glance/client/image/octavia.yml
+++ b/glance/client/image/octavia.yml
@@ -1,9 +1,6 @@
classes:
- system.glance.client
parameters:
- _param:
- amphora_image_url: "https://artifactory.mirantis.com/binary-prod-local/mirantis/openstack/octavia/images/${_param:openstack_version}/amphora-x64-haproxy.qcow2"
- amphora_image_name: "amphora-x64-haproxy"
glance:
client:
identity:
diff --git a/kubernetes/common/init.yml b/kubernetes/common/init.yml
index c09a248..0c69c9e 100644
--- a/kubernetes/common/init.yml
+++ b/kubernetes/common/init.yml
@@ -40,8 +40,8 @@
kubernetes_hyperkube_source_hash: md5=7c50744bdb84fd6fe14ef8a835298f74
kubernetes_pause_image: ${_param:mcp_docker_registry}/mirantis/kubernetes/pause-amd64:v1.12.4-3
kubernetes_virtlet_image: ${_param:kubernetes_virtlet_repo}/virtlet:v1.4.4
- kubernetes_criproxy_version: v0.12.0
- kubernetes_criproxy_checksum: md5=371cacd3d8568eb88425498b48a649dd
+ kubernetes_criproxy_version: v0.14.0
+ kubernetes_criproxy_checksum: md5=f0fa669295a156a588f3480c9909e6fd
kubernetes_netchecker_agent_image: ${_param:kubernetes_netchecker_agent_repo}/k8s-netchecker-agent:v1.2.2
kubernetes_netchecker_server_image: ${_param:kubernetes_netchecker_server_repo}/k8s-netchecker-server:v1.2.2
kubernetes_kubedns_image: ${_param:kubernetes_kubedns_repo}/k8s-dns-kube-dns-amd64:1.14.5