Merge "Remove variable PROJECT"
diff --git a/artifactory/client/init.yml b/artifactory/client/init.yml
index 7eab16e..bd69bd3 100644
--- a/artifactory/client/init.yml
+++ b/artifactory/client/init.yml
@@ -341,6 +341,10 @@
- pypi-remote
defaultDeploymentRepo: pypi-local
+ test-images:
+ rclass: local
+ packageType: generic
+
ubuntu-local:
rclass: local
packageType: debian
diff --git a/jenkins/client/job/debian/packages/extra.yml b/jenkins/client/job/debian/packages/extra.yml
index 0a21a55..f3475b3 100644
--- a/jenkins/client/job/debian/packages/extra.yml
+++ b/jenkins/client/job/debian/packages/extra.yml
@@ -212,6 +212,11 @@
template:
type: workflow-scm
concurrent: false
+ discard:
+ build:
+ keep_num: 10
+ artifact:
+ keep_num: 10
scm:
type: git
url: "${_param:jenkins_gerrit_url}/mk/mk-pipelines"
diff --git a/jenkins/client/job/debian/packages/testing.yml b/jenkins/client/job/debian/packages/testing.yml
index f150f80..84ff1cc 100644
--- a/jenkins/client/job/debian/packages/testing.yml
+++ b/jenkins/client/job/debian/packages/testing.yml
@@ -14,6 +14,11 @@
template:
type: workflow-scm
concurrent: false
+ discard:
+ build:
+ keep_num: 10
+ artifact:
+ keep_num: 10
scm:
type: git
url: "${_param:jenkins_gerrit_url}/mk/mk-pipelines"
diff --git a/jenkins/client/job/deploy/lab/cicd.yml b/jenkins/client/job/deploy/lab/cicd.yml
index d524bbc..8252cfd 100644
--- a/jenkins/client/job/deploy/lab/cicd.yml
+++ b/jenkins/client/job/deploy/lab/cicd.yml
@@ -10,6 +10,9 @@
template:
type: workflow-scm
concurrent: true
+ discard:
+ build:
+ keep_num: 10
display_name: "Deploy {{name}} heat stack"
scm:
type: git
diff --git a/jenkins/client/job/deploy/lab/demo.yml b/jenkins/client/job/deploy/lab/demo.yml
index 2bb6ad5..3af2d7c 100644
--- a/jenkins/client/job/deploy/lab/demo.yml
+++ b/jenkins/client/job/deploy/lab/demo.yml
@@ -5,6 +5,9 @@
deploy_kafka_demo:
type: workflow-scm
concurrent: false
+ discard:
+ build:
+ keep_num: 10
display_name: "Kafka demo"
scm:
type: git
diff --git a/jenkins/client/job/deploy/openstack.yml b/jenkins/client/job/deploy/openstack.yml
index a9f2007..d5ed556 100644
--- a/jenkins/client/job/deploy/openstack.yml
+++ b/jenkins/client/job/deploy/openstack.yml
@@ -44,6 +44,9 @@
deploy-openstack-compute:
type: workflow-scm
concurrent: true
+ discard:
+ build:
+ keep_num: 50
display_name: "Deploy - OpenStack Compute node"
scm:
type: git
diff --git a/jenkins/client/job/deploy/update/cloud_update.yml b/jenkins/client/job/deploy/update/cloud_update.yml
index d434850..d4a05ec 100644
--- a/jenkins/client/job/deploy/update/cloud_update.yml
+++ b/jenkins/client/job/deploy/update/cloud_update.yml
@@ -10,6 +10,11 @@
deploy-update-cloud:
type: workflow-scm
concurrent: true
+ discard:
+ build:
+ keep_num: 10
+ artifact:
+ keep_num: 10
display_name: "Deploy - update cloud"
scm:
type: git
diff --git a/jenkins/client/job/deploy/update/config.yml b/jenkins/client/job/deploy/update/config.yml
index 7c75e5b..47ec321 100644
--- a/jenkins/client/job/deploy/update/config.yml
+++ b/jenkins/client/job/deploy/update/config.yml
@@ -10,6 +10,11 @@
deploy-update-service-config:
type: workflow-scm
concurrent: true
+ discard:
+ build:
+ keep_num: 10
+ artifact:
+ keep_num: 10
display_name: "Deploy - update service(s) config"
scm:
type: git
diff --git a/jenkins/client/job/deploy/update/kubernetes_update.yml b/jenkins/client/job/deploy/update/kubernetes_update.yml
index 9fb23f9..acdb8e0 100644
--- a/jenkins/client/job/deploy/update/kubernetes_update.yml
+++ b/jenkins/client/job/deploy/update/kubernetes_update.yml
@@ -11,6 +11,11 @@
deploy-k8s-upgrade:
type: workflow-scm
concurrent: true
+ discard:
+ build:
+ keep_num: 10
+ artifact:
+ keep_num: 10
display_name: "Deploy - update kubernetes cluster"
scm:
type: git
diff --git a/jenkins/client/job/deploy/update/package.yml b/jenkins/client/job/deploy/update/package.yml
index b276ce4..a485c3e 100644
--- a/jenkins/client/job/deploy/update/package.yml
+++ b/jenkins/client/job/deploy/update/package.yml
@@ -10,6 +10,11 @@
deploy-update-package:
type: workflow-scm
concurrent: true
+ discard:
+ build:
+ keep_num: 10
+ artifact:
+ keep_num: 10
display_name: "Deploy - update system package(s)"
scm:
type: git
diff --git a/jenkins/client/job/deploy/update/restore_cassandra.yml b/jenkins/client/job/deploy/update/restore_cassandra.yml
index 115f7a2..34179af 100644
--- a/jenkins/client/job/deploy/update/restore_cassandra.yml
+++ b/jenkins/client/job/deploy/update/restore_cassandra.yml
@@ -10,6 +10,11 @@
deploy-cassandra-db-restore:
type: workflow-scm
concurrent: true
+ discard:
+ build:
+ keep_num: 10
+ artifact:
+ keep_num: 10
display_name: "Cassandra - restore db"
scm:
type: git
diff --git a/jenkins/client/job/deploy/update/restore_mysql.yml b/jenkins/client/job/deploy/update/restore_mysql.yml
index 2c4ce12..aaf4552 100644
--- a/jenkins/client/job/deploy/update/restore_mysql.yml
+++ b/jenkins/client/job/deploy/update/restore_mysql.yml
@@ -10,6 +10,11 @@
deploy-mysql-db-restore:
type: workflow-scm
concurrent: true
+ discard:
+ build:
+ keep_num: 10
+ artifact:
+ keep_num: 10
display_name: "Xtrabackup - restore mysql db"
scm:
type: git
diff --git a/jenkins/client/job/deploy/update/restore_zookeeper.yml b/jenkins/client/job/deploy/update/restore_zookeeper.yml
index b6d044a..ebb57f7 100644
--- a/jenkins/client/job/deploy/update/restore_zookeeper.yml
+++ b/jenkins/client/job/deploy/update/restore_zookeeper.yml
@@ -10,6 +10,11 @@
deploy-zookeeper-restore:
type: workflow-scm
concurrent: true
+ discard:
+ build:
+ keep_num: 10
+ artifact:
+ keep_num: 10
display_name: "Zookeeper - restore"
scm:
type: git
diff --git a/jenkins/client/job/deploy/update/saltenv.yml b/jenkins/client/job/deploy/update/saltenv.yml
index 1ce1494..734a4e5 100644
--- a/jenkins/client/job/deploy/update/saltenv.yml
+++ b/jenkins/client/job/deploy/update/saltenv.yml
@@ -19,6 +19,11 @@
display_name: "Deploy - update {{name}} environment"
type: workflow-scm
concurrent: false
+ discard:
+ build:
+ keep_num: 10
+ artifact:
+ keep_num: 10
scm:
type: git
url: "${_param:jenkins_gerrit_url}/salt-models/{{name}}"
diff --git a/jenkins/client/job/deploy/update/update_mirror_image.yml b/jenkins/client/job/deploy/update/update_mirror_image.yml
index 2b2dc26..73fd434 100644
--- a/jenkins/client/job/deploy/update/update_mirror_image.yml
+++ b/jenkins/client/job/deploy/update/update_mirror_image.yml
@@ -10,6 +10,11 @@
deploy-update-mirror-image:
type: workflow-scm
concurrent: true
+ discard:
+ build:
+ keep_num: 10
+ artifact:
+ keep_num: 10
display_name: "Deploy - update local mirror"
scm:
type: git
diff --git a/jenkins/client/job/deploy/update/update_salt_environment.yml b/jenkins/client/job/deploy/update/update_salt_environment.yml
index f9ea6d5..dcc58d7 100644
--- a/jenkins/client/job/deploy/update/update_salt_environment.yml
+++ b/jenkins/client/job/deploy/update/update_salt_environment.yml
@@ -10,6 +10,11 @@
deploy-update-salt-environment:
type: workflow-scm
concurrent: true
+ discard:
+ build:
+ keep_num: 10
+ artifact:
+ keep_num: 10
display_name: "Deploy - update Salt environment"
scm:
type: git
diff --git a/jenkins/client/job/deploy/update/upgrade.yml b/jenkins/client/job/deploy/update/upgrade.yml
index 6ffc9c1..01fdf2a 100644
--- a/jenkins/client/job/deploy/update/upgrade.yml
+++ b/jenkins/client/job/deploy/update/upgrade.yml
@@ -10,6 +10,11 @@
deploy-upgrade-control:
type: workflow-scm
concurrent: true
+ discard:
+ build:
+ keep_num: 10
+ artifact:
+ keep_num: 10
display_name: "Deploy - upgrade control VMs"
scm:
type: git
diff --git a/jenkins/client/job/deploy/update/upgrade_compute.yml b/jenkins/client/job/deploy/update/upgrade_compute.yml
index 3986997..706863d 100644
--- a/jenkins/client/job/deploy/update/upgrade_compute.yml
+++ b/jenkins/client/job/deploy/update/upgrade_compute.yml
@@ -10,6 +10,11 @@
deploy-upgrade-compute:
type: workflow-scm
concurrent: true
+ discard:
+ build:
+ keep_num: 10
+ artifact:
+ keep_num: 10
display_name: "Deploy - upgrade computes"
scm:
type: git
diff --git a/jenkins/client/job/deploy/update/upgrade_mcp_release.yml b/jenkins/client/job/deploy/update/upgrade_mcp_release.yml
index c9b846f..5968245 100644
--- a/jenkins/client/job/deploy/update/upgrade_mcp_release.yml
+++ b/jenkins/client/job/deploy/update/upgrade_mcp_release.yml
@@ -10,6 +10,11 @@
upgrade-mcp-release:
type: workflow-scm
concurrent: true
+ discard:
+ build:
+ keep_num: 10
+ artifact:
+ keep_num: 10
display_name: "Deploy - upgrade MCP Drivetrain"
scm:
type: git
diff --git a/jenkins/client/job/deploy/update/upgrade_opencontrail.yml b/jenkins/client/job/deploy/update/upgrade_opencontrail.yml
index de7e46f..0b0d945 100644
--- a/jenkins/client/job/deploy/update/upgrade_opencontrail.yml
+++ b/jenkins/client/job/deploy/update/upgrade_opencontrail.yml
@@ -10,6 +10,11 @@
deploy-upgrade-opencontrail:
type: workflow-scm
concurrent: true
+ discard:
+ build:
+ keep_num: 10
+ artifact:
+ keep_num: 10
display_name: "Deploy - upgrade Opencontrail"
scm:
type: git
diff --git a/jenkins/client/job/deploy/update/upgrade_opencontrail4_0.yml b/jenkins/client/job/deploy/update/upgrade_opencontrail4_0.yml
index f622371..c1f448c 100644
--- a/jenkins/client/job/deploy/update/upgrade_opencontrail4_0.yml
+++ b/jenkins/client/job/deploy/update/upgrade_opencontrail4_0.yml
@@ -10,6 +10,11 @@
deploy-upgrade-opencontrail40:
type: workflow-scm
concurrent: true
+ discard:
+ build:
+ keep_num: 10
+ artifact:
+ keep_num: 10
display_name: "Deploy - upgrade Opencontrail to 4.x"
scm:
type: git
diff --git a/jenkins/client/job/deploy/update/upgrade_ovs_gateway.yml b/jenkins/client/job/deploy/update/upgrade_ovs_gateway.yml
index e7cdb12..b0c92b7 100644
--- a/jenkins/client/job/deploy/update/upgrade_ovs_gateway.yml
+++ b/jenkins/client/job/deploy/update/upgrade_ovs_gateway.yml
@@ -10,6 +10,11 @@
deploy-upgrade-ovs-gateway:
type: workflow-scm
concurrent: true
+ discard:
+ build:
+ keep_num: 10
+ artifact:
+ keep_num: 10
display_name: "Deploy - upgrade OVS gateway"
scm:
type: git
diff --git a/jenkins/client/job/deploy/update/utils.yml b/jenkins/client/job/deploy/update/utils.yml
index 1a6062e..ca669d4 100644
--- a/jenkins/client/job/deploy/update/utils.yml
+++ b/jenkins/client/job/deploy/update/utils.yml
@@ -5,6 +5,11 @@
reclass_metadata_update:
type: workflow-scm
concurrent: true
+ discard:
+ build:
+ keep_num: 10
+ artifact:
+ keep_num: 10
display_name: "Deploy - Update reclass metadata"
scm:
type: git
@@ -28,6 +33,11 @@
salt_master_formula_update:
type: workflow-scm
concurrent: true
+ discard:
+ build:
+ keep_num: 10
+ artifact:
+ keep_num: 10
display_name: "Deploy - Update salt master formulas"
scm:
type: git
@@ -51,6 +61,11 @@
jenkins_master_job_update:
type: workflow-scm
concurrent: true
+ discard:
+ build:
+ keep_num: 10
+ artifact:
+ keep_num: 10
display_name: "Deploy - Update jenkins master jobs"
scm:
type: git
diff --git a/jenkins/client/job/deploy/update/virt_snapshot.yml b/jenkins/client/job/deploy/update/virt_snapshot.yml
index 0388ed1..be92c8d 100644
--- a/jenkins/client/job/deploy/update/virt_snapshot.yml
+++ b/jenkins/client/job/deploy/update/virt_snapshot.yml
@@ -10,6 +10,11 @@
manage-virt-snapshot:
type: workflow-scm
concurrent: true
+ discard:
+ build:
+ keep_num: 10
+ artifact:
+ keep_num: 10
display_name: "Deploy - virt snapshot VM"
scm:
type: git
diff --git a/jenkins/client/job/docker/opencontrail.yml b/jenkins/client/job/docker/opencontrail.yml
index b5052de..0e4f40a 100644
--- a/jenkins/client/job/docker/opencontrail.yml
+++ b/jenkins/client/job/docker/opencontrail.yml
@@ -6,7 +6,11 @@
name: "docker-build-images-opencontrail-{{version}}"
jobs:
- version: oc40
+ branch: master
- version: oc41
+ branch: master
+ - version: oc50
+ branch: R5.0
template:
discard:
build:
@@ -24,7 +28,7 @@
project:
"mk/docker-opencontrail":
branches:
- - master
+ - "{{branch}}"
event:
ref:
- updated: {}
@@ -44,6 +48,9 @@
IMAGE_CREDENTIALS_ID:
type: string
default: "gerrit"
+ IMAGE_BRANCH:
+ type: string
+ default: "{{branch}}"
APT_KEY:
type: string
default: "${_param:jenkins_aptly_url}/public.gpg"
diff --git a/jenkins/client/job/image/centos.yml b/jenkins/client/job/image/centos.yml
index d5856e4..5358d92 100644
--- a/jenkins/client/job/image/centos.yml
+++ b/jenkins/client/job/image/centos.yml
@@ -9,6 +9,11 @@
build-image-centos-7:
type: workflow-scm
concurrent: false
+ discard:
+ build:
+ keep_num: 5
+ artifact:
+ keep_num: 5
scm:
type: git
url: "${_param:jenkins_packer_pipeline}"
diff --git a/jenkins/client/job/image/debian.yml b/jenkins/client/job/image/debian.yml
index ab17c06..eef4740 100644
--- a/jenkins/client/job/image/debian.yml
+++ b/jenkins/client/job/image/debian.yml
@@ -9,6 +9,11 @@
build-image-debian-8:
type: workflow-scm
concurrent: false
+ discard:
+ build:
+ keep_num: 5
+ artifact:
+ keep_num: 5
scm:
type: git
url: "${_param:jenkins_packer_pipeline}"
diff --git a/jenkins/client/job/image/ubuntu.yml b/jenkins/client/job/image/ubuntu.yml
index 8d7e1de..e4a8251 100644
--- a/jenkins/client/job/image/ubuntu.yml
+++ b/jenkins/client/job/image/ubuntu.yml
@@ -88,6 +88,13 @@
build-image-ubuntu-16-04:
type: workflow-scm
concurrent: false
+ discard:
+ build:
+ keep_num: 5
+ keep_days: 5
+ artifact:
+ keep_num: 6
+ keep_days: 6
scm:
type: git
url: "${_param:jenkins_packer_pipeline}"
diff --git a/jenkins/client/job/opencontrail/build/generic.yml b/jenkins/client/job/opencontrail/build/generic.yml
index 1506326..0f130c4 100644
--- a/jenkins/client/job/opencontrail/build/generic.yml
+++ b/jenkins/client/job/opencontrail/build/generic.yml
@@ -140,7 +140,7 @@
build:
keep_num: 5
artifact:
- keep_num: 5
+ keep_num: 2
type: workflow-scm
concurrent: true
quiet_period: 120
diff --git a/jenkins/client/job/oscore/salt_virtual_models.yml b/jenkins/client/job/oscore/salt_virtual_models.yml
index 4377a7f..f315b3d 100644
--- a/jenkins/client/job/oscore/salt_virtual_models.yml
+++ b/jenkins/client/job/oscore/salt_virtual_models.yml
@@ -35,6 +35,10 @@
type: string
description: "Heat stack zone where build stack"
default: "mcp-oscore-ci"
+ HEAT_STACK_ENVIRONMENT:
+ type: string
+ description: "Heat stack env parameters for deployment"
+ default: "devcloud"
STACK_RECLASS_ADDRESS:
type: string
default: 'https://gerrit.mcp.mirantis.net/salt-models/mcp-virtual-lab'
diff --git a/jenkins/client/job/oscore/tests.yml b/jenkins/client/job/oscore/tests.yml
index 8bf6165..f4fb7e0 100644
--- a/jenkins/client/job/oscore/tests.yml
+++ b/jenkins/client/job/oscore/tests.yml
@@ -140,10 +140,6 @@
type: string
default: "salt-qa-credentials"
description: Jenkins credential ID for Salt master
- USE_RALLY:
- type: boolean
- description: Whether to use container with rally
- default: "{{use_rally}}"
TEST_MILESTONE:
type: string
description: Product milestone
@@ -279,10 +275,6 @@
type: string
default: "salt-qa-credentials"
description: Jenkins credential ID for Salt master
- USE_RALLY:
- type: boolean
- description: Whether to use container with rally
- default: "{{use_rally}}"
test-runner-template:
name: "{{job_prefix}}-{{test_type}}-runner"
template:
@@ -349,9 +341,6 @@
TEST_PATTERN:
type: string
description: Run tests matched to pattern only
- TEST_SET:
- type: string
- description: Run tests matched by tempest set only
TEST_CONCURRENCY:
type: string
description: How much test threads to run
@@ -375,10 +364,6 @@
type: boolean
description: Whether to use pepper to connect to salt master
default: 'false'
- USE_RALLY:
- type: boolean
- description: Whether to use container with rally
- default: 'true'
results-checker-template:
name: "{{job_prefix}}-{{test_type}}-results-checker"
template:
diff --git a/jenkins/client/job/salt-formulas/release.yml b/jenkins/client/job/salt-formulas/release.yml
index fe6df5e..eca83f6 100644
--- a/jenkins/client/job/salt-formulas/release.yml
+++ b/jenkins/client/job/salt-formulas/release.yml
@@ -5,6 +5,11 @@
release-salt-formulas:
type: workflow-scm
concurrent: false
+ discard:
+ build:
+ keep_num: 10
+ artifact:
+ keep_num: 10
scm:
type: git
url: "${_param:jenkins_gerrit_url}/mk/mk-pipelines"
diff --git a/jenkins/client/job/salt-formulas/tests.yml b/jenkins/client/job/salt-formulas/tests.yml
index f6c19f9..d1dc00b 100644
--- a/jenkins/client/job/salt-formulas/tests.yml
+++ b/jenkins/client/job/salt-formulas/tests.yml
@@ -160,7 +160,7 @@
param:
SALT_VERSION:
type: string
- default: "2017.7"
+ default: ""
description: "Version of salt for use in test, empty string means latest (default)"
SALT_OPTS:
type: string
diff --git a/jenkins/client/job/salt-models/generate.yml b/jenkins/client/job/salt-models/generate.yml
index 002c618..39af9b8 100644
--- a/jenkins/client/job/salt-models/generate.yml
+++ b/jenkins/client/job/salt-models/generate.yml
@@ -10,6 +10,11 @@
template:
type: workflow-scm
concurrent: true
+ discard:
+ build:
+ keep_num: 10
+ artifact:
+ keep_num: 10
display_name: "Generate reclass cluster {{cookiecutter_template}}"
scm:
type: git
diff --git a/jenkins/client/job/salt-models/git-mirrors.yml b/jenkins/client/job/salt-models/git-mirrors.yml
index a04043b..f567ba8 100644
--- a/jenkins/client/job/salt-models/git-mirrors.yml
+++ b/jenkins/client/job/salt-models/git-mirrors.yml
@@ -9,6 +9,11 @@
template:
type: workflow-scm
concurrent: false
+ discard:
+ build:
+ keep_num: 10
+ artifact:
+ keep_num: 10
scm:
type: git
url: "${_param:jenkins_gerrit_url}/mk/mk-pipelines"
diff --git a/jenkins/client/job/salt-models/tests.yml b/jenkins/client/job/salt-models/tests.yml
index f061e76..81dfd36 100644
--- a/jenkins/client/job/salt-models/tests.yml
+++ b/jenkins/client/job/salt-models/tests.yml
@@ -375,3 +375,28 @@
APT_REPOSITORY_GPG:
type: string
default: ""
+ test-mk-cookiecutter-templates-chunk:
+ name: test-mk-cookiecutter-templates-chunk
+ discard:
+ build:
+ keep_num: 300
+ artifact:
+ keep_num: 30
+ type: workflow-scm
+ concurrent: true
+ plugin_properties:
+ throttleconcurrents:
+ enabled: true
+ throttle_option: category
+ categories:
+ - test-model
+ scm:
+ type: git
+ url: "${_param:jenkins_gerrit_url}/mk/mk-pipelines"
+ branch: "${_param:jenkins_pipelines_branch}"
+ credentials: "gerrit"
+ script: test-cookiecutter-reclass-chunk.groovy
+ param:
+ EXTRA_VARIABLES_YAML:
+ type: string
+ default: ""
diff --git a/jenkins/client/job/validate.yml b/jenkins/client/job/validate.yml
index d1638a6..a020a73 100644
--- a/jenkins/client/job/validate.yml
+++ b/jenkins/client/job/validate.yml
@@ -168,6 +168,10 @@
type: string
default: ""
description: Path for reports outside docker image
+ SKIP_LIST:
+ type: string
+ description: "Skip list for Rally test"
+ default: ""
cvp-sanity:
type: workflow-scm
name: cvp-sanity
diff --git a/jenkins/master/config.yml b/jenkins/master/config.yml
index 41e3ffb..0eb465c 100644
--- a/jenkins/master/config.yml
+++ b/jenkins/master/config.yml
@@ -1,11 +1,3 @@
-parameters:
- linux:
- system:
- config:
- jenkins_master:
- grains:
- fqdn: dummy
- pillar:
- jenkins:
- master:
- home: /srv/volumes/jenkins
\ No newline at end of file
+# Deprecated. Please remove this include
+# from you'r cluster.
+# Related-Bug: PROD-21889 (PROD:21889)
diff --git a/kubernetes/common.yml b/kubernetes/common.yml
index ddf6973..60876ae 100644
--- a/kubernetes/common.yml
+++ b/kubernetes/common.yml
@@ -16,6 +16,7 @@
kubernetes_metallb_repo: metallb
kubernetes_sriov_repo: https://artifactory.mcp.mirantis.net/artifactory/binary-prod-local/mirantis/kubernetes/sriov-cni
kubernetes_cniplugins_repo: https://artifactory.mcp.mirantis.net/artifactory/binary-prod-local/mirantis/kubernetes/containernetworking-plugins
+ kubernetes_dashboard_repo: k8s.gcr.io
# component docker images
kubernetes_docker_package: docker-engine=1.13.1-0~ubuntu-xenial
@@ -45,8 +46,10 @@
kubernetes_sriov_source_hash: md5=c0cc33202afd02e4cc44b977a8faf6e7
kubernetes_cniplugins_source: ${_param:kubernetes_cniplugins_repo}/cni-plugins_v0.7.1-48-g696b1f9.tar.gz
kubernetes_cniplugins_source_hash: md5=5ec1cf5e989097c6127ea5365e277b02
+ kubernetes_dashboard_image: ${_param:kubernetes_dashboard_repo}/kubernetes-dashboard-amd64:v1.8.3
kubelet_fail_on_swap: true
+ kubernetes_dashboard_enabled: true
kubernetes_kubedns_enabled: true
kubernetes_externaldns_enabled: false
kubernetes_coredns_enabled: false
@@ -79,6 +82,9 @@
source: ${_param:kubernetes_cniplugins_source}
hash: ${_param:kubernetes_cniplugins_source_hash}
addons:
+ dashboard:
+ enabled: ${_param:kubernetes_dashboard_enabled}
+ image: ${_param:kubernetes_dashboard_image}
dns:
enabled: ${_param:kubernetes_kubedns_enabled}
kubedns_image: ${_param:kubernetes_kubedns_image}
@@ -97,7 +103,6 @@
enabled: ${_param:kubernetes_contrail_network_controller_enabled}
image: ${_param:kubernetes_contrail_network_controller_image}
flannel:
- enabled: ${_param:kubernetes_flannel_enabled}
image: ${_param:kubernetes_flannel_image}
virtlet:
enabled: ${_param:kubernetes_virtlet_enabled}
@@ -129,3 +134,5 @@
enabled: ${_param:kubernetes_sriov_enabled}
source: ${_param:kubernetes_sriov_source}
source_hash: ${_param:kubernetes_sriov_source_hash}
+ flannel:
+ enabled: ${_param:kubernetes_flannel_enabled}
diff --git a/kubernetes/master/common.yml b/kubernetes/master/common.yml
index 0923286..9e3748d 100644
--- a/kubernetes/master/common.yml
+++ b/kubernetes/master/common.yml
@@ -23,4 +23,6 @@
sriov:
enabled: ${_param:kubernetes_sriov_enabled}
source: ${_param:kubernetes_sriov_source}
- source_hash: ${_param:kubernetes_sriov_source_hash}
\ No newline at end of file
+ source_hash: ${_param:kubernetes_sriov_source_hash}
+ flannel:
+ enabled: ${_param:kubernetes_flannel_enabled}
diff --git a/salt/control/cluster/init.yml b/salt/control/cluster/init.yml
new file mode 100644
index 0000000..49d30b3
--- /dev/null
+++ b/salt/control/cluster/init.yml
@@ -0,0 +1,9 @@
+parameters:
+ _param:
+ salt_control_cluster_rng_backend: "/dev/random"
+ salt:
+ control:
+ cluster:
+ internal:
+ rng:
+ backend: ${_param:salt_control_cluster_rng_backend}
diff --git a/salt/control/cluster/kubernetes_control_cluster.yml b/salt/control/cluster/kubernetes_control_cluster.yml
new file mode 100644
index 0000000..c3049ec
--- /dev/null
+++ b/salt/control/cluster/kubernetes_control_cluster.yml
@@ -0,0 +1,29 @@
+parameters:
+ salt:
+ control:
+ size:
+ kubernetes.control:
+ cpu: 4
+ ram: 8192
+ disk_profile: small
+ net_profile: default
+ cluster:
+ internal:
+ domain: ${_param:cluster_domain}
+ engine: virt
+ node:
+ ctl01:
+ name: ${_param:kubernetes_control_node01_hostname}
+ provider: ${_param:infra_kvm_node01_hostname}.${_param:cluster_domain}
+ image: ${_param:salt_control_xenial_image}
+ size: kubernetes.control
+ ctl02:
+ name: ${_param:kubernetes_control_node02_hostname}
+ provider: ${_param:infra_kvm_node02_hostname}.${_param:cluster_domain}
+ image: ${_param:salt_control_xenial_image}
+ size: kubernetes.control
+ ctl03:
+ name: ${_param:kubernetes_control_node03_hostname}
+ provider: ${_param:infra_kvm_node03_hostname}.${_param:cluster_domain}
+ image: ${_param:salt_control_xenial_image}
+ size: kubernetes.control
diff --git a/salt/control/cluster/kubernetes_proxy_cluster.yml b/salt/control/cluster/kubernetes_proxy_cluster.yml
index d4251a2..379a333 100644
--- a/salt/control/cluster/kubernetes_proxy_cluster.yml
+++ b/salt/control/cluster/kubernetes_proxy_cluster.yml
@@ -3,8 +3,8 @@
control:
size:
kubernetes.proxy:
- cpu: 32
- ram: 65536
+ cpu: 2
+ ram: 4096
disk_profile: small
net_profile: default
cluster:
@@ -15,11 +15,11 @@
prx01:
name: ${_param:kubernetes_proxy_node01_hostname}
provider: ${_param:infra_kvm_node01_hostname}.${_param:cluster_domain}
- image: ${_param:salt_control_trusty_image}
+ image: ${_param:salt_control_xenial_image}
size: kubernetes.proxy
prx02:
name: ${_param:kubernetes_proxy_node02_hostname}
provider: ${_param:infra_kvm_node02_hostname}.${_param:cluster_domain}
- image: ${_param:salt_control_trusty_image}
+ image: ${_param:salt_control_xenial_image}
size: kubernetes.proxy