70 Commits

Author SHA1 Message Date
Robert Collins
ae28900681 Ignore editor files.
Change-Id: I2bf716cae119ccc8a4b4fa6fae4caa7444156526
2013-06-27 15:43:42 +12:00
Robert Collins
bcebd6df60 Fixup https://review.openstack.org/#/c/33308.
The local_ip value of 127.0.0.1 breaks clusters. Using 0.0.0.0 will
have the right value when the heat-localip element is used.

Change-Id: Id0da5d46c60e808944a40bcaf05f1072be55eed7
2013-06-20 15:15:09 +12:00
Jenkins
5459cbd167 Merge "Remove references to Fn::GetAtt." 2013-06-19 22:46:34 +00:00
Derek Higgins
a073f1c3eb Remove references to Fn::GetAtt.
These were causing a Circular dependency error during the
creation of a stack.

Change-Id: Iccdf4a081f38aa3a5fe0e250b9e9382958a0f26e
2013-06-19 23:42:33 +01:00
Jenkins
bbd0f5ea08 Merge "Fix default mysql usernames." 2013-06-19 22:25:41 +00:00
Jenkins
be5577cf0b Merge "Adding floatingip_start and floatingip_end to heat template." 2013-06-19 22:23:37 +00:00
Jenkins
6249969457 Merge "Add sample template for nagios3 element." 2013-06-19 20:03:14 +00:00
Derek Higgins
8805035dd0 Fix default mysql usernames.
Username heat looks like it got copy and pasted.

Change-Id: I40666b8e80df7424e223b317ab4c9d6f614c43e6
2013-06-19 15:35:40 +01:00
Derek Higgins
20496de7ab Adding floatingip_start and floatingip_end to heat template.
These are needed by the quantum-network-node element

Change-Id: Ic89b7f25752778aa2145768152bbc6e634ea3e5f
2013-06-19 15:06:04 +01:00
Chris Krelle
88e264d3fd Add sample template for nagios3 element.
Change-Id: I02a80a371a8ca493f4e143def82215f33b29ac6c
Authored-by: Chris Krelle <nobodycam@gmail.com>
2013-06-18 09:42:53 -07:00
Robert Collins
324796f788 Parameterise more settings for nova and quantum.
Change-Id: Ia35431302848666ad013adaeae1d06482cd3117a
2013-06-12 17:12:32 +12:00
Robert Collins
823ef3d434 Add .gitreview setup.
Change-Id: I22855e7f3c77984ffc81ebf00e62cb78839e63a7
2013-06-12 14:01:23 +12:00
Clint Byrum
a96fefd92f Nested stack of nova-compute-instance.yaml 2013-06-06 09:40:16 -07:00
Clint Byrum
5eadb8b0ad New single instance nova-compute. 2013-06-06 09:40:16 -07:00
Clint Byrum
7c9e46f4b8 Adding bootstack-vm template. 2013-06-06 09:40:16 -07:00
Clint Byrum
b971d39d8f PrivateIp is not assigned yet, plus 127.0.0.1 will work fine 2013-06-06 09:37:21 -07:00
Cody A.W. Somerville
5f763d6efb Fixed the nova-compute template. 2013-06-06 09:37:05 -07:00
Clint Byrum
1536112575 Pushing passwords into mysql and other fixes.
Generating and distributing usernames/passwords is just too complicated
with Heat at this stage, so we need to push them into mysql from the
template.
2013-06-06 09:36:07 -07:00
Clint Byrum
ca5b728ca0 Hand modifying notcompute to work with elements. 2013-06-06 09:35:09 -07:00
Clint Byrum
f376066033 Adding username/password for Nova in notcompute. 2013-06-06 09:33:29 -07:00
Clint Byrum
862bd3626b Hand modified notcompute.yaml to work properly. 2013-06-06 09:32:50 -07:00
Clint Byrum
4278478139 Remove unused NovaAPISize from nova-api 2013-06-06 09:32:35 -07:00
Clint Byrum
a0246928c7 Use slave roles in Makefile. 2013-06-06 09:30:59 -07:00
Clint Byrum
022cc12afc Add a Makefile for regenerating common merges 2013-06-06 09:28:39 -07:00
Clint Byrum
3757db1f5b Removing unused TemplateURL 2013-06-06 09:28:39 -07:00
Clint Byrum
4043c1d61b Add glance heat and keystone to notcompute 2013-06-06 09:28:38 -07:00
Clint Byrum
a983dbb103 Make descriptions less redundant. 2013-06-06 09:28:25 -07:00
Clint Byrum
a808e90f02 Adding OpenStack:: hints to engine 2013-06-06 09:28:06 -07:00
Clint Byrum
6504e6bd09 Simplify keystone into one instance. 2013-06-06 09:28:01 -07:00
Clint Byrum
81ec285ee7 Add a smaller scale heat-allinone template. 2013-06-06 09:26:51 -07:00
Clint Byrum
b4113dc7ef Add a 'notcompute' template. 2013-06-06 09:25:27 -07:00
Clint Byrum
d5e511f945 Add ability to combine roles into one role. 2013-06-06 09:25:27 -07:00
Clint Byrum
621a4dd9ca Support DependsOn 2013-06-06 09:25:27 -07:00
Clint Byrum
6defee322c Replace in AllowedResources 2013-06-06 09:25:27 -07:00
Clint Byrum
c7ef3cc3b0 Create a utility for merging templates. 2013-06-06 09:25:27 -07:00
Clint Byrum
a9a7de4fcb Fix type-o in rabbitmq.yaml. 2013-06-06 09:25:27 -07:00
Clint Byrum
ece60fa2cc Adding nova-api and finishing nova-compute split. 2013-05-09 17:44:37 -07:00
Clint Byrum
121ac3b21c Splitting nova-api and nova-compute. 2013-05-09 17:34:46 -07:00
Clint Byrum
6a231fa76c Fixes for nova element changes. 2013-05-09 14:55:07 -07:00
Clint Byrum
3046cbd8f3 Adding a (non-working) nova template. 2013-05-09 17:47:40 +00:00
Clint Byrum
5210ca302e Fixes for quantum template 2013-05-09 00:44:04 +00:00
Clint Byrum
fa6a26d794 Add a template for OpenStack Networking (Quantum). 2013-05-08 17:00:34 -07:00
Clint Byrum
2af825cf33 Add glance to mysql and base. 2013-05-08 16:13:07 -07:00
Clint Byrum
b4f7eae590 Merge github.com:SpamapS/templates
Conflicts:
	generic-user.yaml
2013-05-08 23:01:42 +00:00
Clint Byrum
07b90b6e3b Fix swift Metadata section. 2013-05-08 22:59:09 +00:00
Clint Byrum
edfbd862b3 Un-do all use of generic-user.yaml and remove it.
This was a rather experimental way to try and create some generic
templates in Heat. But the AllowedResources can only refer to resources
inside the template itself, so this is useless.
2013-05-06 21:50:09 -07:00
Clint Byrum
8be7b6b509 Cannot use generic-user.yaml, copy/paste in 2013-05-06 21:43:44 -07:00
Clint Byrum
600c10f4c2 Try List param again 2013-05-07 04:32:36 +00:00
Clint Byrum
41e750482e CommaSeparatedList -> CommaDelimitedList 2013-05-07 04:15:56 +00:00
Clint Byrum
a25d969516 Merge branch 'FIX-GENERIC' 2013-05-07 04:10:57 +00:00