S3: Content type detection

[ci-management.git] / nodepool / nodepool.yaml

diff --git a/nodepool/nodepool.yaml b/nodepool/nodepool.yaml
index b603928..5af2443 100644 (file)
--- a/nodepool/nodepool.yaml
+++ b/nodepool/nodepool.yaml
@@ -28,8 +28,6 @@ providers:
   - name: 'verify-merge'
     cloud: vexxhost
     max-servers: 10
-    availability-zones:
-      - 'ca-ymq-2'
     template-hostname: 'np-verify-merge-{timestamp}-nodepool-template'
     keypair: 'jenkins'
     networks:
@@ -37,8 +35,8 @@ providers:
         public: True
     images:
       - name: 'trusty'
-        #base-image: 'Ubuntu 14.04 LTS - basebuild - 20160202'
-        base-image: '72ac4b06-74bb-40ee-97f9-835a797354a9'
+        #base-image: 'Ubuntu 14.04 - basebuild - 20160518T202806'
+        base-image: 'ce91c99d-3cda-4ffe-bcdb-8293ac65d95e'
         min-ram: 4096
         setup: 'verify_merge.sh'
         username: 'jenkins'
@@ -46,21 +44,27 @@ providers:
   - name: 'multilink'
     cloud: vexxhost
     max-servers: 16
-    availability-zones:
-      - 'ca-ymq-2'
     template-hostname: 'np-multi-link-{timestamp}-nodepool-template'
     keypair: 'jenkins'
     networks:
       - name: 'fdio'
         public: True
-      - name: 'TestNet1'
+      - name: 'Interlink1'
         public: False
-      - name: 'TestNet2'
+      - name: 'Interlink2'
+        public: False
+      - name: 'Interlink3'
+        public: False
+      - name: 'Interlink4'
+        public: False
+      - name: 'Interlink5'
+        public: False
+      - name: 'Interlink6'
         public: False
     images:
       - name: 'trusty-multilink'
-        #base-image: 'Ubuntu 14.04 LTS - basebuild - 20160202'
-        base-image: '72ac4b06-74bb-40ee-97f9-835a797354a9'
+        #base-image: 'Ubuntu 14.04 - basebuild - 20160518T202806'
+        base-image: 'ce91c99d-3cda-4ffe-bcdb-8293ac65d95e'
         min-ram: 4096
         setup: 'multilink.sh'
         username: 'jenkins'
@@ -71,4 +75,4 @@ targets:
     #hostname: 'np-{label.name}-{provider.name}-{node_id}'
     #subnode-hostname: 'np-{label.name}-{provider.name}-{node_id}'
     hostname: 'np-{label.name}-{node_id}'
-    subnode-hostname: 'np-{label.name}-{node_id}'
+    subnode-hostname: 'np-sub-{label.name}-{node_id}'