From 250c217e820fbf1d3f666b03158fb7ca1fe76f85 Mon Sep 17 00:00:00 2001
From: agopi <agopi@redhat.com>
Date: Thu, 22 Mar 2018 13:30:22 -0400
Subject: [PATCH] CI using custom node file

Tripleo quickstart made changes to default node files
to use mapping to rename the compute/controller-0.
This commit will allow us to use the old version.

https://review.openstack.org/#/c/531504/2

Change-Id: Iec82b61b2088d70c30142df27b251f28a68738e8
---
 ci-scripts/tripleo/config/nodes/1ctlr_1comp.yml | 13 +++++++++++++
 ci-scripts/tripleo/microbrow.sh                 |  1 +
 2 files changed, 14 insertions(+)
 create mode 100644 ci-scripts/tripleo/config/nodes/1ctlr_1comp.yml

diff --git a/ci-scripts/tripleo/config/nodes/1ctlr_1comp.yml b/ci-scripts/tripleo/config/nodes/1ctlr_1comp.yml
new file mode 100644
index 000000000..6777eece1
--- /dev/null
+++ b/ci-scripts/tripleo/config/nodes/1ctlr_1comp.yml
@@ -0,0 +1,13 @@
+# This is a workaround for
+# https://github.com/openstack/tripleo-quickstart/commit/4b5918ced49a4907f299931a7d026137ac0804fb
+# Define a single controller node and a single compute node.
+overcloud_nodes:
+  - name: control_0
+    flavor: control
+    virtualbmc_port: 6230
+
+  - name: compute_0
+    flavor: compute
+    virtualbmc_port: 6231
+
+node_count: 2
diff --git a/ci-scripts/tripleo/microbrow.sh b/ci-scripts/tripleo/microbrow.sh
index 280943b93..1d88e454a 100755
--- a/ci-scripts/tripleo/microbrow.sh
+++ b/ci-scripts/tripleo/microbrow.sh
@@ -76,6 +76,7 @@ echo "file://$WORKSPACE/browbeat/#egg=browbeat" >> $REQS
 --working-dir $WORKSPACE \
 --bootstrap \
 --no-clone \
+--nodes $WORKSPACE/browbeat/ci-scripts/tripleo/config/nodes/1ctlr_1comp.yml \
 -t all \
 -S overcloud-validate \
 -R $RELEASE \