Merge pull request #214 from pjediny/sriov-docs
Modification to SR-IOV documentation
diff --git a/heka/aggregator/cluster.yml b/heka/aggregator/cluster.yml
index 2913211..1d1e5c7 100644
--- a/heka/aggregator/cluster.yml
+++ b/heka/aggregator/cluster.yml
@@ -2,9 +2,6 @@
- service.heka.aggregator.cluster
- system.heka.server
parameters:
- _param:
- nagios_default_host_alarm_clusters: 00-clusters
- nagios_host_dimension_key: nagios_host
heka:
aggregator:
influxdb_host: ${_param:heka_influxdb_host}
@@ -12,12 +9,6 @@
influxdb_database: lma
influxdb_username: lma
influxdb_password: ${_param:influxdb_stacklight_password}
- nagios_host: ${_param:nagios_host}
- nagios_username: ${_param:nagios_username}
- nagios_password: ${_param:nagios_password}
- nagios_port: ${_param:nagios_status_port}
- nagios_default_host_alarm_clusters: ${_param:nagios_default_host_alarm_clusters}
- nagios_host_dimension_key: ${_param:nagios_host_dimension_key}
poolsize: 200
keepalived:
cluster:
diff --git a/heka/aggregator/single.yml b/heka/aggregator/single.yml
index c5ad6ab..5ee3605 100644
--- a/heka/aggregator/single.yml
+++ b/heka/aggregator/single.yml
@@ -2,9 +2,6 @@
- service.heka.aggregator.single
- system.heka.server
parameters:
- _param:
- nagios_default_host_alarm_clusters: 00-clusters
- nagios_host_dimension_key: nagios_host
heka:
aggregator:
influxdb_host: ${_param:heka_influxdb_host}
@@ -12,10 +9,4 @@
influxdb_database: lma
influxdb_username: lma
influxdb_password: ${_param:influxdb_stacklight_password}
- nagios_host: ${_param:nagios_host}
- nagios_username: ${_param:nagios_username}
- nagios_password: ${_param:nagios_password}
- nagios_port: ${_param:nagios_status_port}
- nagios_default_host_alarm_clusters: ${_param:nagios_default_host_alarm_clusters}
- nagios_host_dimension_key: ${_param:nagios_host_dimension_key}
poolsize: 200
diff --git a/heka/metric_collector/output/nagios.yml b/heka/metric_collector/output/nagios.yml
new file mode 100644
index 0000000..89d981f
--- /dev/null
+++ b/heka/metric_collector/output/nagios.yml
@@ -0,0 +1,2 @@
+classes:
+- service.heka.metric_collector.output.nagios
diff --git a/heka/metric_collector/output/sensu.yml b/heka/metric_collector/output/sensu.yml
index 3143fd9..a68a2ab 100644
--- a/heka/metric_collector/output/sensu.yml
+++ b/heka/metric_collector/output/sensu.yml
@@ -1,3 +1,2 @@
classes:
- service.heka.metric_collector.output.sensu
-
diff --git a/heka/metric_collector/single.yml b/heka/metric_collector/single.yml
index 443a4e9..b4167f0 100644
--- a/heka/metric_collector/single.yml
+++ b/heka/metric_collector/single.yml
@@ -12,7 +12,3 @@
influxdb_port: 8086
influxdb_time_precision: ms
influxdb_username: lma
- nagios_host: ${_param:nagios_host}
- nagios_username: ${_param:nagios_username}
- nagios_password: ${_param:nagios_password}
- nagios_port: ${_param:nagios_status_port}
diff --git a/jenkins/client/job/opencontrail/build/generic.yml b/jenkins/client/job/opencontrail/build/generic.yml
index e994323..7516354 100644
--- a/jenkins/client/job/opencontrail/build/generic.yml
+++ b/jenkins/client/job/opencontrail/build/generic.yml
@@ -64,67 +64,6 @@
credentials: "gerrit"
github:
url: https://github.com/Mirantis/ccp-contrail-pipeline
- trigger:
- gerrit:
- project:
- contrail/contrail-pipeline:
- branches:
- - "{{branch}}"
- contrail/contrail-build:
- branches:
- - "{{branch}}"
- contrail/contrail-controller:
- branches:
- - "{{branch}}"
- contrail/contrail-vrouter:
- branches:
- - "{{branch}}"
- contrail/contrail-third-party:
- branches:
- - "{{branch}}"
- contrail/contrail-generateDS:
- branches:
- - "{{branch}}"
- contrail/contrail-sandesh:
- branches:
- - "{{branch}}"
- contrail/contrail-packages:
- branches:
- - "{{branch}}"
- contrail/contrail-nova-vif-driver:
- branches:
- - "{{branch}}"
- contrail/contrail-neutron-plugin:
- branches:
- - "{{branch}}"
- contrail/contrail-nova-extensions:
- branches:
- - "{{branch}}"
- contrail/contrail-heat:
- branches:
- - "{{branch}}"
- contrail/contrail-web-storage:
- branches:
- - "{{branch}}"
- contrail/contrail-web-server-manager:
- branches:
- - "{{branch}}"
- contrail/contrail-web-controller:
- branches:
- - "{{branch}}"
- contrail/contrail-web-core:
- branches:
- - "{{branch}}"
- contrail/contrail-webui-third-party:
- branches:
- - "{{branch}}"
- message:
- build_successful: "Build successful"
- build_unstable: "Build unstable"
- build_failure: "Build failed"
- event:
- ref:
- - updated
param:
APTLY_URL:
type: string
diff --git a/jenkins/client/job/opencontrail/build/test.yml b/jenkins/client/job/opencontrail/build/test.yml
index 7b39b97..8183c3d 100644
--- a/jenkins/client/job/opencontrail/build/test.yml
+++ b/jenkins/client/job/opencontrail/build/test.yml
@@ -41,67 +41,6 @@
scm:
type: git
url: "https://github.com/chnyda/contrail-unittest"
- trigger:
- gerrit:
- project:
- contrail/contrail-pipeline:
- branches:
- - "{{branch}}"
- contrail/contrail-build:
- branches:
- - "{{branch}}"
- contrail/contrail-controller:
- branches:
- - "{{branch}}"
- contrail/contrail-vrouter:
- branches:
- - "{{branch}}"
- contrail/contrail-third-party:
- branches:
- - "{{branch}}"
- contrail/contrail-generateDS:
- branches:
- - "{{branch}}"
- contrail/contrail-sandesh:
- branches:
- - "{{branch}}"
- contrail/contrail-packages:
- branches:
- - "{{branch}}"
- contrail/contrail-nova-vif-driver:
- branches:
- - "{{branch}}"
- contrail/contrail-neutron-plugin:
- branches:
- - "{{branch}}"
- contrail/contrail-nova-extensions:
- branches:
- - "{{branch}}"
- contrail/contrail-heat:
- branches:
- - "{{branch}}"
- contrail/contrail-web-storage:
- branches:
- - "{{branch}}"
- contrail/contrail-web-server-manager:
- branches:
- - "{{branch}}"
- contrail/contrail-web-controller:
- branches:
- - "{{branch}}"
- contrail/contrail-web-core:
- branches:
- - "{{branch}}"
- contrail/contrail-webui-third-party:
- branches:
- - "{{branch}}"
- message:
- build_successful: "Build successful"
- build_unstable: "Build unstable"
- build_failure: "Build failed"
- event:
- ref:
- - updated
param:
SOURCE_URL:
type: string