diff --git a/modules/openstack_project/templates/nodepool/nodepool.yaml.erb b/modules/openstack_project/templates/nodepool/nodepool.yaml.erb index 97d2b80ae3..782aaa1113 100644 --- a/modules/openstack_project/templates/nodepool/nodepool.yaml.erb +++ b/modules/openstack_project/templates/nodepool/nodepool.yaml.erb @@ -48,6 +48,30 @@ labels: - name: rax-dfw - name: rax-ord - name: rax-iad + - name: devstack-trusty + image: devstack-trusty + min-ready: 2 + 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: bare-trusty + image: bare-trusty + min-ready: 2 + 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: bare-centos6 image: bare-centos6 min-ready: 21 @@ -141,6 +165,20 @@ providers: setup: prepare_node_bare.sh username: jenkins private-key: /home/nodepool/.ssh/id_rsa + - name: devstack-trusty + base-image: 'Ubuntu 14.04 LTS (Trusty Tahr) (PVHVM)' + min-ram: 8192 + name-filter: 'Performance' + setup: prepare_node_devstack.sh + username: jenkins + private-key: /home/nodepool/.ssh/id_rsa + - name: bare-trusty + base-image: 'Ubuntu 14.04 LTS (Trusty Tahr) (PVHVM)' + min-ram: 8192 + name-filter: 'Performance' + setup: prepare_node_bare.sh + username: jenkins + private-key: /home/nodepool/.ssh/id_rsa - name: bare-centos6 base-image: 'CentOS 6.5 (PVHVM)' min-ram: 8192 @@ -195,6 +233,20 @@ providers: setup: prepare_node_bare.sh username: jenkins private-key: /home/nodepool/.ssh/id_rsa + - name: devstack-trusty + base-image: 'Ubuntu 14.04 LTS (Trusty Tahr) (PVHVM)' + min-ram: 8192 + name-filter: 'Performance' + setup: prepare_node_devstack.sh + username: jenkins + private-key: /home/nodepool/.ssh/id_rsa + - name: bare-trusty + base-image: 'Ubuntu 14.04 LTS (Trusty Tahr) (PVHVM)' + min-ram: 8192 + name-filter: 'Performance' + setup: prepare_node_bare.sh + username: jenkins + private-key: /home/nodepool/.ssh/id_rsa - name: bare-centos6 base-image: 'CentOS 6.5 (PVHVM)' min-ram: 8192 @@ -242,6 +294,20 @@ providers: setup: prepare_node_bare.sh username: jenkins private-key: /home/nodepool/.ssh/id_rsa + - name: devstack-trusty + base-image: 'Ubuntu 14.04 LTS (Trusty Tahr) (PVHVM)' + min-ram: 8192 + name-filter: 'Performance' + setup: prepare_node_devstack.sh + username: jenkins + private-key: /home/nodepool/.ssh/id_rsa + - name: bare-trusty + base-image: 'Ubuntu 14.04 LTS (Trusty Tahr) (PVHVM)' + min-ram: 8192 + name-filter: 'Performance' + setup: prepare_node_bare.sh + username: jenkins + private-key: /home/nodepool/.ssh/id_rsa - name: bare-centos6 base-image: 'CentOS 6.5 (PVHVM)' min-ram: 8192 @@ -370,6 +436,18 @@ providers: setup: prepare_node_bare.sh username: jenkins private-key: /home/nodepool/.ssh/id_rsa + - name: devstack-trusty + base-image: 'Ubuntu Server 14.04 LTS (amd64 20140607.1) - Partner Image' + min-ram: 30720 + setup: prepare_node_devstack.sh + username: jenkins + private-key: /home/nodepool/.ssh/id_rsa + - name: bare-trusty + base-image: 'Ubuntu Server 14.04 LTS (amd64 20140607.1) - Partner Image' + min-ram: 30720 + 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 @@ -424,6 +502,18 @@ providers: setup: prepare_node_bare.sh username: jenkins private-key: /home/nodepool/.ssh/id_rsa + - name: devstack-trusty + base-image: 'Ubuntu Server 14.04 LTS (amd64 20140607.1) - Partner Image' + min-ram: 30720 + setup: prepare_node_devstack.sh + username: jenkins + private-key: /home/nodepool/.ssh/id_rsa + - name: bare-trusty + base-image: 'Ubuntu Server 14.04 LTS (amd64 20140607.1) - Partner Image' + min-ram: 30720 + 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 @@ -478,6 +568,18 @@ providers: setup: prepare_node_bare.sh username: jenkins private-key: /home/nodepool/.ssh/id_rsa + - name: devstack-trusty + base-image: 'Ubuntu Server 14.04 LTS (amd64 20140607.1) - Partner Image' + min-ram: 30720 + setup: prepare_node_devstack.sh + username: jenkins + private-key: /home/nodepool/.ssh/id_rsa + - name: bare-trusty + base-image: 'Ubuntu Server 14.04 LTS (amd64 20140607.1) - Partner Image' + min-ram: 30720 + 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 @@ -532,6 +634,18 @@ providers: setup: prepare_node_bare.sh username: jenkins private-key: /home/nodepool/.ssh/id_rsa + - name: devstack-trusty + base-image: 'Ubuntu Server 14.04 LTS (amd64 20140607.1) - Partner Image' + min-ram: 30720 + setup: prepare_node_devstack.sh + username: jenkins + private-key: /home/nodepool/.ssh/id_rsa + - name: bare-trusty + base-image: 'Ubuntu Server 14.04 LTS (amd64 20140607.1) - Partner Image' + min-ram: 30720 + 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 @@ -586,6 +700,18 @@ providers: setup: prepare_node_bare.sh username: jenkins private-key: /home/nodepool/.ssh/id_rsa + - name: devstack-trusty + base-image: 'Ubuntu Server 14.04 LTS (amd64 20140607.1) - Partner Image' + min-ram: 30720 + setup: prepare_node_devstack.sh + username: jenkins + private-key: /home/nodepool/.ssh/id_rsa + - name: bare-trusty + base-image: 'Ubuntu Server 14.04 LTS (amd64 20140607.1) - Partner Image' + min-ram: 30720 + 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