Remove more Grafana Snapshot cruft.

Change-Id: Ie69c3a032790d09ddeafc93012b54cc094b0f8c7
2017-09-21 08:38:32 -04:00
parent 28f7f06ab4
commit 0c0497c4a3
21 changed files with 0 additions and 106 deletions
--- a/conf/browbeat-glance-complete.yaml
+++ b/conf/browbeat-glance-complete.yaml
@@ -26,7 +26,6 @@ ansible:
    neutron_l3: ansible/browbeat/adjustment-l3.yml
    nova_db: ansible/browbeat/adjustment-db.yml
    workers: ansible/browbeat/adjustment-workers.yml
-  grafana_snapshot: ansible/browbeat/snapshot-general-performance-dashboard.yml
  metadata: ansible/gather/site.yml
 connmon:
  enabled: false
@@ -37,9 +36,6 @@ grafana:
  grafana_port: 3000
  dashboards:
    - openstack-general-system-performance
-  snapshot:
-    enabled: false
-    snapshot_compute: false
 rally:
  enabled: true
  sleep_before: 5
--- a/conf/browbeat-keystone-complete.yaml
+++ b/conf/browbeat-keystone-complete.yaml
@@ -28,7 +28,6 @@ ansible:
    neutron_l3: ansible/browbeat/adjustment-l3.yml
    nova_db: ansible/browbeat/adjustment-db.yml
    workers: ansible/browbeat/adjustment-workers.yml
-  grafana_snapshot: ansible/browbeat/snapshot-general-performance-dashboard.yml
  metadata: ansible/gather/site.yml
 connmon:
  enabled: false
@@ -39,9 +38,6 @@ grafana:
  grafana_port: 3000
  dashboards:
    - openstack-general-system-performance
-  snapshot:
-    enabled: false
-    snapshot_compute: false
 rally:
  enabled: true
  sleep_before: 5
--- a/conf/browbeat-keystone-minimal.yaml
+++ b/conf/browbeat-keystone-minimal.yaml
@@ -28,7 +28,6 @@ ansible:
    neutron_l3: ansible/browbeat/adjustment-l3.yml
    nova_db: ansible/browbeat/adjustment-db.yml
    workers: ansible/browbeat/adjustment-workers.yml
-  grafana_snapshot: ansible/browbeat/snapshot-general-performance-dashboard.yml
  metadata: ansible/gather/site.yml
 connmon:
  enabled: false
@@ -39,9 +38,6 @@ grafana:
  grafana_port: 3000
  dashboards:
    - openstack-general-system-performance
-  snapshot:
-    enabled: false
-    snapshot_compute: false
 rally:
  enabled: true
  sleep_before: 5
--- a/conf/browbeat-workloads.yml
+++ b/conf/browbeat-workloads.yml
@@ -25,7 +25,6 @@ ansible:
    neutron_l3: ansible/browbeat/adjustment-l3.yml
    nova_db: ansible/browbeat/adjustment-db.yml
    workers: ansible/browbeat/adjustment-workers.yml
-  grafana_snapshot: ansible/browbeat/snapshot-general-performance-dashboard.yml
  metadata: ansible/gather/site.yml
 connmon:
  enabled: false
@@ -36,9 +35,6 @@ grafana:
  grafana_port: 3000
  dashboards:
    - openstack-general-system-performance
-  snapshot:
-    enabled: false
-    snapshot_compute: false
 rally:
  enabled: true
  sleep_before: 5
@@ -80,4 +76,3 @@ rally:
          elastic_host:
          elastic_port: 9200
          file: rally/rally-plugins/workloads/pbench-uperf.yml
-
--- a/conf/ceilometer-minimal.yaml
+++ b/conf/ceilometer-minimal.yaml
@@ -26,7 +26,6 @@ ansible:
    neutron_l3: ansible/browbeat/adjustment-l3.yml
    nova_db: ansible/browbeat/adjustment-db.yml
    workers: ansible/browbeat/adjustment-workers.yml
