Merge "Use ubuntu-trusty for multi-node testing"

2015-07-13 18:21:31 +00:00 · 2015-07-13 18:21:31 +00:00 · 12f360bd4a
commit 12f360bd4a
parent ee384bd40a d5ea13c353
1 changed files with 14 additions and 0 deletions
--- a/modules/openstack_project/templates/nodepool/nodepool.yaml.erb
+++ b/modules/openstack_project/templates/nodepool/nodepool.yaml.erb
@ -129,6 +129,20 @@ labels:
      - name: rax-dfw
      - name: rax-ord
      - name: rax-iad
+  - name: ubuntu-trusty-2-node
+    image: ubuntu-trusty
+    ready-script: multinode_setup.sh
+    subnodes: 1
+    min-ready: 1
+    providers:
+      - name: rax-dfw
+      - name: rax-ord
+      - name: rax-iad
+      - name: hpcloud-b1
+      - name: hpcloud-b2
+      - name: hpcloud-b3
+      - name: hpcloud-b4
+      - name: hpcloud-b5
  - name: devstack-trusty-2-node
    image: devstack-trusty
    ready-script: multinode_setup.sh