Merge "Add jobs for salt-formulas-mirascan"
diff --git a/.releasenotes/notes/raise-telegraf-version-a3e797a577b7e555.yaml b/.releasenotes/notes/raise-telegraf-version-a3e797a577b7e555.yaml
index d86ce11..129681a 100644
--- a/.releasenotes/notes/raise-telegraf-version-a3e797a577b7e555.yaml
+++ b/.releasenotes/notes/raise-telegraf-version-a3e797a577b7e555.yaml
@@ -1,9 +1,9 @@
---
summary: >
- Bumped the telegraf version to 1.5
+ Updated Telegraf to version 1.5
upgrades:
- |
- Changed the branch for the telegraf build deb package job from release-1.2
- to release-1.5. New branch contains the upstream release-1.5 branch and all
- downstream changes and modifications.
+ Changed the branch for building of the Telegraf package from v1.2 to
+ v1.5. The new branch includes the upstream release 1.5 branch and all
+ downstream improvements. By default, Telegraf v1.5 is installed.
diff --git a/jenkins/client/job/ceph/upgrade.yml b/jenkins/client/job/ceph/upgrade.yml
index d2fabfc..7717761 100644
--- a/jenkins/client/job/ceph/upgrade.yml
+++ b/jenkins/client/job/ceph/upgrade.yml
@@ -72,4 +72,4 @@
BACKUP_ENABLED:
type: boolean
default: 'true'
- description: Set to True if disks of Ceph VMs should be copied before upgrade
+ description: Select to copy the disks of Ceph VMs before upgrade and backup Ceph directories on OSD nodes.
diff --git a/jenkins/client/job/deploy/lab/deploy.yml b/jenkins/client/job/deploy/lab/deploy.yml
index a6f6abe..751089a 100644
--- a/jenkins/client/job/deploy/lab/deploy.yml
+++ b/jenkins/client/job/deploy/lab/deploy.yml
@@ -96,7 +96,11 @@
description: "Formulas revision to install on Salt Master bootstrap stage"
EXTRA_FORMULAS:
type: string
- default: "maas memcached ntp nginx collectd sensu heka sphinx mysql grafana libvirt rsyslog glusterfs postfix xtrabackup freeipa prometheus telegraf elasticsearch kibana rundeck devops-portal rsync docker keepalived aptly jenkins gerrit artifactory influxdb horizon"
+ default: "maas memcached ntp nginx collectd sensu heka sphinx mysql grafana libvirt rsyslog glusterfs postfix xtrabackup freeipa prometheus telegraf elasticsearch kibana rundeck devops-portal rsync docker keepalived aptly jenkins gerrit artifactory influxdb horizon ceph"
+ STATIC_MGMT_NETWORK:
+ type: boolean
+ default: 'false'
+ description: "Check if model contains static IP address definitions for all nodes"
# aws api
AWS_STACK_REGION:
diff --git a/jenkins/client/job/deploy/openstack.yml b/jenkins/client/job/deploy/openstack.yml
index 7fdda92..3595e01 100644
--- a/jenkins/client/job/deploy/openstack.yml
+++ b/jenkins/client/job/deploy/openstack.yml
@@ -35,6 +35,10 @@
ASK_ON_ERROR:
type: boolean
default: 'false'
+ STATIC_MGMT_NETWORK:
+ type: boolean
+ default: 'false'
+ description: "Check if model contains static IP address definitions for all nodes"
deploy-openstack-compute:
type: workflow-scm
concurrent: true
diff --git a/jenkins/client/job/docker/build-images.yml b/jenkins/client/job/docker/build-images.yml
index 61f1e6d..334db19 100644
--- a/jenkins/client/job/docker/build-images.yml
+++ b/jenkins/client/job/docker/build-images.yml
@@ -7,10 +7,13 @@
jobs:
- name: aptly
repo: mk
+ build_trigger: ""
- name: ci
repo: mk
+ build_trigger: "H H(20-23) * * *"
- name: prometheus
repo: mcp
+ build_trigger: ""
template:
discard:
build:
@@ -32,6 +35,8 @@
event:
ref:
- updated: {}
+ pollscm:
+ spec: "{{build_trigger}}"
param:
IMAGE_GIT_URL:
type: string
diff --git a/openssh/server/team/members/dkruglov.yml b/openssh/server/team/members/dkruglov.yml
index 358e365..1df2a6b 100644
--- a/openssh/server/team/members/dkruglov.yml
+++ b/openssh/server/team/members/dkruglov.yml
@@ -11,7 +11,6 @@
email: dkruglov@mirantis.com
openssh:
server:
- enabled: true
user:
dkruglov:
enabled: true
diff --git a/openssh/server/team/services.yml b/openssh/server/team/services.yml
index ea34889..7d71d98 100644
--- a/openssh/server/team/services.yml
+++ b/openssh/server/team/services.yml
@@ -9,6 +9,7 @@
- system.openssh.server.team.members.miwinski
- system.openssh.server.team.members.mlos
- system.openssh.server.team.members.dbogaczyk
+- system.openssh.server.team.members.dkruglov
parameters:
_param:
linux_system_user_sudo: true