-  grafana_snapshot: ansible/browbeat/snapshot-general-performance-dashboard.yml
  metadata: ansible/gather/site.yml
 connmon:
  enabled: false
@@ -37,9 +36,6 @@ grafana:
  grafana_port: 3000
  dashboards:
    - openstack-general-system-performance
-  snapshot:
-    enabled: false
-    snapshot_compute: false
 rally:
  enabled: true
  sleep_before: 5
--- a/conf/ceilometer-persist-response-timing.yaml
+++ b/conf/ceilometer-persist-response-timing.yaml
@@ -29,7 +29,6 @@ ansible:
    neutron_l3: ansible/browbeat/adjustment-l3.yml
    nova_db: ansible/browbeat/adjustment-db.yml
    workers: ansible/browbeat/adjustment-workers.yml
-  grafana_snapshot: ansible/browbeat/snapshot-general-performance-dashboard.yml
  metadata: ansible/gather/site.yml
 connmon:
  enabled: false
@@ -40,9 +39,6 @@ grafana:
  grafana_port: 3000
  dashboards:
    - openstack-general-system-performance
-  snapshot:
-    enabled: false
-    snapshot_compute: false
 rally:
  enabled: true
  sleep_before: 5
--- a/conf/gnocchi-minimal.yaml
+++ b/conf/gnocchi-minimal.yaml
@@ -27,7 +27,6 @@ ansible:
    neutron_l3: ansible/browbeat/adjustment-l3.yml
    nova_db: ansible/browbeat/adjustment-db.yml
    workers: ansible/browbeat/adjustment-workers.yml
-  grafana_snapshot: ansible/browbeat/snapshot-general-performance-dashboard.yml
  metadata: ansible/gather/site.yml
 connmon:
  enabled: false
@@ -38,9 +37,6 @@ grafana:
  grafana_port: 3000
  dashboards:
    - openstack-general-system-performance
-  snapshot:
-    enabled: false
-    snapshot_compute: false
 rally:
  enabled: true
  sleep_before: 0
--- a/conf/perfkit-benchmarks.yaml
+++ b/conf/perfkit-benchmarks.yaml
@@ -31,7 +31,6 @@ ansible:
    neutron_l3: ansible/browbeat/adjustment-l3.yml
    nova_db: ansible/browbeat/adjustment-db.yml
    workers: ansible/browbeat/adjustment-workers.yml
-  grafana_snapshot: ansible/browbeat/snapshot-general-performance-dashboard.yml
  metadata: ansible/gather/site.yml
 connmon:
  enabled: false
@@ -42,9 +41,6 @@ grafana:
  grafana_port: 3000
  dashboards:
    - openstack-general-system-performance
-  snapshot:
-    enabled: false
-    snapshot_compute: false
 perfkit:
  enabled: true
  sleep_before: 0
--- a/conf/telemetry-nova-neutron-gnocchi-10k-1000-per-30m.yaml
+++ b/conf/telemetry-nova-neutron-gnocchi-10k-1000-per-30m.yaml
@@ -33,7 +33,6 @@ ansible:
    neutron_l3: ansible/browbeat/adjustment-l3.yml
    nova_db: ansible/browbeat/adjustment-db.yml
    workers: ansible/browbeat/adjustment-workers.yml
-  grafana_snapshot: ansible/browbeat/snapshot-general-performance-dashboard.yml
  metadata: ansible/gather/site.yml
 connmon:
  enabled: false
@@ -44,9 +43,6 @@ grafana:
  grafana_port: 3000
  dashboards:
    - openstack-general-system-performance
-  snapshot:
-    enabled: false
-    snapshot_compute: false
 rally:
  enabled: true
  sleep_before: 5
--- a/conf/telemetry-nova-neutron-gnocchi-1k-100-per-30m.yaml
+++ b/conf/telemetry-nova-neutron-gnocchi-1k-100-per-30m.yaml
@@ -33,7 +33,6 @@ ansible:
    neutron_l3: ansible/browbeat/adjustment-l3.yml
    nova_db: ansible/browbeat/adjustment-db.yml
    workers: ansible/browbeat/adjustment-workers.yml
