From: Clint Byrum <clint@fewbar.com>
Date: Thu, 6 Jun 2013 16:30:59 +0000 (-0700)
Subject: Use slave roles in Makefile.
X-Git-Tag: opnfv-6.0.0~3016
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=a0246928c7e395bfe4d25a397c415fab07892ad7;p=apex-tripleo-heat-templates.git

Use slave roles in Makefile.
---

diff --git a/Makefile b/Makefile
index c03abea4..6949b3a8 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
 NOTCOMPUTE=nova-api.yaml keystone.yaml heat-allinone.yaml glance.yaml quantum.yaml mysql.yaml rabbitmq.yaml
 
 notcompute.yaml: $(NOTCOMPUTE)
-	python merge.py $(NOTCOMPUTE) > notcompute.yaml
+	python merge.py --master-role notcompute --slave-roles stateless stateful -- $(NOTCOMPUTE) > notcompute.yaml