Merge "Change branch for the telegraf build job"
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/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/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}"