Merge "Define Helm parameters for k8s." into release/2019.2.0
diff --git a/backupninja/server/single.yml b/backupninja/server/single.yml
index 9897a6c..ac008d5 100644
--- a/backupninja/server/single.yml
+++ b/backupninja/server/single.yml
@@ -1,2 +1,9 @@
classes:
- service.backupninja.server.single
+parameters:
+ backupninja:
+ server:
+ home_dir: /srv/volumes/backup/backupninja
+ key:
+ backupninja_pub_key:
+ key: ${_param:backupninja_public_key}
\ No newline at end of file
diff --git a/defaults/backupninja.yml b/defaults/backupninja.yml
new file mode 100644
index 0000000..e89ed86
--- /dev/null
+++ b/defaults/backupninja.yml
@@ -0,0 +1,4 @@
+parameters:
+ _param:
+ backupninja_engine: rsync
+ backupninja_public_key: no-key-provided
diff --git a/defaults/docker_images.yml b/defaults/docker_images.yml
index 03db6c3..35c44a9 100644
--- a/defaults/docker_images.yml
+++ b/defaults/docker_images.yml
@@ -16,8 +16,8 @@
docker_image_gerrit: "${_param:mcp_docker_registry}/mirantis/cicd/gerrit:${_param:mcp_version}"
# mysql:5.6
docker_image_mysql: "${_param:mcp_docker_registry}/mirantis/cicd/mysql:${_param:mcp_version}"
- # jenkins:2.121.3
- docker_image_jenkins: "${_param:mcp_docker_registry}/mirantis/cicd/jenkins:${_param:mcp_version}"
+ # jenkins:2.150.3
+ docker_image_jenkins: "${_param:mcp_docker_registry}/mirantis/cicd/jenkins:2019.2.3"
docker_image_jenkins_slave: "${_param:mcp_docker_registry}/mirantis/cicd/jnlp-slave:${_param:mcp_version}"
# model-generator
docker_image_operations_api: "${_param:mcp_docker_registry}/mirantis/model-generator/operations-api:${_param:mcp_version}"
@@ -27,6 +27,7 @@
docker_image_alerta: "${_param:mcp_docker_registry}/mirantis/external/alerta-web:${_param:mcp_version}"
docker_image_alertmanager: "${_param:mcp_docker_registry}/openstack-docker/alertmanager:${_param:mcp_version}"
docker_image_grafana: "${_param:mcp_docker_registry}/openstack-docker/grafana:${_param:mcp_version}"
+ docker_image_prometheus_es_exporter: "${_param:mcp_docker_registry}/mirantis/external/braedon/prometheus-es-exporter:0.5.1"
docker_image_prometheus: "${_param:mcp_docker_registry}/openstack-docker/prometheus:${_param:mcp_version}"
docker_image_prometheus_gainsight: "${_param:mcp_docker_registry}/openstack-docker/gainsight:${_param:mcp_version}"
docker_image_prometheus_gainsight_elasticsearch: "${_param:mcp_docker_registry}/openstack-docker/gainsight_elasticsearch:${_param:mcp_version}"
@@ -134,6 +135,10 @@
- registry: ${_param:mcp_docker_registry}/openstack-docker
target_registry: ${_param:default_local_mirrror_content:docker_client_registry_target_registry}/openstack-docker
name: gainsight_elasticsearch:${_param:mcp_version}
+ - registry: ${_param:mcp_docker_registry}/mirantis/external/braedon
+ target_registry: ${_param:default_local_mirrror_content:docker_client_registry_target_registry}/mirantis/external/braedon
+ name: prometheus-es-exporter:0.5.1
+
# QA\CVP tool-set's
- registry: ${_param:mcp_docker_registry}/mirantis/oss
target_registry: ${_param:default_local_mirrror_content:docker_client_registry_target_registry}/mirantis/oss
diff --git a/defaults/init.yml b/defaults/init.yml
index 109c181..733bfe2 100644
--- a/defaults/init.yml
+++ b/defaults/init.yml
@@ -8,6 +8,7 @@
classes:
- system.defaults.linux_system_repo
- system.defaults.linux_system_file
+- system.defaults.backupninja
- system.defaults.git
- system.defaults.jenkins
- system.defaults.maas
@@ -20,6 +21,7 @@
- system.defaults.keepalived
- system.defaults.salt
- system.defaults.stacklight
+- system.defaults.xtrabackup
parameters:
_param:
mcp_version: stable
diff --git a/defaults/xtrabackup.yml b/defaults/xtrabackup.yml
new file mode 100644
index 0000000..e2bf995
--- /dev/null
+++ b/defaults/xtrabackup.yml
@@ -0,0 +1,6 @@
+parameters:
+ _param:
+ xtrabackup_qpress_source: pkg
+ xtrabackup_qpress_source_name: qpress
+ xtrabackup_public_key: no-key-provided
+ xtrabackup_remote_server: cfg01
diff --git a/etcd/server/cluster.yml b/etcd/server/cluster.yml
index d9c1c8b..af210d7 100644
--- a/etcd/server/cluster.yml
+++ b/etcd/server/cluster.yml
@@ -4,10 +4,10 @@
- service.etcd.linux
parameters:
_param:
- docker_image_etcd: quay.io/coreos/etcd:v3.3.10
+ docker_image_etcd: quay.io/coreos/etcd:v3.3.12
kubernetes_etcd_repo: https://github.com/etcd-io/etcd/releases/download
- kubernetes_etcd_source: ${_param:kubernetes_etcd_repo}/v3.3.10/etcd-v3.3.10-linux-amd64.tar.gz
- kubernetes_etcd_source_hash: md5=dbbe0d021ba497bf9d9cc9963d0c7a4b
+ kubernetes_etcd_source: ${_param:kubernetes_etcd_repo}/v3.3.12/etcd-v3.3.12-linux-amd64.tar.gz
+ kubernetes_etcd_source_hash: md5=079af00546443b686df31e7ec605135e
etcd:
server:
enabled: true
diff --git a/jenkins/client/init.yml b/jenkins/client/init.yml
index 0bb19db..59faa0b 100644
--- a/jenkins/client/init.yml
+++ b/jenkins/client/init.yml
@@ -26,6 +26,9 @@
url: ${_param:jenkins_gerrit_url}/mcp-ci/pipeline-library
credential_id: gerrit
branch: ${_param:jenkins_pipelines_branch}
+ theme:
+ css_url: '/userContent/theme/mirantis.css'
+ js_url: '/userContent/theme/mirantis.js'
view:
Mirrors:
enabled: true
diff --git a/jenkins/client/job/deploy/update/kubernetes_update.yml b/jenkins/client/job/deploy/update/kubernetes_update.yml
index 7829b41..454d92b 100644
--- a/jenkins/client/job/deploy/update/kubernetes_update.yml
+++ b/jenkins/client/job/deploy/update/kubernetes_update.yml
@@ -4,8 +4,6 @@
parameters:
_param:
jenkins_salt_api_url: "http://${_param:salt_master_host}:6969"
- kubernetes_hyperkube_repo: ${_param:mcp_docker_registry}/mirantis/kubernetes
- kubernetes_calico_repo: ${_param:mcp_docker_registry}/mirantis/projectcalico/calico
jenkins:
client:
job:
@@ -127,3 +125,11 @@
type: string
default: ""
description: "Versioned calico/kube-controllers image. Should be null if update rolling via reclass-system level"
+ KUBERNETES_ETCD_SOURCE:
+ type: string
+ default: ""
+ description: "Versioned binary for etcd server. Should be null if update rolling via reclass-system level"
+ KUBERNETES_ETCD_SOURCE_HASH:
+ type: string
+ default: ""
+ description: "Checksum of etcd binary. Should be null if update rolling via reclass-system level"
diff --git a/kubernetes/common/init.yml b/kubernetes/common/init.yml
index 7fa0770..3b24a01 100644
--- a/kubernetes/common/init.yml
+++ b/kubernetes/common/init.yml
@@ -40,7 +40,7 @@
kubernetes_hyperkube_source: ${_param:kubernetes_hyperkube_repo}/hyperkube_v1.12.6-5_1551704156632
kubernetes_hyperkube_source_hash: md5=ced3e283c3167c551c581047ed9ab71b
kubernetes_pause_image: ${_param:mcp_docker_registry}/mirantis/kubernetes/pause-amd64:v1.12.6-5
- kubernetes_virtlet_image: ${_param:kubernetes_virtlet_repo}/virtlet:v1.4.4
+ kubernetes_virtlet_image: ${_param:kubernetes_virtlet_repo}/virtlet:v1.5.0
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
diff --git a/linux/system/single/mcp.yml b/linux/system/single/mcp.yml
index a77459d..73de373 100644
--- a/linux/system/single/mcp.yml
+++ b/linux/system/single/mcp.yml
@@ -42,6 +42,9 @@
- type: hard
item: nproc
value: 307200
+ package:
+ smartmontools:
+ version: latest
systemd:
system:
Manager:
diff --git a/prometheus/gainsight/query/openstack.yml b/prometheus/gainsight/query/openstack.yml
index 877ad32..40a804b 100644
--- a/prometheus/gainsight/query/openstack.yml
+++ b/prometheus/gainsight/query/openstack.yml
@@ -8,7 +8,7 @@
vstorage_free: "'vStorage Free','avg(sum(avg_over_time(openstack_nova_free_disk[24h])) by (instance))'"
vram_used: "'vRAM Used','avg(sum(avg_over_time(openstack_nova_used_ram[24h])) by (instance))'"
vram_free: "'vRAM Free','avg(sum(avg_over_time(openstack_nova_free_ram[24h])) by (instance))'"
- instances: "'Active Instances','avg(sum(avg_over_time(openstack_nova_instances{state=\"active\"}[24h])) by (instance))'"
+ instances: "'Instances','avg(sum(avg_over_time(openstack_nova_instances{state=\"active\"}[24h])) by (instance))'"
compute_nodes: "'Compute Nodes','avg(sum(openstack_nova_services{binary=~\"nova.compute\"}) by (instance))'"
tenants: "'Tenants','avg(sum(avg_over_time(openstack_keystone_tenants_total[24h])) by (instance))'"
cinder_api: "'Cinder API','avg(avg_over_time(openstack_api_check_status{name=\"cinderv2\"}[24h]))'"
diff --git a/xtrabackup/server/single.yml b/xtrabackup/server/single.yml
index ad06a94..92d9fc3 100644
--- a/xtrabackup/server/single.yml
+++ b/xtrabackup/server/single.yml
@@ -1,9 +1,12 @@
classes:
- service.xtrabackup.server.single
parameters:
- _param:
- xtrabackup_qpress_source: pkg
- xtrabackup_qpress_source_name: qpress
+ xtrabackup:
+ server:
+ backup_dir: /srv/volumes/backup/xtrabackup
+ key:
+ xtrabackup_pub_key:
+ key: ${_param:xtrabackup_public_key}
linux:
system:
cron: