From 937ad9e4a7b083c8f4ae0fd78cf578e9c343ccfa Mon Sep 17 00:00:00 2001 From: Kevin Carter Date: Wed, 19 Jul 2017 15:20:22 -0500 Subject: [PATCH] Convert the OSIC to only use disk nodes Sadly the SSD based hardware in the environment formally known as the OSIC is being powered down and will be powered down. This change moves the the quota to the disk backed flavor profile to ensure service is not interrupted. Change-Id: I6927edd15958d8499301901823f9dfa08f07ef0b Signed-off-by: Kevin Carter --- grafana/nodepool-osic.yaml | 57 ------------------- nodepool/nodepool.yaml | 113 +++++++++++++++++++++++-------------- 2 files changed, 72 insertions(+), 98 deletions(-) diff --git a/grafana/nodepool-osic.yaml b/grafana/nodepool-osic.yaml index 03ce91473d..df410bd44d 100644 --- a/grafana/nodepool-osic.yaml +++ b/grafana/nodepool-osic.yaml @@ -115,9 +115,6 @@ dashboard: leftYAxisLabel: "events / min" 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-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 type: graph span: 4 @@ -143,54 +140,6 @@ dashboard: seriesOverrides: - alias: Max 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 showTitle: true height: 250px @@ -204,9 +153,6 @@ dashboard: - none 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-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 type: graph span: 6 @@ -216,6 +162,3 @@ dashboard: - none 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-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') diff --git a/nodepool/nodepool.yaml b/nodepool/nodepool.yaml index e72c48486f..ad9ec0e0ec 100644 --- a/nodepool/nodepool.yaml +++ b/nodepool/nodepool.yaml @@ -35,8 +35,7 @@ labels: - name: ovh-gra1 - name: ovh-bhs1 - name: internap-mtl01 - - name: osic-cloud1-s3500 - - name: osic-cloud1-s3700 + - name: osic-cloud1-disk - name: infracloud-vanilla - name: infracloud-chocolate - name: citycloud-lon1 @@ -54,8 +53,7 @@ labels: - name: ovh-gra1 - name: ovh-bhs1 - name: internap-mtl01 - - name: osic-cloud1-s3500 - - name: osic-cloud1-s3700 + - name: osic-cloud1-disk - name: infracloud-vanilla - name: infracloud-chocolate - name: citycloud-lon1 @@ -74,8 +72,7 @@ labels: - name: ovh-gra1 - name: ovh-bhs1 - name: internap-mtl01 - - name: osic-cloud1-s3500 - - name: osic-cloud1-s3700 + - name: osic-cloud1-disk - name: infracloud-vanilla - name: infracloud-chocolate - name: citycloud-lon1 @@ -93,8 +90,7 @@ labels: - name: ovh-gra1 - name: ovh-bhs1 - name: internap-mtl01 - - name: osic-cloud1-s3500 - - name: osic-cloud1-s3700 + - name: osic-cloud1-disk - name: infracloud-vanilla - name: infracloud-chocolate - name: citycloud-lon1 @@ -113,8 +109,7 @@ labels: - name: ovh-gra1 - name: ovh-bhs1 - name: internap-mtl01 - - name: osic-cloud1-s3500 - - name: osic-cloud1-s3700 + - name: osic-cloud1-disk - name: infracloud-vanilla - name: infracloud-chocolate - name: citycloud-lon1 @@ -133,8 +128,7 @@ labels: - name: ovh-gra1 - name: ovh-bhs1 - name: internap-mtl01 - - name: osic-cloud1-s3500 - - name: osic-cloud1-s3700 + - name: osic-cloud1-disk - name: infracloud-vanilla - name: infracloud-chocolate - name: citycloud-lon1 @@ -152,8 +146,7 @@ labels: - name: ovh-gra1 - name: ovh-bhs1 - name: internap-mtl01 - - name: osic-cloud1-s3500 - - name: osic-cloud1-s3700 + - name: osic-cloud1-disk - name: infracloud-vanilla - name: infracloud-chocolate - name: citycloud-lon1 @@ -171,8 +164,7 @@ labels: - name: ovh-gra1 - name: ovh-bhs1 - name: internap-mtl01 - - name: osic-cloud1-s3500 - - name: osic-cloud1-s3700 + - name: osic-cloud1-disk - name: infracloud-vanilla - name: infracloud-chocolate - name: citycloud-lon1 @@ -190,8 +182,7 @@ labels: - name: ovh-gra1 - name: ovh-bhs1 - name: internap-mtl01 - - name: osic-cloud1-s3500 - - name: osic-cloud1-s3700 + - name: osic-cloud1-disk - name: infracloud-vanilla - name: infracloud-chocolate - name: citycloud-lon1 @@ -209,8 +200,7 @@ labels: - name: ovh-gra1 - name: ovh-bhs1 - name: internap-mtl01 - - name: osic-cloud1-s3500 - - name: osic-cloud1-s3700 + - name: osic-cloud1-disk - name: infracloud-vanilla - name: infracloud-chocolate - name: citycloud-lon1 @@ -229,8 +219,7 @@ labels: - name: ovh-gra1 - name: ovh-bhs1 - name: internap-mtl01 - - name: osic-cloud1-s3500 - - name: osic-cloud1-s3700 + - name: osic-cloud1-disk - name: infracloud-vanilla - name: infracloud-chocolate - name: citycloud-lon1 @@ -249,8 +238,7 @@ labels: - name: ovh-gra1 - name: ovh-bhs1 - name: internap-mtl01 - - name: osic-cloud1-s3500 - - name: osic-cloud1-s3700 + - name: osic-cloud1-disk - name: infracloud-vanilla - name: infracloud-chocolate - name: citycloud-lon1 @@ -269,8 +257,7 @@ labels: - name: ovh-gra1 - name: ovh-bhs1 - name: internap-mtl01 - - name: osic-cloud1-s3500 - - name: osic-cloud1-s3700 + - name: osic-cloud1-disk - name: infracloud-vanilla - name: infracloud-chocolate - name: citycloud-lon1 @@ -686,30 +673,74 @@ providers: private-key: /home/nodepool/.ssh/id_rsa config-drive: true key-name: infra-root-keys - - name: osic-cloud1-s3500 + - name: osic-cloud1-disk region-name: 'RegionOne' cloud: osic-cloud1 api-timeout: 60 boot-timeout: 240 - max-servers: 0 + max-servers: 768 rate: 0.01 ipv6-preferred: true networks: - name: 'GATEWAY_NET_V6' template-hostname: '{image.name}-{timestamp}' - images: [] - - name: osic-cloud1-s3700 - region-name: 'RegionOne' - cloud: osic-cloud1 - api-timeout: 60 - boot-timeout: 240 - max-servers: 0 - rate: 0.01 - ipv6-preferred: true - networks: - - name: 'GATEWAY_NET_V6' - template-hostname: '{image.name}-{timestamp}' - images: [] + images: + - name: ubuntu-trusty + min-ram: 8000 + name-filter: 'm2.medium.disk' + diskimage: ubuntu-trusty + username: jenkins + private-key: /home/nodepool/.ssh/id_rsa + config-drive: true + key-name: infra-root-keys + - name: ubuntu-xenial + min-ram: 8000 + name-filter: 'm2.medium.disk' + 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 region-name: 'regionOne' cloud: tripleo-test-cloud-rh1