Merge "Add dkruglov user to 'services' team"
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/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/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/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/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}"