Merge "Remove CentOS6 configuration from nodepool"

nodepool/nodepool.yaml

@@ -97,36 +97,6 @@ labels:
       - name: rax-dfw
       - name: rax-ord
       - name: rax-iad
-  - name: bare-centos6
-    image: bare-centos6
-    ready-script: configure_mirror.sh
-    min-ready: -1
-    providers:
-      - name: hpcloud-b1
-      - name: hpcloud-b2
-      - name: hpcloud-b3
-      - name: hpcloud-b4
-      - name: hpcloud-b5
-      - name: rax-dfw
-      - name: rax-ord
-      - name: rax-iad
-  - name: centos-6
-    image: centos-6
-    ready-script: configure_mirror.sh
-    min-ready: -1
-    providers:
-      - name: hpcloud-b1
-      - name: hpcloud-b2
-      - name: hpcloud-b3
-      - name: hpcloud-b4
-      - name: hpcloud-b5
-      - name: rax-dfw
-      - name: rax-ord
-      - name: rax-iad
-      - name: ovh-gra1
-      - name: ovh-bhs1
-      - name: bluebox-sjc1
-      - name: internap-nyj01
   - name: ubuntu-trusty
     image: ubuntu-trusty
     ready-script: configure_mirror.sh
@@ -309,20 +279,6 @@ providers:
         setup: prepare_node_bare.sh
         username: jenkins
         private-key: /home/nodepool/.ssh/id_rsa
-      - name: bare-centos6
-        base-image: 'CentOS 6 (PVHVM)'
-        min-ram: 8192
-        name-filter: 'Performance'
-        setup: prepare_node_bare.sh
-        username: jenkins
-        private-key: /home/nodepool/.ssh/id_rsa
-      - name: centos-6
-        base-image: 'CentOS 6 (PVHVM)'
-        min-ram: 8192
-        name-filter: 'Performance'
-        setup: prepare_node_devstack.sh
-        username: jenkins
-        private-key: /home/nodepool/.ssh/id_rsa
       - name: ubuntu-trusty
         min-ram: 8192
         diskimage: ubuntu-trusty
@@ -390,20 +346,6 @@ providers:
         setup: prepare_node_bare.sh
         username: jenkins
         private-key: /home/nodepool/.ssh/id_rsa
-      - name: bare-centos6
-        base-image: 'CentOS 6 (PVHVM)'
-        min-ram: 8192
-        name-filter: 'Performance'
-        setup: prepare_node_bare.sh
-        username: jenkins
-        private-key: /home/nodepool/.ssh/id_rsa
-      - name: centos-6
-        base-image: 'CentOS 6 (PVHVM)'
-        min-ram: 8192
-        name-filter: 'Performance'
-        setup: prepare_node_devstack.sh
-        username: jenkins
-        private-key: /home/nodepool/.ssh/id_rsa
       - name: ubuntu-trusty
         min-ram: 8192
         diskimage: ubuntu-trusty
@@ -471,20 +413,6 @@ providers:
         setup: prepare_node_bare.sh
         username: jenkins
         private-key: /home/nodepool/.ssh/id_rsa
-      - name: bare-centos6
-        base-image: 'CentOS 6 (PVHVM)'
-        min-ram: 8192
-        name-filter: 'Performance'
-        setup: prepare_node_bare.sh
-        username: jenkins
-        private-key: /home/nodepool/.ssh/id_rsa
-      - name: centos-6
-        base-image: 'CentOS 6 (PVHVM)'
-        min-ram: 8192
-        name-filter: 'Performance'
-        setup: prepare_node_devstack.sh
-        username: jenkins
-        private-key: /home/nodepool/.ssh/id_rsa
       - name: ubuntu-trusty
         min-ram: 8192
         diskimage: ubuntu-trusty
@@ -577,18 +505,6 @@ providers:
         setup: prepare_node_bare.sh
         username: jenkins
         private-key: /home/nodepool/.ssh/id_rsa
-      - name: bare-centos6
-        base-image: 'CentOS 6.3 Server 64-bit 20130116'
-        min-ram: 30720
-        setup: prepare_node_bare.sh
-        username: jenkins
-        private-key: /home/nodepool/.ssh/id_rsa
-      - name: centos-6
-        min-ram: 30720
-        diskimage: centos-6
-        username: jenkins
-        private-key: /home/nodepool/.ssh/id_rsa
-        config-drive: true
       - name: ubuntu-trusty
         min-ram: 30720
         diskimage: ubuntu-trusty
@@ -667,18 +583,6 @@ providers:
         setup: prepare_node_bare.sh
         username: jenkins
         private-key: /home/nodepool/.ssh/id_rsa
