Merge "Switch Elasticsearch and Kibana to 5 version"
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/docker/client/compose/service/gerrit.yml b/docker/client/compose/service/gerrit.yml
index 183f57d..eeb126e 100644
--- a/docker/client/compose/service/gerrit.yml
+++ b/docker/client/compose/service/gerrit.yml
@@ -65,6 +65,12 @@
- 13306:3306
volumes:
- /srv/volumes/mysql:/var/lib/mysql
+ network:
+ default:
+ ipam:
+ driver: default
+ config:
+ - subnet: 172.30.0.0/24
linux:
system:
directory:
diff --git a/fluentd/label/default_output/drop_event.yml b/fluentd/label/default_output/drop_event.yml
new file mode 100644
index 0000000..295862c
--- /dev/null
+++ b/fluentd/label/default_output/drop_event.yml
@@ -0,0 +1,17 @@
+agent:
+ config:
+ label:
+ default_output:
+ filter:
+ drop_event:
+ tag: '**'
+ type: grep
+ exclude:
+ - name: drop_event
+ regexp: ^.+?$
+ remove_drop_event_key:
+ require:
+ - drop_event
+ tag: '**'
+ type: record_transformer
+ remove_keys: drop_event
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/docker/opencontrail.yml b/jenkins/client/job/docker/opencontrail.yml
index b5a6c93..53a76e0 100644
--- a/jenkins/client/job/docker/opencontrail.yml
+++ b/jenkins/client/job/docker/opencontrail.yml
@@ -29,29 +29,23 @@
- updated: {}
comment:
- addedContains:
- commentAddedCommentContains: '(buildcontainer)'
+ commentAddedCommentContains: '(buildcontainer|test|recheck|verify|)'
param:
IMAGE_GIT_URL:
type: string
- default: "${_param:jenkins_gerrit_url}/mk/docker-opencontrail-{{version}}"
+ default: "${_param:jenkins_gerrit_url}/mk/docker-opencontrail"
OC_VERSION:
type: string
default: "{{version}}"
IMAGE_CREDENTIALS_ID:
type: string
default: "gerrit"
- IMAGE_TAGS:
+ APT_KEY:
type: string
- default: "latest"
- REGISTRY_URL:
+ default: "${_param:jenkins_aptly_url}/public.gpg"
+ APT_REPO_URL:
type: string
- default: ""
+ default: "${_param:jenkins_aptly_url}/xenial/ nightly"
REGISTRY_CREDENTIALS_ID:
type: string
default: "dockerhub"
- DOCKER_GIT_TAG:
- type: boolean
- default: "true"
- EXTRA_REPO_URL:
- type: string
- default: "${_param:jenkins_aptly_url}"
diff --git a/jenkins/client/job/git-mirrors/2way.yml b/jenkins/client/job/git-mirrors/2way.yml
index ef1515b..330abc2 100644
--- a/jenkins/client/job/git-mirrors/2way.yml
+++ b/jenkins/client/job/git-mirrors/2way.yml
@@ -31,6 +31,11 @@
github:
pollscm:
spec: ${_param:jenkins_pollscm_spec}
+ gerrit:
+ project:
+ "{{source}}":
+ branches:
+ - master
param:
SOURCE_URL:
type: string
diff --git a/jenkins/client/job/oscore/security_tests.yml b/jenkins/client/job/oscore/security_tests.yml
index cfa90bf..e8e0547 100644
--- a/jenkins/client/job/oscore/security_tests.yml
+++ b/jenkins/client/job/oscore/security_tests.yml
@@ -11,7 +11,8 @@
artifact:
keep_num: 30
type: workflow-scm
- concurrent: true
+ # Downstream jobs are uploading reports, so shouldn't be concurrent
+ concurrent: false
scm:
type: git
url: "${_param:jenkins_gerrit_url}/openstack-ci/openstack-pipelines.git"
@@ -74,6 +75,22 @@
type: string
description: Format for generated report(csv,html,json)
default: "csv"
+ UPLOAD_REPORT:
+ type: boolean
+ description: Whether to upload report
+ default: "true"
+ REPORT_HOST:
+ type: string
+ description: Reporting tool hostname
+ default: "cve-slave01-bud.infra.mirantis.net"
+ REPORT_USER:
+ type: string
+ description: User for uploading results to reporting tool
+ default: "bandit"
+ UPLOAD_CREDENTIALS_ID:
+ type: string
+ description: Credentials for uploading report
+ default: "bandit"
bandit-scanner-template-upstream:
name: "{{job_prefix}}-bandit-upstream-{{project}}"
template:
diff --git a/jenkins/client/job/oscore/tests.yml b/jenkins/client/job/oscore/tests.yml
index 85346e1..ae7d44d 100644
--- a/jenkins/client/job/oscore/tests.yml
+++ b/jenkins/client/job/oscore/tests.yml
@@ -50,6 +50,14 @@
type: boolean
default: 'false'
description: Don't enable it if you need to use the lab after
+ STACK_RECLASS_ADDRESS:
+ type: string
+ default: '{{stack_reclass_address}}'
+ description: 'Url to repository with stack salt models'
+ STACK_RECLASS_BRANCH:
+ type: string
+ default: '{{stack_reclass_branch}}'
+ description: 'Branch of repository with stack salt models'
STACK_CLEANUP_JOB:
type: string
default: "{{stack_cleanup_job}}"
diff --git a/jenkins/client/job/salt-formulas/git-mirrors/2way.yml b/jenkins/client/job/salt-formulas/git-mirrors/2way.yml
index c00c707..960941a 100644
--- a/jenkins/client/job/salt-formulas/git-mirrors/2way.yml
+++ b/jenkins/client/job/salt-formulas/git-mirrors/2way.yml
@@ -251,6 +251,11 @@
github:
pollscm:
spec: ${_param:jenkins_pollscm_spec}
+ gerrit:
+ project:
+ salt-formulas/{{name}}:
+ branches:
+ - master
param:
SOURCE_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/linux/system/repo/mcp/apt_mirantis/ubuntu.yml b/linux/system/repo/mcp/apt_mirantis/ubuntu.yml
index 2203e07..e254ed6 100644
--- a/linux/system/repo/mcp/apt_mirantis/ubuntu.yml
+++ b/linux/system/repo/mcp/apt_mirantis/ubuntu.yml
@@ -5,17 +5,20 @@
system:
repo:
ubuntu:
- source: "deb [arch=amd64] http://apt.mirantis.com/${_param:linux_system_codename}/ubuntu/ ${_param:apt_mk_version} main restricted universe"
+ source: "deb [arch=amd64] http://mirror.mirantis.com/${_param:apt_mk_version}/ubuntu/ ${_param:linux_system_codename} main restricted universe"
architectures: amd64
default: true
- key_url: "http://apt.mirantis.com/public.gpg"
+ key_id: 437D05B5
+ key_server: keyserver.ubuntu.com
ubuntu_updates:
- source: "deb [arch=amd64] http://apt.mirantis.com/${_param:linux_system_codename}/ubuntu/updates/ ${_param:apt_mk_version} main restricted universe"
+ source: "deb [arch=amd64] http://mirror.mirantis.com/${_param:apt_mk_version}/ubuntu/ ${_param:linux_system_codename}-updates main restricted universe"
architectures: amd64
default: true
- key_url: "http://apt.mirantis.com/public.gpg"
+ key_id: 437D05B5
+ key_server: keyserver.ubuntu.com
ubuntu_security:
- source: "deb [arch=amd64] http://apt.mirantis.com/${_param:linux_system_codename}/ubuntu/security/ ${_param:apt_mk_version} main restricted universe"
+ source: "deb [arch=amd64] http://mirror.mirantis.com/${_param:apt_mk_version}/ubuntu/ ${_param:linux_system_codename}-security main restricted universe"
architectures: amd64
default: true
- key_url: "http://apt.mirantis.com/public.gpg"
\ No newline at end of file
+ key_id: 437D05B5
+ key_server: keyserver.ubuntu.com
\ No newline at end of file
diff --git a/linux/system/repo_local/ubuntu.yml b/linux/system/repo_local/ubuntu.yml
index d510183..46994ee 100644
--- a/linux/system/repo_local/ubuntu.yml
+++ b/linux/system/repo_local/ubuntu.yml
@@ -20,4 +20,3 @@
architectures: amd64
default: true
key_url: "http://${_param:local_repo_url}/public.gpg"
-
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/neutron/compute/nfv/dpdk.yml b/neutron/compute/nfv/dpdk.yml
index c8872c7..0901bb8 100644
--- a/neutron/compute/nfv/dpdk.yml
+++ b/neutron/compute/nfv/dpdk.yml
@@ -1,4 +1,6 @@
parameters:
+ _param:
+ compute_ovs_vhost_socket_dir: "/run/openvswitch-vhost"
linux:
network:
bridge: openvswitch
@@ -12,7 +14,8 @@
memory_channels: "${_param:compute_ovs_memory_channels}"
vhost_socket_dir:
name: "openvswitch-vhost"
- path: "/run/openvswitch-vhost"
+ path: "${_param:compute_ovs_vhost_socket_dir}"
neutron:
compute:
dpdk: True
+ vhost_socket_dir: "${_param:compute_ovs_vhost_socket_dir}"
diff --git a/opencontrail/control/analytics4_0.yml b/opencontrail/control/analytics4_0.yml
index c38e06a..4ec9b4c 100644
--- a/opencontrail/control/analytics4_0.yml
+++ b/opencontrail/control/analytics4_0.yml
@@ -15,6 +15,8 @@
opencontrail_message_queue_address: ${_param:openstack_message_queue_address}
opencontrail_analytics_image: docker-prod-local.artifactory.mirantis.com/opencontrail/opencontrail-analytics
opencontrail_analyticsdb_image: docker-prod-local.artifactory.mirantis.com/opencontrail/opencontrail-analyticsdb
+ opencontrail_analytics_container_name: opencontrail_analytics_1
+ opencontrail_analyticsdb_container_name: opencontrail_analyticsdb_1
# Temprorary fix for MOS9 packages to pin old version of kafka
linux:
system:
@@ -68,12 +70,13 @@
docker:
client:
compose:
- opencontrail_api:
+ opencontrail:
status: up
pull: true
service:
analytics:
image: ${_param:opencontrail_analytics_image}
+ container_name: ${_param:opencontrail_analytics_container_name}
network_mode: "host"
privileged: true
volumes:
@@ -81,6 +84,7 @@
- /etc/redis/redis.conf:/etc/redis/redis.conf
analyticsdb:
image: ${_param:opencontrail_analyticsdb_image}
+ container_name: ${_param:opencontrail_analyticsdb_container_name}
volumes:
- /etc/cassandra/cassandra-env-analytics.sh:/etc/cassandra/cassandra-env.sh
- /etc/cassandra/cassandra_analytics.yaml:/etc/cassandra/cassandra.yaml
diff --git a/opencontrail/control/cluster4_0.yml b/opencontrail/control/cluster4_0.yml
index 92a6a17..611eb24 100644
--- a/opencontrail/control/cluster4_0.yml
+++ b/opencontrail/control/cluster4_0.yml
@@ -17,6 +17,9 @@
opencontrail_analytics_image: docker-prod-local.artifactory.mirantis.com/opencontrail/opencontrail-analytics
opencontrail_analyticsdb_image: docker-prod-local.artifactory.mirantis.com/opencontrail/opencontrail-analyticsdb
opencontrail_controller_image: docker-prod-local.artifactory.mirantis.com/opencontrail/opencontrail-controller
+ opencontrail_controller_container_name: opencontrail_controller_1
+ opencontrail_analytics_container_name: opencontrail_analytics_1
+ opencontrail_analyticsdb_container_name: opencontrail_analyticsdb_1
analytics_vip_address: ${_param:opencontrail_analytics_address}
# Temprorary fix for MOS9 packages to pin old version of kafka
linux:
@@ -125,12 +128,13 @@
docker:
client:
compose:
- opencontrail_api:
+ opencontrail:
status: up
pull: true
service:
controller:
image: ${_param:opencontrail_controller_image}
+ container_name: ${_param:opencontrail_controller_container_name}
volumes:
- /etc/contrail:/etc/contrail
- /var/lib/configdb:/var/lib/cassandra
@@ -145,6 +149,7 @@
privileged: true
analytics:
image: ${_param:opencontrail_analytics_image}
+ container_name: ${_param:opencontrail_analytics_container_name}
network_mode: "host"
privileged: true
volumes:
@@ -152,6 +157,7 @@
- /etc/redis/redis.conf:/etc/redis/redis.conf
analyticsdb:
image: ${_param:opencontrail_analyticsdb_image}
+ container_name: ${_param:opencontrail_analyticsdb_container_name}
volumes:
- /etc/cassandra/cassandra-env-analytics.sh:/etc/cassandra/cassandra-env.sh
- /etc/cassandra/cassandra_analytics.yaml:/etc/cassandra/cassandra.yaml
diff --git a/opencontrail/control/control4_0.yml b/opencontrail/control/control4_0.yml
index f1d603c..2fe76e8 100644
--- a/opencontrail/control/control4_0.yml
+++ b/opencontrail/control/control4_0.yml
@@ -10,6 +10,7 @@
opencontrail_message_queue_node02_address: ${_param:openstack_message_queue_node02_address}
opencontrail_message_queue_node03_address: ${_param:openstack_message_queue_node03_address}
opencontrail_controller_image: docker-prod-local.artifactory.mirantis.com/opencontrail/opencontrail-controller
+ opencontrail_controller_container_name: opencontrail_controller_1
analytics_vip_address: ${_param:opencontrail_analytics_address}
opencontrail:
common:
@@ -87,12 +88,13 @@
docker:
client:
compose:
- opencontrail_api:
+ opencontrail:
status: up
pull: true
service:
controller:
image: ${_param:opencontrail_controller_image}
+ container_name: ${_param:opencontrail_controller_container_name}
volumes:
- /etc/contrail:/etc/contrail
- /var/lib/configdb:/var/lib/cassandra
diff --git a/opencontrail/control/single4_0.yml b/opencontrail/control/single4_0.yml
index a9ae787..fcbd6af 100644
--- a/opencontrail/control/single4_0.yml
+++ b/opencontrail/control/single4_0.yml
@@ -10,6 +10,9 @@
opencontrail_analytics_image: docker-prod-local.artifactory.mirantis.com/opencontrail/opencontrail-analytics
opencontrail_analyticsdb_image: docker-prod-local.artifactory.mirantis.com/opencontrail/opencontrail-analyticsdb
opencontrail_controller_image: docker-prod-local.artifactory.mirantis.com/opencontrail/opencontrail-controller
+ opencontrail_controller_container_name: opencontrail_controller_1
+ opencontrail_analytics_container_name: opencontrail_analytics_1
+ opencontrail_analyticsdb_container_name: opencontrail_analyticsdb_1
# Temprorary fix for MOS9 packages to pin old version of kafka
linux:
system:
@@ -156,12 +159,13 @@
docker:
client:
compose:
- opencontrail_api:
+ opencontrail:
status: up
pull: true
service:
controller:
image: ${_param:opencontrail_controller_image}
+ container_name: ${_param:opencontrail_controller_container_name}
volumes:
- /etc/contrail:/etc/contrail
- /var/lib/configdb:/var/lib/cassandra
@@ -176,6 +180,7 @@
privileged: true
analytics:
image: ${_param:opencontrail_analytics_image}
+ container_name: ${_param:opencontrail_analytics_container_name}
network_mode: "host"
privileged: true
volumes:
@@ -183,6 +188,7 @@
- /etc/redis/redis.conf:/etc/redis/redis.conf
analyticsdb:
image: ${_param:opencontrail_analyticsdb_image}
+ container_name: ${_param:opencontrail_analyticsdb_container_name}
volumes:
- /etc/cassandra/cassandra-env-analytics.sh:/etc/cassandra/cassandra-env.sh
- /etc/cassandra/cassandra_analytics.yaml:/etc/cassandra/cassandra.yaml
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