openstack/project-config
Code Issues Proposed changes

Merge "Convert the OSIC to only use disk nodes"

Browse Source
This commit is contained in:
Jenkins 2017-07-21 17:44:42 +00:00 committed by Gerrit Code Review
commit baac063767
2 changed files with 72 additions and 98 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
grafana/nodepool-osic.yaml
View File

@ -115,9 +115,6 @@ dashboard:
leftYAxisLabel: "events / min" leftYAxisLabel: "events / min"
targets: targets:
- target: alias(smartSummarize(sumSeries(stats_counts.nodepool.launch.provider.osic-cloud1-disk.error.*), '1m'), 'CLOUD1-DISK') - target: alias(smartSummarize(sumSeries(stats_counts.nodepool.launch.provider.osic-cloud1-disk.error.*), '1m'), 'CLOUD1-DISK')
- target: alias(smartSummarize(sumSeries(stats_counts.nodepool.launch.provider.osic-cloud1-s3500.error.*), '1m'), 'CLOUD1-S3500')
- target: alias(smartSummarize(sumSeries(stats_counts.nodepool.launch.provider.osic-cloud1-s3700.error.*), '1m'), 'CLOUD1-S3700')
- target: alias(smartSummarize(sumSeries(stats_counts.nodepool.launch.provider.osic-cloud8.error.*), '1m'), 'CLOUD8')
- title: Time to Ready - title: Time to Ready
type: graph type: graph
span: 4 span: 4
@ -143,54 +140,6 @@ dashboard:
seriesOverrides: seriesOverrides:
- alias: Max - alias: Max
stack: False stack: False
- title: Test Nodes (Cloud 1 - S3500)
type: graph
span: 4
stack: true
tooltip:
value_type: individual
leftYAxisLabel: "nodes"
targets:
- target: alias(stats.gauges.nodepool.provider.osic-cloud1-s3500.nodes.building, 'Building')
- target: alias(stats.gauges.nodepool.provider.osic-cloud1-s3500.nodes.ready, 'Available')
- target: alias(stats.gauges.nodepool.provider.osic-cloud1-s3500.nodes.used, 'In Use')
- target: alias(stats.gauges.nodepool.provider.osic-cloud1-s3500.nodes.delete, 'Deleting')
- target: alias(stats.gauges.nodepool.provider.osic-cloud1-s3500.max_servers, 'Max')
seriesOverrides:
- alias: Max
stack: False
- title: Test Nodes (Cloud 1 - S3700)
type: graph
span: 4
stack: true
tooltip:
value_type: individual
leftYAxisLabel: "nodes"
targets:
- target: alias(stats.gauges.nodepool.provider.osic-cloud1-s3700.nodes.building, 'Building')
- target: alias(stats.gauges.nodepool.provider.osic-cloud1-s3700.nodes.ready, 'Available')
- target: alias(stats.gauges.nodepool.provider.osic-cloud1-s3700.nodes.used, 'In Use')
- target: alias(stats.gauges.nodepool.provider.osic-cloud1-s3700.nodes.delete, 'Deleting')
- target: alias(stats.gauges.nodepool.provider.osic-cloud1-s3700.max_servers, 'Max')
seriesOverrides:
- alias: Max
stack: False
- title: Test Nodes (Cloud 8)
type: graph
span: 4
stack: true
tooltip:
value_type: individual
leftYAxisLabel: "nodes"
targets:
- target: alias(stats.gauges.nodepool.provider.osic-cloud8.nodes.building, 'Building')
- target: alias(stats.gauges.nodepool.provider.osic-cloud8.nodes.ready, 'Available')
- target: alias(stats.gauges.nodepool.provider.osic-cloud8.nodes.used, 'In Use')
- target: alias(stats.gauges.nodepool.provider.osic-cloud8.nodes.delete, 'Deleting')
- target: alias(stats.gauges.nodepool.provider.osic-cloud8.max_servers, 'Max')
seriesOverrides:
- alias: Max
stack: False
- title: Job Runtimes - title: Job Runtimes
showTitle: true showTitle: true
height: 250px height: 250px
@ -204,9 +153,6 @@ dashboard:
- none - none
targets: targets:
- target: alias(scale(stats.timers.nodepool.job.gate-tempest-dsvm-full-ubuntu-xenial.master.ubuntu-xenial.osic-cloud1-disk.runtime.mean, '0.001'), 'CLOUD1-DISK') - target: alias(scale(stats.timers.nodepool.job.gate-tempest-dsvm-full-ubuntu-xenial.master.ubuntu-xenial.osic-cloud1-disk.runtime.mean, '0.001'), 'CLOUD1-DISK')
- target: alias(scale(stats.timers.nodepool.job.gate-tempest-dsvm-full-ubuntu-xenial.master.ubuntu-xenial.osic-cloud1-s3700.runtime.mean, '0.001'), 'CLOUD1-S3700')
- target: alias(scale(stats.timers.nodepool.job.gate-tempest-dsvm-full-ubuntu-xenial.master.ubuntu-xenial.osic-cloud1-s3500.runtime.mean, '0.001'), 'CLOUD1-S3500')
- target: alias(scale(stats.timers.nodepool.job.gate-tempest-dsvm-full-ubuntu-xenial.master.ubuntu-xenial.osic-cloud8.runtime.mean, '0.001'), 'CLOUD8')
- title: gate-tempest-dsvm-neutron-full - title: gate-tempest-dsvm-neutron-full
type: graph type: graph
span: 6 span: 6
@ -216,6 +162,3 @@ dashboard:
- none - none
targets: targets:
- target: alias(scale(stats.timers.nodepool.job.gate-tempest-dsvm-neutron-full-ubuntu-xenial.master.ubuntu-xenial.osic-cloud1-disk.runtime.mean, '0.001'), 'CLOUD1-DISK') - target: alias(scale(stats.timers.nodepool.job.gate-tempest-dsvm-neutron-full-ubuntu-xenial.master.ubuntu-xenial.osic-cloud1-disk.runtime.mean, '0.001'), 'CLOUD1-DISK')
- target: alias(scale(stats.timers.nodepool.job.gate-tempest-dsvm-neutron-full-ubuntu-xenial.master.ubuntu-xenial.osic-cloud1-s3700.runtime.mean, '0.001'), 'CLOUD1-S3700')
- target: alias(scale(stats.timers.nodepool.job.gate-tempest-dsvm-neutron-full-ubuntu-xenial.master.ubuntu-xenial.osic-cloud1-s3500.runtime.mean, '0.001'), 'CLOUD1-S3500')
- target: alias(scale(stats.timers.nodepool.job.gate-tempest-dsvm-neutron-full-ubuntu-xenial.master.ubuntu-xenial.osic-cloud8.runtime.mean, '0.001'), 'CLOUD8')

