Merge "Stop using HP Cloud 1.0"

modules/openstack_project/templates/nodepool/nodepool.yaml.erb

@@ -265,111 +265,6 @@ providers:
         setup: prepare_node_devstack.sh
         username: jenkins
         private-key: /home/nodepool/.ssh/id_rsa
-  - name: hpcloud-az1
-    region-name: 'az-1.region-a.geo-1'
-    service-type: 'compute'
-    service-name: 'Compute'
-    username: '<%= hpcloud_username %>'
-    password: '<%= hpcloud_password %>'
-    project-id: '<%= hpcloud_project %>'
-    auth-url: 'https://region-a.geo-1.identity.hpcloudsvc.com:35357/v2.0'
-    boot-timeout: 180
-    max-servers: 0
-    images:
-      - name: devstack-precise
-        base-image: 'Ubuntu Server 12.04.4 LTS (amd64 20140408) - Partner Image'
-        min-ram: 8192
-        setup: prepare_node_devstack.sh
-        username: jenkins
-        private-key: /home/nodepool/.ssh/id_rsa
-      - name: bare-precise
-        base-image: 'Ubuntu Server 12.04.4 LTS (amd64 20140408) - Partner Image'
-        min-ram: 8192
-        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 (b)'
-        min-ram: 8192
-        setup: prepare_node_bare.sh
-        username: jenkins
-        private-key: /home/nodepool/.ssh/id_rsa
-      - name: py3k-precise
-        base-image: 'Ubuntu Server 12.04.4 LTS (amd64 20140408) - Partner Image'
-        min-ram: 8192
-        setup: prepare_node_py3k.sh
-        username: jenkins
-        private-key: /home/nodepool/.ssh/id_rsa
-  - name: hpcloud-az2
-    region-name: 'az-2.region-a.geo-1'
-    service-type: 'compute'
-    service-name: 'Compute'
-    username: '<%= hpcloud_username %>'
-    password: '<%= hpcloud_password %>'
-    project-id: '<%= hpcloud_project %>'
-    auth-url: 'https://region-a.geo-1.identity.hpcloudsvc.com:35357/v2.0'
-    boot-timeout: 180
-    max-servers: 0
-    images:
-      - name: devstack-precise
-        base-image: 'Ubuntu Server 12.04.4 LTS (amd64 20140408) - Partner Image'
-        min-ram: 8192
-        setup: prepare_node_devstack.sh
-        username: jenkins
-        private-key: /home/nodepool/.ssh/id_rsa
-      - name: bare-precise
-        base-image: 'Ubuntu Server 12.04.4 LTS (amd64 20140408) - Partner Image'
-        min-ram: 8192
-        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 (b)'
-        min-ram: 8192
-        setup: prepare_node_bare.sh
-        username: jenkins
-        private-key: /home/nodepool/.ssh/id_rsa
-      - name: py3k-precise
-        base-image: 'Ubuntu Server 12.04.4 LTS (amd64 20140408) - Partner Image'
-        min-ram: 8192
-        setup: prepare_node_py3k.sh
-        username: jenkins
-        private-key: /home/nodepool/.ssh/id_rsa
-  - name: hpcloud-az3
-    region-name: 'az-3.region-a.geo-1'
-    service-type: 'compute'
-    service-name: 'Compute'
-    username: '<%= hpcloud_username %>'
-    password: '<%= hpcloud_password %>'
-    project-id: '<%= hpcloud_project %>'
-    auth-url: 'https://region-a.geo-1.identity.hpcloudsvc.com:35357/v2.0'
-    boot-timeout: 180
-    max-servers: 0
-    images:
-      - name: devstack-precise
-        base-image: 'Ubuntu Server 12.04.4 LTS (amd64 20140408) - Partner Image'
-        min-ram: 8192
-        setup: prepare_node_devstack.sh
-        username: jenkins
-        private-key: /home/nodepool/.ssh/id_rsa
-      - name: bare-precise
-        base-image: 'Ubuntu Server 12.04.4 LTS (amd64 20140408) - Partner Image'
-        min-ram: 8192
-        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 (b)'
-        min-ram: 8192
-        setup: prepare_node_bare.sh
-        username: jenkins
-        private-key: /home/nodepool/.ssh/id_rsa
-      - name: py3k-precise
-        base-image: 'Ubuntu Server 12.04.4 LTS (amd64 20140408) - Partner Image'
-        min-ram: 8192
-        setup: prepare_node_py3k.sh
-        username: jenkins
-        private-key: /home/nodepool/.ssh/id_rsa
   - name: hpcloud-region-a
     region-name: 'region-a.geo-1'
     service-type: 'compute'