Merge "changed apt_mk ubuntu url"
diff --git a/.releasenotes/notes/raise-telegraf-version-a3e797a577b7e555.yaml b/.releasenotes/notes/raise-telegraf-version-a3e797a577b7e555.yaml
new file mode 100644
index 0000000..129681a
--- /dev/null
+++ b/.releasenotes/notes/raise-telegraf-version-a3e797a577b7e555.yaml
@@ -0,0 +1,9 @@
+---
+summary: >
+ Updated Telegraf to version 1.5
+
+upgrades:
+ - |
+ 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/debian/packages/extra.yml b/jenkins/client/job/debian/packages/extra.yml
index 1fdc6c5..383a2d3 100644
--- a/jenkins/client/job/debian/packages/extra.yml
+++ b/jenkins/client/job/debian/packages/extra.yml
@@ -148,11 +148,11 @@
- package: telegraf
dist: trusty
build: telegraf
- branch: release-1.2
+ branch: release-1.5
- package: telegraf
dist: xenial
build: telegraf
- branch: release-1.2
+ branch: release-1.5
- package: libvirt-exporter
dist: xenial
build: libvirt-exporter
diff --git a/jenkins/client/job/debian/packages/salt-multi.yml b/jenkins/client/job/debian/packages/salt-multi.yml
index c0fb0f4..90e6f02 100644
--- a/jenkins/client/job/debian/packages/salt-multi.yml
+++ b/jenkins/client/job/debian/packages/salt-multi.yml
@@ -56,6 +56,9 @@
- name: kubernetes
upload_source_package: true
dist: xenial
+ - name: mirascan
+ upload_source_package: true
+ dist: xenial
- name: neutron
upload_source_package: true
dist: xenial
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/jenkins/client/job/salt-formulas/tests.yml b/jenkins/client/job/salt-formulas/tests.yml
index 6333e6e..b5c596b 100644
--- a/jenkins/client/job/salt-formulas/tests.yml
+++ b/jenkins/client/job/salt-formulas/tests.yml
@@ -72,6 +72,7 @@
- name: magnum
- name: memcached
- name: midonet
+ - name: mirascan
- name: monasca
- name: mongodb
- name: murano
diff --git a/keystone/client/single.yml b/keystone/client/single.yml
index 0c70390..ebf5b5f 100644
--- a/keystone/client/single.yml
+++ b/keystone/client/single.yml
@@ -6,7 +6,6 @@
- system.keystone.client.service.heat-cfn
- system.keystone.client.service.keystone
- system.keystone.client.service.neutron
-- system.keystone.client.service.nova-ec2
parameters:
linux:
system:
diff --git a/maas/region/restoredb.yml b/maas/region/restoredb.yml
new file mode 100644
index 0000000..df4ff95
--- /dev/null
+++ b/maas/region/restoredb.yml
@@ -0,0 +1,9 @@
+classes:
+- system.maas.region.single
+parameters:
+ maas:
+ region:
+ database:
+ initial_data:
+ source: ${linux:network:fqdn}
+ host: ${_param:backupninja_backup_host}
\ No newline at end of file
diff --git a/maas/region/single.yml b/maas/region/single.yml
index 20779aa..3fdc105 100644
--- a/maas/region/single.yml
+++ b/maas/region/single.yml
@@ -36,7 +36,7 @@
dnssec_validation: 'no'
enable_third_party_drivers: true
maas_name: mas01
- active_discovery_interval: '600'
+ active_discovery_interval: 600
ntp_external_only: true
upstream_dns: ${_param:dns_server01}
enable_http_proxy: false
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