113
nodepool/nodepool.yaml
View File

@ -35,8 +35,7 @@ labels:
- name: ovh-gra1 - name: ovh-gra1
- name: ovh-bhs1 - name: ovh-bhs1
- name: internap-mtl01 - name: internap-mtl01
- name: osic-cloud1-s3500 - name: osic-cloud1-disk
- name: osic-cloud1-s3700
- name: infracloud-vanilla - name: infracloud-vanilla
- name: infracloud-chocolate - name: infracloud-chocolate
- name: citycloud-lon1 - name: citycloud-lon1
@ -54,8 +53,7 @@ labels:
- name: ovh-gra1 - name: ovh-gra1
- name: ovh-bhs1 - name: ovh-bhs1
- name: internap-mtl01 - name: internap-mtl01
- name: osic-cloud1-s3500 - name: osic-cloud1-disk
- name: osic-cloud1-s3700
- name: infracloud-vanilla - name: infracloud-vanilla
- name: infracloud-chocolate - name: infracloud-chocolate
- name: citycloud-lon1 - name: citycloud-lon1
@ -74,8 +72,7 @@ labels:
- name: ovh-gra1 - name: ovh-gra1
- name: ovh-bhs1 - name: ovh-bhs1
- name: internap-mtl01 - name: internap-mtl01
- name: osic-cloud1-s3500 - name: osic-cloud1-disk
- name: osic-cloud1-s3700
- name: infracloud-vanilla - name: infracloud-vanilla
- name: infracloud-chocolate - name: infracloud-chocolate
- name: citycloud-lon1 - name: citycloud-lon1
@ -93,8 +90,7 @@ labels:
- name: ovh-gra1 - name: ovh-gra1
- name: ovh-bhs1 - name: ovh-bhs1
- name: internap-mtl01 - name: internap-mtl01
- name: osic-cloud1-s3500 - name: osic-cloud1-disk
- name: osic-cloud1-s3700
- name: infracloud-vanilla - name: infracloud-vanilla
- name: infracloud-chocolate - name: infracloud-chocolate
- name: citycloud-lon1 - name: citycloud-lon1
@ -113,8 +109,7 @@ labels:
- name: ovh-gra1 - name: ovh-gra1
- name: ovh-bhs1 - name: ovh-bhs1
- name: internap-mtl01 - name: internap-mtl01
- name: osic-cloud1-s3500 - name: osic-cloud1-disk
- name: osic-cloud1-s3700
- name: infracloud-vanilla - name: infracloud-vanilla
- name: infracloud-chocolate - name: infracloud-chocolate
- name: citycloud-lon1 - name: citycloud-lon1
@ -133,8 +128,7 @@ labels:
- name: ovh-gra1 - name: ovh-gra1
- name: ovh-bhs1 - name: ovh-bhs1
- name: internap-mtl01 - name: internap-mtl01
- name: osic-cloud1-s3500 - name: osic-cloud1-disk
- name: osic-cloud1-s3700
- name: infracloud-vanilla - name: infracloud-vanilla
- name: infracloud-chocolate - name: infracloud-chocolate
- name: citycloud-lon1 - name: citycloud-lon1
@ -152,8 +146,7 @@ labels:
- name: ovh-gra1 - name: ovh-gra1
- name: ovh-bhs1 - name: ovh-bhs1
- name: internap-mtl01 - name: internap-mtl01
- name: osic-cloud1-s3500 - name: osic-cloud1-disk
- name: osic-cloud1-s3700
- name: infracloud-vanilla - name: infracloud-vanilla
- name: infracloud-chocolate - name: infracloud-chocolate
- name: citycloud-lon1 - name: citycloud-lon1
@ -171,8 +164,7 @@ labels:
- name: ovh-gra1 - name: ovh-gra1
- name: ovh-bhs1 - name: ovh-bhs1
- name: internap-mtl01 - name: internap-mtl01
- name: osic-cloud1-s3500 - name: osic-cloud1-disk
- name: osic-cloud1-s3700
- name: infracloud-vanilla - name: infracloud-vanilla
- name: infracloud-chocolate - name: infracloud-chocolate
- name: citycloud-lon1 - name: citycloud-lon1
@ -190,8 +182,7 @@ labels:
- name: ovh-gra1 - name: ovh-gra1
- name: ovh-bhs1 - name: ovh-bhs1
- name: internap-mtl01 - name: internap-mtl01
- name: osic-cloud1-s3500 - name: osic-cloud1-disk
- name: osic-cloud1-s3700
- name: infracloud-vanilla - name: infracloud-vanilla
- name: infracloud-chocolate - name: infracloud-chocolate
- name: citycloud-lon1 - name: citycloud-lon1
@ -209,8 +200,7 @@ labels:
- name: ovh-gra1 - name: ovh-gra1
- name: ovh-bhs1 - name: ovh-bhs1
- name: internap-mtl01 - name: internap-mtl01
- name: osic-cloud1-s3500 - name: osic-cloud1-disk
- name: osic-cloud1-s3700
- name: infracloud-vanilla - name: infracloud-vanilla
- name: infracloud-chocolate - name: infracloud-chocolate
- name: citycloud-lon1 - name: citycloud-lon1
@ -229,8 +219,7 @@ labels:
- name: ovh-gra1 - name: ovh-gra1
- name: ovh-bhs1 - name: ovh-bhs1
- name: internap-mtl01 - name: internap-mtl01
- name: osic-cloud1-s3500 - name: osic-cloud1-disk
- name: osic-cloud1-s3700
- name: infracloud-vanilla - name: infracloud-vanilla
- name: infracloud-chocolate - name: infracloud-chocolate
- name: citycloud-lon1 - name: citycloud-lon1
@ -249,8 +238,7 @@ labels:
- name: ovh-gra1 - name: ovh-gra1
- name: ovh-bhs1 - name: ovh-bhs1
- name: internap-mtl01 - name: internap-mtl01
- name: osic-cloud1-s3500 - name: osic-cloud1-disk
- name: osic-cloud1-s3700
- name: infracloud-vanilla - name: infracloud-vanilla
- name: infracloud-chocolate - name: infracloud-chocolate
- name: citycloud-lon1 - name: citycloud-lon1
@ -269,8 +257,7 @@ labels:
- name: ovh-gra1 - name: ovh-gra1
- name: ovh-bhs1 - name: ovh-bhs1
- name: internap-mtl01 - name: internap-mtl01
- name: osic-cloud1-s3500 - name: osic-cloud1-disk
- name: osic-cloud1-s3700
- name: infracloud-vanilla - name: infracloud-vanilla
- name: infracloud-chocolate - name: infracloud-chocolate
- name: citycloud-lon1 - name: citycloud-lon1
@ -686,30 +673,74 @@ providers:
private-key: /home/nodepool/.ssh/id_rsa private-key: /home/nodepool/.ssh/id_rsa
config-drive: true config-drive: true
key-name: infra-root-keys key-name: infra-root-keys
- name: osic-cloud1-s3500 - name: osic-cloud1-disk
region-name: 'RegionOne' region-name: 'RegionOne'
cloud: osic-cloud1 cloud: osic-cloud1
api-timeout: 60 api-timeout: 60
boot-timeout: 240 boot-timeout: 240
max-servers: 0 max-servers: 768
rate: 0.01 rate: 0.01
ipv6-preferred: true ipv6-preferred: true
networks: networks:
- name: 'GATEWAY_NET_V6' - name: 'GATEWAY_NET_V6'
template-hostname: '{image.name}-{timestamp}' template-hostname: '{image.name}-{timestamp}'
images: [] images:
- name: osic-cloud1-s3700 - name: ubuntu-trusty
region-name: 'RegionOne' min-ram: 8000
cloud: osic-cloud1 name-filter: 'm2.medium.disk'
api-timeout: 60 diskimage: ubuntu-trusty
boot-timeout: 240 username: jenkins
max-servers: 0 private-key: /home/nodepool/.ssh/id_rsa
rate: 0.01 config-drive: true
ipv6-preferred: true key-name: infra-root-keys
networks: - name: ubuntu-xenial
- name: 'GATEWAY_NET_V6' min-ram: 8000
template-hostname: '{image.name}-{timestamp}' name-filter: 'm2.medium.disk'
images: [] diskimage: ubuntu-xenial
username: jenkins
private-key: /home/nodepool/.ssh/id_rsa
config-drive: true
key-name: infra-root-keys
- name: debian-jessie
min-ram: 8000
name-filter: 'm2.medium.disk'
diskimage: debian-jessie
username: jenkins
private-key: /home/nodepool/.ssh/id_rsa
config-drive: true
key-name: infra-root-keys
- name: fedora-25
min-ram: 8000
name-filter: 'm2.medium.disk'
diskimage: fedora-25
username: jenkins
private-key: /home/nodepool/.ssh/id_rsa
config-drive: true
key-name: infra-root-keys
- name: centos-7
min-ram: 8000
name-filter: 'm2.medium.disk'
diskimage: centos-7
username: jenkins
private-key: /home/nodepool/.ssh/id_rsa
config-drive: true
key-name: infra-root-keys
- name: opensuse-422
min-ram: 8000
name-filter: 'm2.medium.disk'
diskimage: opensuse-422
username: jenkins
private-key: /home/nodepool/.ssh/id_rsa
config-drive: true
key-name: infra-root-keys
- name: opensuse-423
min-ram: 8000
name-filter: 'm2.medium.disk'
diskimage: opensuse-423
username: jenkins
private-key: /home/nodepool/.ssh/id_rsa
config-drive: true
key-name: infra-root-keys
- name: tripleo-test-cloud-rh1 - name: tripleo-test-cloud-rh1
region-name: 'regionOne' region-name: 'regionOne'
cloud: tripleo-test-cloud-rh1 cloud: tripleo-test-cloud-rh1