-      - name: bare-centos6
-        base-image: 'CentOS 6.3 Server 64-bit 20130116'
-        min-ram: 30720
-        setup: prepare_node_bare.sh
-        username: jenkins
-        private-key: /home/nodepool/.ssh/id_rsa
-      - name: centos-6
-        min-ram: 30720
-        diskimage: centos-6
-        username: jenkins
-        private-key: /home/nodepool/.ssh/id_rsa
-        config-drive: true
       - name: ubuntu-trusty
         min-ram: 30720
         diskimage: ubuntu-trusty
@@ -757,18 +661,6 @@ providers:
         setup: prepare_node_bare.sh
         username: jenkins
         private-key: /home/nodepool/.ssh/id_rsa
-      - name: bare-centos6
-        base-image: 'CentOS 6.3 Server 64-bit 20130116'
-        min-ram: 30720
-        setup: prepare_node_bare.sh
-        username: jenkins
-        private-key: /home/nodepool/.ssh/id_rsa
-      - name: centos-6
-        min-ram: 30720
-        diskimage: centos-6
-        username: jenkins
-        private-key: /home/nodepool/.ssh/id_rsa
-        config-drive: true
       - name: ubuntu-trusty
         min-ram: 30720
         diskimage: ubuntu-trusty
@@ -848,18 +740,6 @@ providers:
         setup: prepare_node_bare.sh
         username: jenkins
         private-key: /home/nodepool/.ssh/id_rsa
-      - name: bare-centos6
-        base-image: 'CentOS 6.3 Server 64-bit 20130116'
-        min-ram: 30720
-        setup: prepare_node_bare.sh
-        username: jenkins
-        private-key: /home/nodepool/.ssh/id_rsa
-      - name: centos-6
-        min-ram: 30720
-        diskimage: centos-6
-        username: jenkins
-        private-key: /home/nodepool/.ssh/id_rsa
-        config-drive: true
       - name: ubuntu-trusty
         min-ram: 30720
         diskimage: ubuntu-trusty
@@ -940,18 +820,6 @@ providers:
         setup: prepare_node_bare.sh
         username: jenkins
         private-key: /home/nodepool/.ssh/id_rsa
-      - name: bare-centos6
-        base-image: 'CentOS 6.3 Server 64-bit 20130116'
-        min-ram: 30720
-        setup: prepare_node_bare.sh
-        username: jenkins
-        private-key: /home/nodepool/.ssh/id_rsa
-      - name: centos-6
-        min-ram: 30720
-        diskimage: centos-6
-        username: jenkins
-        private-key: /home/nodepool/.ssh/id_rsa
-        config-drive: true
       - name: ubuntu-trusty
         min-ram: 30720
         diskimage: ubuntu-trusty
@@ -997,12 +865,6 @@ providers:
     rate: 0.1
     image-type: raw
     images:
-      - name: centos-6
-        min-ram: 8000
-        name-filter: 'ssd-osFoundation-3'
-        diskimage: centos-6
-        username: jenkins
-        private-key: /home/nodepool/.ssh/id_rsa
       - name: devstack-precise
         min-ram: 8000
         name-filter: 'ssd-osFoundation-3'
@@ -1036,12 +898,6 @@ providers:
     rate: 0.1
     image-type: raw
     images:
-      - name: centos-6
-        min-ram: 8000
-        name-filter: 'ssd-osFoundation-3'
-        diskimage: centos-6
-        username: jenkins
-        private-key: /home/nodepool/.ssh/id_rsa
       - name: devstack-precise
         min-ram: 8000
         name-filter: 'ssd-osFoundation-3'
@@ -1075,12 +931,6 @@ providers:
     rate: 0.001
     pool: 'external'
     images:
-      - name: centos-6
-        min-ram: 8000
-        name-filter: 'nodepool'
-        diskimage: centos-6
-        username: jenkins
-        private-key: /home/nodepool/.ssh/id_rsa
       - name: devstack-precise
         min-ram: 8000
         name-filter: 'nodepool'
@@ -1115,12 +965,6 @@ providers:
     networks:
       - net-label: inap-17304-WAN2342
     images:
-      - name: centos-6
-        min-ram: 8000
-        name-filter: 'A1.8'
-        diskimage: centos-6
-        username: jenkins
-        private-key: /home/nodepool/.ssh/id_rsa
       - name: devstack-precise
         min-ram: 8000
         name-filter: 'A1.8'
@@ -1178,17 +1022,6 @@ targets:
   - name: jenkins07
 
 diskimages:
-  - name: centos-6
-    elements:
-      - centos
-      - vm
-      - openstack-repos
-      - nodepool-base
-      - node-devstack
-      - cache-bindep
-    env-vars:
-      TMPDIR: /opt/dib_tmp
-      DIB_IMAGE_CACHE: /opt/dib_cache
   - name: ubuntu-trusty
     elements:
       - ubuntu-minimal