Merge "[odl] Turn off websocket for pseudo agent update"
diff --git a/README.rst b/README.rst
index b418f37..231e9a9 100644
--- a/README.rst
+++ b/README.rst
@@ -25,14 +25,14 @@
Name of the Physical Function interface (pF)
`sriov_nic01_numvfs`
- Number of Virtual Functions (VF), for number of
+ Number of Virtual Functions (VF), for number of
supported VF check documentation for your network interface card.
`sriov_nic01_physical_network`
Default **physnet1**, label for physical network the interface belongs to.
`sriov_unsafe_interrupts`
- Default **False**, needs to be set **True** if your hw platform does not
+ Default **False**, needs to be set **True** if your hw platform does not
support interrupt remapping.
@@ -112,7 +112,7 @@
- grafana_prometheus_port
- grafana_prometheus_is_default (default true)
-Backwark compatiblity
+Backward compatiblity
---------------------
The class **grafana.client.single** configures grafana client and an InfluxDB
diff --git a/jenkins/client/job/git-mirrors/downstream/pipelines.yml b/jenkins/client/job/git-mirrors/downstream/pipelines.yml
index 7bf366c..271a725 100644
--- a/jenkins/client/job/git-mirrors/downstream/pipelines.yml
+++ b/jenkins/client/job/git-mirrors/downstream/pipelines.yml
@@ -2,12 +2,14 @@
- system.jenkins.client.job.git-mirrors.downstream
parameters:
_param:
+ gerrit_pipeline_library_repo: https://github.com/Mirantis/pipeline-library
+ gerrit_mk_pipelines_repo: https://github.com/Mirantis/mk-pipelines
jenkins_git_mirror_downstream_jobs:
- name: pipeline-library
downstream: mcp-ci/pipeline-library
- upstream: "https://github.com/Mirantis/pipeline-library"
+ upstream: "${_param:gerrit_pipeline_library_repo}"
branches: master
- name: mk-pipelines
downstream: mk/mk-pipelines
- upstream: "https://github.com/Mirantis/mk-pipelines"
+ upstream: "${_param:gerrit_mk_pipelines_repo}"
branches: master
diff --git a/jenkins/client/job/salt-models/tests.yml b/jenkins/client/job/salt-models/tests.yml
index 6a80fab..35df28b 100644
--- a/jenkins/client/job/salt-models/tests.yml
+++ b/jenkins/client/job/salt-models/tests.yml
@@ -287,7 +287,7 @@
default: "1"
EXTRA_FORMULAS:
type: string
- default: "aptly artifactory backupninja collectd devops-portal docker elasticsearch freeipa gerrit glusterfs grafana haproxy heka horizon influxdb jenkins keepalived kibana libvirt maas memcached mysql nginx ntp openldap openssh postfix prometheus rsync rsyslog rundeck sensu sphinx telegraf xtrabackup"
+ default: "aptly artifactory backupninja collectd devops-portal docker elasticsearch freeipa gerrit glusterfs grafana haproxy heka horizon influxdb jenkins keepalived kibana libvirt maas memcached mysql nginx ntp openldap openssh postfix prometheus rsync rsyslog rundeck sensu sphinx telegraf xtrabackup watchdog"
job:
test-salt-model-node:
name: test-salt-model-node
diff --git a/prometheus/alertmanager/notification/pushkin.yml b/prometheus/alertmanager/notification/pushkin.yml
index dd4f760..a78b6fd 100644
--- a/prometheus/alertmanager/notification/pushkin.yml
+++ b/prometheus/alertmanager/notification/pushkin.yml
@@ -10,9 +10,7 @@
routes:
pushkin:
receiver: HTTP-pushkin
- match_re:
- - label: route
- value: .+?
+ continue: true
receiver:
HTTP-pushkin:
enabled: true
diff --git a/prometheus/alertmanager/notification/slack.yml b/prometheus/alertmanager/notification/slack.yml
index c33e013..2158adb 100644
--- a/prometheus/alertmanager/notification/slack.yml
+++ b/prometheus/alertmanager/notification/slack.yml
@@ -6,9 +6,6 @@
routes:
slack:
receiver: HTTP-slack
- match_re:
- - label: route
- value: slack
receiver:
HTTP-slack:
enabled: true