Merge "Add kuberneter-extra repo" into release/2019.2.0
diff --git a/defaults/init.yml b/defaults/init.yml
index fcfc064..563b1a5 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
+
diff --git a/jenkins/client/job/deploy/update/init.yml b/jenkins/client/job/deploy/update/init.yml
index 5a1a8c1..3866d26 100644
--- a/jenkins/client/job/deploy/update/init.yml
+++ b/jenkins/client/job/deploy/update/init.yml
@@ -9,6 +9,7 @@
- system.jenkins.client.job.deploy.update.upgrade_ovs_gateway
- system.jenkins.client.job.deploy.update.upgrade_opencontrail
- system.jenkins.client.job.deploy.update.upgrade_opencontrail4_0
+ - system.jenkins.client.job.deploy.update.update_opencontrail4
- system.jenkins.client.job.deploy.update.upgrade_stacklight
- system.jenkins.client.job.deploy.update.restore_mysql
- system.jenkins.client.job.deploy.update.restore_cassandra
diff --git a/jenkins/client/job/deploy/update/update_opencontrail4.yml b/jenkins/client/job/deploy/update/update_opencontrail4.yml
new file mode 100644
index 0000000..72ea870
--- /dev/null
+++ b/jenkins/client/job/deploy/update/update_opencontrail4.yml
@@ -0,0 +1,47 @@
+#
+# Jobs to update packages on given Salt master environment
+#
+parameters:
+ _param:
+ jenkins_salt_api_url: "http://${_param:salt_master_host}:6969"
+ jenkins:
+ client:
+ job:
+ deploy-update-opencontrail4:
+ type: workflow-scm
+ concurrent: true
+ discard:
+ build:
+ keep_num: 10
+ artifact:
+ keep_num: 10
+ display_name: "Deploy - update Opencontrail 4X"
+ scm:
+ type: git
+ url: "${_param:jenkins_gerrit_url}/mk/mk-pipelines"
+ branch: "${_param:jenkins_pipelines_branch}"
+ credentials: "gerrit"
+ script: opencontrail4-update.groovy
+ param:
+ SALT_MASTER_URL:
+ type: string
+ default: "${_param:jenkins_salt_api_url}"
+ SALT_MASTER_CREDENTIALS:
+ type: string
+ default: "salt"
+ STAGE_CONTROLLERS_UPDATE:
+ type: boolean
+ default: 'true'
+ description: "Run update on Opencontrail controllers"
+ STAGE_COMPUTES_UPDATE:
+ type: boolean
+ default: 'true'
+ description: "Run update on Opencontrail compute nodes"
+ COMPUTE_TARGET_SERVERS:
+ type: string
+ default: "cmp*"
+ description: Salt compound target to match nodes to be updated [*, G@osfamily:debian].
+ COMPUTE_TARGET_SUBSET_LIVE:
+ type: string
+ default: '1'
+ description: Number of selected nodes to live apply compute update.