Merge "Pass region setting to identity"
diff --git a/jenkins/client/job/deploy/update/init.yml b/jenkins/client/job/deploy/update/init.yml
index fb1f5cf..35a2912 100644
--- a/jenkins/client/job/deploy/update/init.yml
+++ b/jenkins/client/job/deploy/update/init.yml
@@ -15,3 +15,4 @@
- system.jenkins.client.job.deploy.update.restore_zookeeper
- system.jenkins.client.job.deploy.update.virt_snapshot
- system.jenkins.client.job.deploy.update.cloud_update
+ - system.jenkins.client.job.deploy.update.kubernetes_update
diff --git a/jenkins/client/job/deploy/update/kubernetes_update.yml b/jenkins/client/job/deploy/update/kubernetes_update.yml
index 09f0166..9fb23f9 100644
--- a/jenkins/client/job/deploy/update/kubernetes_update.yml
+++ b/jenkins/client/job/deploy/update/kubernetes_update.yml
@@ -4,7 +4,7 @@
parameters:
_param:
jenkins_salt_api_url: "http://${_param:salt_master_host}:6969"
- hyperkube_repo: "${_param:kubernetes_hyperkube_repo}"
+ kubernetes_hyperkube_repo: docker-prod-virtual.docker.mirantis.net/mirantis/kubernetes
jenkins:
client:
job:
@@ -21,11 +21,11 @@
param:
KUBERNETES_HYPERKUBE_IMAGE:
type: string
- default: "${_param:hyperkube_repo}/hyperkube-amd64:v1.10.4-4"
+ default: "${_param:kubernetes_hyperkube_repo}/hyperkube-amd64:v1.10.4-4"
description: "Versioned image to update control plane from. Should be null if update rolling via reclass-system level"
KUBERNETES_PAUSE_IMAGE:
type: string
- default: "${_param:hyperkube_repo}/pause-amd64:v1.10.4-4"
+ default: "${_param:kubernetes_hyperkube_repo}/pause-amd64:v1.10.4-4"
description: "Versioned pause image to use in deployments. Should be null if update rolling via reclass-system level"
SALT_MASTER_URL:
type: string
diff --git a/jenkins/client/job/test_pipelines.yml b/jenkins/client/job/test_pipelines.yml
index c9a2442..2b0fabe 100644
--- a/jenkins/client/job/test_pipelines.yml
+++ b/jenkins/client/job/test_pipelines.yml
@@ -46,7 +46,7 @@
default: "gerrit"
GRADLE_IMAGE:
type: string
- default: "niaquinto/gradle"
+ default: "docker-dev-local.docker.mirantis.net/mirantis/cicd/niaquinto_gradle"
GRADLE_CMD:
type: string
default: "check --info"
diff --git a/linux/system/repo/keystorage/saltstack_2016_3.yml b/linux/system/repo/keystorage/saltstack.yml
similarity index 100%
rename from linux/system/repo/keystorage/saltstack_2016_3.yml
rename to linux/system/repo/keystorage/saltstack.yml
diff --git a/linux/system/repo/mcp/apt_mirantis/saltstack.yml b/linux/system/repo/mcp/apt_mirantis/saltstack.yml
index ec7d320..22b3bb8 100644
--- a/linux/system/repo/mcp/apt_mirantis/saltstack.yml
+++ b/linux/system/repo/mcp/apt_mirantis/saltstack.yml
@@ -1,18 +1,19 @@
+classes:
+- system.linux.system.repo.keystorage.saltstack
parameters:
_param:
apt_mk_version: stable
- salt_version: 2016.3
- linux_system_repo_mcp_saltstack_version: ${_param:apt_mk_version}
+ salt_version: 2017.7
+ linux_system_repo_url: http://mirror.mirantis.com/${_param:apt_mk_version}/
+ linux_system_repo_mcp_saltstack_url: ${_param:linux_system_repo_url}/saltstack-${_param:salt_version}/
linux:
system:
repo:
mcp_saltstack:
- source: "deb [arch=amd64] http://mirror.mirantis.com/${_param:linux_system_repo_mcp_saltstack_version}/saltstack-${_param:salt_version}/${_param:linux_system_codename}/ ${_param:linux_system_codename} main"
+ source: "deb [arch=amd64] ${_param:linux_system_repo_mcp_saltstack_url}/${_param:linux_system_codename}/ ${_param:linux_system_codename} main"
architectures: amd64
- key_id: 0E08A149DE57BFBE
- key_server: keyserver.ubuntu.com
clean_file: true
pin:
- pin: 'release o=SaltStack'
priority: 1100
- package: '*'
\ No newline at end of file
+ package: '*'
diff --git a/linux/system/repo/mcp/apt_mirantis/saltstack_2016_3.yml b/linux/system/repo/mcp/apt_mirantis/saltstack_2016_3.yml
index c0eabe3..26f1a02 100644
--- a/linux/system/repo/mcp/apt_mirantis/saltstack_2016_3.yml
+++ b/linux/system/repo/mcp/apt_mirantis/saltstack_2016_3.yml
@@ -1,19 +1,6 @@
classes:
-- system.linux.system.repo.keystorage.saltstack_2016_3
+- system.linux.system.repo.keystorage.saltstack
+- system.linux.system.repo.mcp.apt_mirantis.saltstack
parameters:
_param:
- apt_mk_version: stable
salt_version: 2016.3
- linux_system_repo_url: http://mirror.mirantis.com/${_param:apt_mk_version}/
- linux_system_repo_mcp_saltstack_url: ${_param:linux_system_repo_url}/saltstack-2016.3/
- linux:
- system:
- repo:
- mcp_saltstack:
- source: "deb [arch=amd64] ${_param:linux_system_repo_mcp_saltstack_url}/${_param:linux_system_codename}/ ${_param:linux_system_codename} main"
- architectures: amd64
- clean_file: true
- pin:
- - pin: 'release o=SaltStack'
- priority: 1100
- package: '*'
diff --git a/linux/system/repo_local/mcp/apt_mirantis/saltstack.yml b/linux/system/repo_local/mcp/apt_mirantis/saltstack.yml
index 5b2a904..f9c8c50 100644
--- a/linux/system/repo_local/mcp/apt_mirantis/saltstack.yml
+++ b/linux/system/repo_local/mcp/apt_mirantis/saltstack.yml
@@ -1,7 +1,7 @@
parameters:
_param:
apt_mk_version: stable
- salt_version: 2016.3
+ salt_version: 2017.7
linux_system_repo_mcp_saltstack_version: ${_param:apt_mk_version}
linux:
system:
@@ -14,4 +14,4 @@
pin:
- pin: 'release a=${_param:linux_system_repo_mcp_saltstack_version}'
priority: 1100
- package: '*'
\ No newline at end of file
+ package: '*'