From d5ea13c353751f995504dfe380ae102cc6dccff2 Mon Sep 17 00:00:00 2001 From: Monty Taylor Date: Wed, 8 Jul 2015 17:23:35 -0400 Subject: [PATCH] Use ubuntu-trusty for multi-node testing cloud-init does what you'd think we want for the hostname, except it's not because our hostnames are long. ubuntu-trusty nodes used ubuntu-minimal and simple-init/glean to process things. Add a 2-node profile based on ubuntu-minimal so that we can use that. A follow up patch will remove the old devstack-minimal. Change-Id: I67ea62ebf9360f72f121d77acd1cbd35d8db728b --- .../templates/nodepool/nodepool.yaml.erb | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/modules/openstack_project/templates/nodepool/nodepool.yaml.erb b/modules/openstack_project/templates/nodepool/nodepool.yaml.erb index 55f3d24faa..6ca34604f2 100644 --- 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