From eeb0bc4e4c3ccb45acb0ac2c742f7fb34d87caf7 Mon Sep 17 00:00:00 2001
From: Clark Boylan <clark.boylan@gmail.com>
Date: Tue, 27 Sep 2016 16:19:24 -0700
Subject: [PATCH] Add missing osic images and add to labels

Add missing osic image information and add the new providers to our
labels so that they get used.

Change-Id: Iaaa83a8b3352ea25384f5e8926d152069b7e6bc7
---
 nodepool/nodepool.yaml | 60 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 60 insertions(+)

diff --git a/nodepool/nodepool.yaml b/nodepool/nodepool.yaml
index 2b1c9436fa..c3dcff3b6f 100644
--- a/nodepool/nodepool.yaml
+++ b/nodepool/nodepool.yaml
@@ -33,6 +33,9 @@ labels:
       - name: internap-mtl01
       - name: internap-nyj01
       - name: osic-cloud1
+      - name: osic-cloud1-s3500
+      - name: osic-cloud1-s3700
+      - name: osic-cloud1-disk
       - name: osic-cloud8
       - name: infracloud-vanilla
   - name: ubuntu-precise
@@ -61,6 +64,9 @@ labels:
       - name: internap-mtl01
       - name: internap-nyj01
       - name: osic-cloud1
+      - name: osic-cloud1-s3500
+      - name: osic-cloud1-s3700
+      - name: osic-cloud1-disk
       - name: osic-cloud8
       - name: infracloud-vanilla
   - name: ubuntu-trusty-2-node
@@ -77,6 +83,9 @@ labels:
       - name: internap-mtl01
       - name: internap-nyj01
       - name: osic-cloud1
+      - name: osic-cloud1-s3500
+      - name: osic-cloud1-s3700
+      - name: osic-cloud1-disk
       - name: osic-cloud8
       - name: infracloud-vanilla
   - name: ubuntu-xenial
@@ -92,6 +101,9 @@ labels:
       - name: internap-mtl01
       - name: internap-nyj01
       - name: osic-cloud1
+      - name: osic-cloud1-s3500
+      - name: osic-cloud1-s3700
+      - name: osic-cloud1-disk
       - name: osic-cloud8
       - name: infracloud-vanilla
   - name: ubuntu-xenial-2-node
@@ -108,6 +120,9 @@ labels:
       - name: internap-mtl01
       - name: internap-nyj01
       - name: osic-cloud1
+      - name: osic-cloud1-s3500
+      - name: osic-cloud1-s3700
+      - name: osic-cloud1-disk
       - name: osic-cloud8
       - name: infracloud-vanilla
   - name: centos-7
@@ -123,6 +138,9 @@ labels:
       - name: internap-mtl01
       - name: internap-nyj01
       - name: osic-cloud1
+      - name: osic-cloud1-s3500
+      - name: osic-cloud1-s3700
+      - name: osic-cloud1-disk
       - name: osic-cloud8
       - name: infracloud-vanilla
   - name: fedora-23
@@ -138,6 +156,9 @@ labels:
       - name: internap-mtl01
       - name: internap-nyj01
       - name: osic-cloud1
+      - name: osic-cloud1-s3500
+      - name: osic-cloud1-s3700
+      - name: osic-cloud1-disk
       - name: osic-cloud8
       - name: infracloud-vanilla
   - name: fedora-24
@@ -153,6 +174,9 @@ labels:
       - name: internap-mtl01
       - name: internap-nyj01
       - name: osic-cloud1
+      - name: osic-cloud1-s3500
+      - name: osic-cloud1-s3700
+      - name: osic-cloud1-disk
       - name: osic-cloud8
       - name: infracloud-vanilla
   - name: centos-7-2-node
@@ -169,6 +193,9 @@ labels:
       - name: internap-mtl01
       - name: internap-nyj01
       - name: osic-cloud1
+      - name: osic-cloud1-s3500
+      - name: osic-cloud1-s3700
+      - name: osic-cloud1-disk
       - name: osic-cloud8
       - name: infracloud-vanilla
   - name: tripleo-centos-7
@@ -705,6 +732,17 @@ providers:
       - name: fedora-24
         min-ram: 8000
         name-filter: 'm2.medium.s3500'
+        diskimage: fedora-24
+        username: jenkins
+        private-key: /home/nodepool/.ssh/id_rsa
+        config-drive: true
+      - name: centos-7
+        min-ram: 8000
+        name-filter: 'm2.medium.s3500'
+        diskimage: centos-7
+        username: jenkins
+        private-key: /home/nodepool/.ssh/id_rsa
+        config-drive: true
   - name: osic-cloud1-s3700
     region-name: 'RegionOne'
     cloud: osic-cloud1
@@ -756,6 +794,17 @@ providers:
       - name: fedora-24
         min-ram: 8000
         name-filter: 'm2.medium.s3700'
+        diskimage: fedora-24
+        username: jenkins
+        private-key: /home/nodepool/.ssh/id_rsa
+        config-drive: true
+      - name: centos-7
+        min-ram: 8000
+        name-filter: 'm2.medium.s3700'
+        diskimage: centos-7
+        username: jenkins
+        private-key: /home/nodepool/.ssh/id_rsa
+        config-drive: true
   - name: osic-cloud1-disk
     region-name: 'RegionOne'
     cloud: osic-cloud1
@@ -807,6 +856,17 @@ providers:
       - name: fedora-24
         min-ram: 8000
         name-filter: 'm2.medium.disk'
+        diskimage: fedora-24
+        username: jenkins
+        private-key: /home/nodepool/.ssh/id_rsa
+        config-drive: true
+      - 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
   - name: osic-cloud1
     region-name: 'RegionOne'
     cloud: osic-cloud1