-  grafana_snapshot: ansible/browbeat/snapshot-general-performance-dashboard.yml
  metadata: ansible/gather/site.yml
 connmon:
  enabled: false
@@ -44,9 +43,6 @@ grafana:
  grafana_port: 3000
  dashboards:
    - openstack-general-system-performance
-  snapshot:
-    enabled: false
-    snapshot_compute: false
 rally:
  enabled: true
  sleep_before: 5
--- a/conf/telemetry-nova-neutron-gnocchi-1k-500-per-30m.yaml
+++ b/conf/telemetry-nova-neutron-gnocchi-1k-500-per-30m.yaml
@@ -33,7 +33,6 @@ ansible:
    neutron_l3: ansible/browbeat/adjustment-l3.yml
    nova_db: ansible/browbeat/adjustment-db.yml
    workers: ansible/browbeat/adjustment-workers.yml
-  grafana_snapshot: ansible/browbeat/snapshot-general-performance-dashboard.yml
  metadata: ansible/gather/site.yml
 connmon:
  enabled: false
@@ -44,9 +43,6 @@ grafana:
  grafana_port: 3000
  dashboards:
    - openstack-general-system-performance
-  snapshot:
-    enabled: false
-    snapshot_compute: false
 rally:
  enabled: true
  sleep_before: 5
--- a/conf/telemetry-nova-neutron-gnocchi-5k-500-per-30m.yaml
+++ b/conf/telemetry-nova-neutron-gnocchi-5k-500-per-30m.yaml
@@ -33,7 +33,6 @@ ansible:
    neutron_l3: ansible/browbeat/adjustment-l3.yml
    nova_db: ansible/browbeat/adjustment-db.yml
    workers: ansible/browbeat/adjustment-workers.yml
-  grafana_snapshot: ansible/browbeat/snapshot-general-performance-dashboard.yml
  metadata: ansible/gather/site.yml
 connmon:
  enabled: false
@@ -44,9 +43,6 @@ grafana:
  grafana_port: 3000
  dashboards:
    - openstack-general-system-performance
-  snapshot:
-    enabled: false
-    snapshot_compute: false
 rally:
  enabled: true
  sleep_before: 5
--- a/conf/telemetry-nova-persist-instances-with-network.yaml
+++ b/conf/telemetry-nova-persist-instances-with-network.yaml
@@ -31,7 +31,6 @@ ansible:
    neutron_l3: ansible/browbeat/adjustment-l3.yml
    nova_db: ansible/browbeat/adjustment-db.yml
    workers: ansible/browbeat/adjustment-workers.yml
-  grafana_snapshot: ansible/browbeat/snapshot-general-performance-dashboard.yml
  metadata: ansible/gather/site.yml
 connmon:
  enabled: false
@@ -42,9 +41,6 @@ grafana:
  grafana_port: 3000
  dashboards:
    - openstack-general-system-performance
-  snapshot:
-    enabled: false
-    snapshot_compute: false
 rally:
  enabled: true
  sleep_before: 0
--- a/conf/telemetry-nova-persist-instances.yaml
+++ b/conf/telemetry-nova-persist-instances.yaml
@@ -31,7 +31,6 @@ ansible:
    neutron_l3: ansible/browbeat/adjustment-l3.yml
    nova_db: ansible/browbeat/adjustment-db.yml
    workers: ansible/browbeat/adjustment-workers.yml
-  grafana_snapshot: ansible/browbeat/snapshot-general-performance-dashboard.yml
  metadata: ansible/gather/site.yml
 connmon:
  enabled: false
@@ -42,9 +41,6 @@ grafana:
  grafana_port: 3000
  dashboards:
    - openstack-general-system-performance
-  snapshot:
-    enabled: false
-    snapshot_compute: false
 rally:
  enabled: true
  sleep_before: 0