Robert Collins [Fri, 13 Sep 2013 07:04:49 +0000 (19:04 +1200)]
Get rid of global service-password.
No longer needed, less globals == win.
Change-Id: I2872e5a8775a09b2e857ef082f3b86109785a126
Robert Collins [Fri, 13 Sep 2013 07:02:30 +0000 (19:02 +1200)]
Add Nova service password.
Another service converted to match the keystone model of unique
accounts per service.
Change-Id: I62fce289a7032138be3aca8c74df499c2b1fde28
Robert Collins [Fri, 13 Sep 2013 06:48:05 +0000 (18:48 +1200)]
Add Glance service password.
The in-instance scripts are about to require this.
Change-Id: I0260da5502639acc60b2791e9f957952f7ab5956
Robert Collins [Fri, 13 Sep 2013 06:41:12 +0000 (18:41 +1200)]
Add cinder service-password.
The instance config is about to require this.
Change-Id: Ia778a7f5926b54758e73a4ee0940ef42fe5be6a9
Robert Collins [Thu, 12 Sep 2013 20:23:17 +0000 (08:23 +1200)]
Remove trailing whitespace.
Change-Id: Ifde42d405e22c32f4edc2fdd4f5aed5a0c8bff20
Clint Byrum [Fri, 13 Sep 2013 16:07:00 +0000 (09:07 -0700)]
Remove unmaintained individual service templates
First rule in the zombie apocalypse: Burn the dead.
Change-Id: I952c630ca424d114feb643a6c34d182cad660f26
Clint Byrum [Fri, 13 Sep 2013 16:03:46 +0000 (09:03 -0700)]
Use native server resource in overcloud
Change-Id: I4745627508e8b6b687fc17527cdd3c41d09b0d80
Clint Byrum [Fri, 13 Sep 2013 15:59:37 +0000 (08:59 -0700)]
Use native resource for nova-compute-instance
Change-Id: I347465b32578467ca3d9f55ea2994d832fcd8b3f
Clint Byrum [Fri, 13 Sep 2013 15:57:15 +0000 (08:57 -0700)]
Update undercloud-vm.yaml to use OS::Nova::Server
Change-Id: I34c294c62bf5da4c01d72931173c055c6a13706c
Clint Byrum [Fri, 13 Sep 2013 15:42:01 +0000 (08:42 -0700)]
Add support for merging OS::Nova::Server
Change-Id: Id6a801ee36ae73d8c2133b455e9a850c1a7b6a4d
Robert Collins [Fri, 13 Sep 2013 06:00:11 +0000 (18:00 +1200)]
escription -> Description
Change-Id: Iec40d309f3099998fbeb85de7538ed5e0d2e9c42
Robert Collins [Thu, 12 Sep 2013 22:25:49 +0000 (10:25 +1200)]
Add in Neutron service password.
The in-instance scripts are being fixed to not confuse the admin
password with the neutron service password.
Change-Id: I341574bb838a9563120791b9ac014d75274a96aa
Robert Collins [Thu, 12 Sep 2013 20:23:17 +0000 (08:23 +1200)]
Make admin-password configurable.
We use the admin password in in-instance scripts that configure e.g.
nagios from the cloud metadata, but production clouds will all have
unique passwords - it has to be a parameter.
Change-Id: I1f6c697ce27580fd669c7623e7fcea4c96ec62d0
Robert Collins [Wed, 11 Sep 2013 09:44:53 +0000 (21:44 +1200)]
Make the keystone admin token configurable.
Because unique is good for auth secrets.
Change-Id: Iaadc102d11d68d7fc059e62bd992de7ee6f2c818
Monty Taylor [Sun, 18 Aug 2013 02:57:51 +0000 (22:57 -0400)]
Update stackforge references to openstack
Change-Id: I3f1cc6ab666045257d5ef6afc3fd26c59d90e57b
Clint Byrum [Thu, 15 Aug 2013 18:35:56 +0000 (11:35 -0700)]
Migrate nova-compute-instance to split Metadata.
The file was using the old 0.0.0.0 method from heat-localip, but it was
missed when converting the other templates to a split Metadata approach
to enable a machine to know its own IP.
Change-Id: I0b117de12416a52950b1c7079f659df8649d67f9
Clint Byrum [Thu, 15 Aug 2013 11:14:26 +0000 (04:14 -0700)]
Correct os-collect-config.cfn.path to be string.
Specified as a list, it gets translated literally into
["NovaCompute0"] in /etc/os-collect-config.conf. This is not
desirable and results in 500 errors because ["NovaCompute0"] does
not exist.
Change-Id: I7dc01937d73c0c0e5cea70f5a3202d0e43c4caed
Clint Byrum [Wed, 31 Jul 2013 21:13:36 +0000 (14:13 -0700)]
Load local IP using separate post-boot Metadata.
Previously we could not feed the IP of an instance into its own
Metadata because of circular dependency problems. 0.0.0.0 was used
with the heat-localip element to work around this problem. This
caused problems though, as heat-localip would edit the source local
heat metadata, which would make cfn-hup and/or os-collect-config think
that the Metadata had changed, causing it to restart everything every
time we query the Metadata, which was about every five minutes.
Now we can just query this inert LaunchConfiguration resource to get
its' Metadata once it is ready. This resource will only change when
legitimate things are changed in the stack, and so we won't restart
everything every five minutes anymore. Note that when the native Heat
DSL lands, the OS::Heat::SoftwareConfig resource is meant for exactly
this purpose.
After this is merged we no longer need the heat-localip element.
Fixes bug #
1202322
Change-Id: Id06323ba43203570eeebfa5b3d03fa56c16c0c10
Clint Byrum [Wed, 31 Jul 2013 21:07:05 +0000 (14:07 -0700)]
Migrate from cfn-hup to os-collect-config
Os-collect-config is meant to replace cfn-hup from heat-cfntools. It
allows pulling from multiple metadata sources and runs continuously.
Fixes bug #
1211289
Change-Id: Ia4e9127fb79048bd1022b32a37272f8463a774ae
Clint Byrum [Thu, 15 Aug 2013 00:56:48 +0000 (17:56 -0700)]
Make Resource names suitable for merge/include
In nova-compute-instance.yaml, we need to use resource names that are
unique within the entire set of resources that may be merged or
included. However, we need the instance resource name to _match_ the
one in overcloud-source.yaml so that its own access policies can
function.
Without this change we will not have unique users and Metadata access
keys/policies for compute and controller.
Change-Id: Iebde7e6adede4984f4f693cf2d57b6fadb8be558
Clint Byrum [Thu, 15 Aug 2013 00:54:34 +0000 (17:54 -0700)]
Fix missing NovaComputeLibvirtType parameter.
Also change default to '' as null is not technically allowed as a
string default in cloudformation (Heat accidentally allows this).
Os-apply-config, via pystache, will still treat this as false for
the purposes of checking if it is set or not.
Change-Id: Ia02dbcf619bdc92647f1d21157fa4a8e3f749de3
Robert Collins [Mon, 12 Aug 2013 11:51:22 +0000 (23:51 +1200)]
Add ability to set overcloud hypervisor type.
This is needed for non-nested-kvm capable environments.
Change-Id: I2b87071941c04d3c99a687082db42d2a84f481fd
Robert Collins [Mon, 12 Aug 2013 10:41:35 +0000 (22:41 +1200)]
Set a physical bridge for network nodes.
The overcloud control plane needs to bring up an ovs bridge for the
ovs plugin hot-plugging and floating ip logic to work. The previous
in-instance script didn't migrate IP address and route information. We
can do that by using the core ovs script we wrote for baremetal setups
- triggered by setting the physical interface parameter.
Change-Id: I6d6b09140ee751371607c0963dc76cc5b95f7674
Robert Collins [Mon, 12 Aug 2013 08:29:14 +0000 (20:29 +1200)]
Remove unused network configuration metadata.
This is supplied to neutron etc via API calls - having it in Heat
leads to having redundancy, confusion and tricky scripts. Incubator
now has scripts to configure this and instances won't consult these
keys.
Change-Id: Ia45d9bf5bb326ec88f9f4a48c5520570cf5b6d72
Robert Collins [Mon, 12 Aug 2013 08:24:26 +0000 (20:24 +1200)]
Ignore built files.
We don't want someone accidentally committing them.
Change-Id: Iec4df61d3b7b1e1bd30f4cbba6b9991062758101
Robert Collins [Mon, 12 Aug 2013 01:49:01 +0000 (13:49 +1200)]
Increase PXE deploy timeout.
Several users with slightly older hardware report the PXE deploy
process aborting deploys that were progressing fine. By increasing the
default PXE deploy timeout we should cater for this. A separate bug
has been filed in Nova/Ironic about the timeout being too simple.
Change-Id: I9e340fc7f928b32b1146ce758cda7180888d6cc9
divakar-padiyar-nandavar [Thu, 8 Aug 2013 13:57:43 +0000 (07:57 -0600)]
Fixed merge code populating properties from yaml.
Fixed merge code populating properties from yaml files which was
setting only Type attribute for certain attribues related to Image
For example, default value for notcomputeImage is populated properly
in overcloud.yaml
Fixes bug #
1202884
Change-Id: I9ea270dd19e9ebdb997be5d07b04ee2df28e3721
Jenkins [Tue, 16 Jul 2013 09:42:32 +0000 (09:42 +0000)]
Merge "overcloud-source: Fix overcloud parameters."
Robert Collins [Tue, 16 Jul 2013 02:23:49 +0000 (14:23 +1200)]
Reinstate architecture binding for nova-bm.
Per bug
1201656 (which this doesn't fix) nova-compute can only run one
bm arch from a single compute host.
Change-Id: I0eabe6e85ed388af111ef503882dfdf7959d8d97
Robert Collins [Mon, 15 Jul 2013 01:54:58 +0000 (13:54 +1200)]
Stop passing no longer honoured keys in.
The undercloud (and boot-stack in general) no longer create baremetal
flavors or register baremetal ramdisks, so passing in keys for that
isn't needed.
Change-Id: I8c20e95f3a57418d7ae160a296a092cd71254e3d
Clint Byrum [Fri, 12 Jul 2013 21:52:14 +0000 (14:52 -0700)]
overcloud-source: Fix overcloud parameters.
These values were missed in the initial overcloud-source.yaml.
nova.metadata-proxy is required to allow vms to communicate with the
EC2-style metadata service.
quantum.ovs.fixed_range constraints DHCP allocation for the undercloud,
but in the overcloud we do not want this constraint because the individual
subnets we define will do that. quantum.ovs.ovs_range configures the
range of ips that can be assigned to the tenant subnets.
Change-Id: If7191fa8baf1209ae33b9e8200f52ea0ade97810
Clint Byrum [Thu, 11 Jul 2013 03:40:37 +0000 (20:40 -0700)]
Provide values for all nova compute params needed.
Previously these would have to be set for overcloud at runtime, but we
have good sane defaults now, and for nova-compute-instance we are able
to feed them in using the appropriate references with Fn::GetAtt.
Change-Id: Idfff2885bf2afa58b2dec84f06639198e411eae2
Clint Byrum [Wed, 10 Jul 2013 21:17:06 +0000 (14:17 -0700)]
Generate overcloud.yaml using overcloud-source.
This new version does not need any nested stacks and correctly
references notcompute.
Change-Id: I16f846f7983a956b5159d17bef85cf6a87d69b45
Clint Byrum [Wed, 10 Jul 2013 21:11:11 +0000 (14:11 -0700)]
Add an example of Type: FileInclude.
Change-Id: Ie9d45ea5e26e38e8782e7a3d0a626e36090f5388
Clint Byrum [Wed, 10 Jul 2013 17:58:05 +0000 (10:58 -0700)]
Add handling of parameter replacements.
We will need to replace the use of Parameters in the included template
with actual values in many cases.
Change-Id: I95fc9116dc2bba74c31d5570851c5c4eb476291a
Clint Byrum [Wed, 10 Jul 2013 17:44:36 +0000 (10:44 -0700)]
Add FileInclude special type.
We need to be able to combine pieces without uploading bits to an
accessible URL.
Change-Id: If0cec8ce7c77fed786d54dd0af2eb7823c088920
Derek Higgins [Wed, 10 Jul 2013 11:53:44 +0000 (12:53 +0100)]
Quantum -> Neutron rename
Almost all references to quantum have been changed
neutron in tripleo-image-elements.
Change-Id: Ib17353d5834dd95d0348f62111074180c6e47181
Robert Collins [Wed, 10 Jul 2013 03:04:50 +0000 (15:04 +1200)]
Update boot-stack vm image for overcloud use.
We now have an undercloud specific template, so we can use
bootstack-vm specifically for the overcloud control plane.
Change-Id: I06eb2b1d00e4d2211b632a06880aed51f01762ff
Robert Collins [Wed, 10 Jul 2013 02:59:02 +0000 (14:59 +1200)]
Set a default image name for compute nodes.
Defaults that match devtest.md will make adoption easier.
Change-Id: I6b8c2b13cada5454ff52681451f9124b67ea44a9
Robert Collins [Wed, 10 Jul 2013 02:45:48 +0000 (14:45 +1200)]
Make merge.py output deterministic.
The current code uses dictionary sort order which is defined as being
an undefined order. Since humans review .yaml files having them sorted
is a good thing.
Change-Id: I43a31530bc042750448ac904c0c22f9a59b09b4d
Robert Collins [Wed, 10 Jul 2013 02:35:32 +0000 (14:35 +1200)]
Refine the Makefile rules.
The make rules in use were duplicative, which leads to maintenance
headaches.
Change-Id: Ic9e37796422caa2427c1575eb776c5d6a98516c3
Clint Byrum [Tue, 9 Jul 2013 17:38:03 +0000 (10:38 -0700)]
Update bootstack-vm to match undercloud.
Also add Makefile stanza to produce overcoud.yaml from bootstack-vm
and nova-compute-group. This should allow independent usage of
nova-compute-group without having to manually update overcloud.
Change-Id: Id2bd20596e6be887b55019fdad31e6b0f4762eb7
Clint Byrum [Mon, 8 Jul 2013 23:31:43 +0000 (16:31 -0700)]
Update nova-compute-instance URL.
Heat must download nested stack templates from a static URL. We
have chosen a reasonable default, the official repository for
tripleo-heat-templates.
Change-Id: I9f8f1f3d3ec6492cf3891fab4fe793e05e703eb5
Jenkins [Mon, 8 Jul 2013 19:47:31 +0000 (19:47 +0000)]
Merge "Update undercloud-vm for new networking config."
Chris Krelle [Thu, 4 Jul 2013 14:42:52 +0000 (07:42 -0700)]
Update nagios3.yaml to reflect changes to the postfix element.
Recent changes to the postfix element added new parameters so
the nagios3 template needed to updated to ensure postfix works
as expected.
Change-Id: I0a9eb8e0988470888f35adcc426ccd314f93b301
Authored-by: Chris Krelle <nobodycam@gmail.com>
Robert Collins [Sat, 6 Jul 2013 04:08:30 +0000 (16:08 +1200)]
Update undercloud-vm for new networking config.
It is currently broken due to mismatched config keys.
Change-Id: If3ce934730cb974af7bcd7c6b3134e499f4e2a0d
Derek Higgins [Wed, 3 Jul 2013 14:51:19 +0000 (15:51 +0100)]
Remove reference to KeystoneLaunch
This resource was remove in
6504e6bd09b8b3b14ce56490ea3e17daf8cc0a93
"Simplify keystone into one instance."
Change-Id: Iea1502e4f00539abc4b8d04ea37e55c2133f7ae7
Robert Collins [Thu, 27 Jun 2013 03:44:08 +0000 (15:44 +1200)]
A template for dev-test underclouds.
Change-Id: Ibf59b34341129712c0e3187aa87ac90c092a74a7
Robert Collins [Thu, 27 Jun 2013 03:43:42 +0000 (15:43 +1200)]
Ignore editor files.
Change-Id: I2bf716cae119ccc8a4b4fa6fae4caa7444156526
Robert Collins [Thu, 20 Jun 2013 03:15:09 +0000 (15:15 +1200)]
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
Jenkins [Wed, 19 Jun 2013 22:46:34 +0000 (22:46 +0000)]
Merge "Remove references to Fn::GetAtt."
Derek Higgins [Thu, 13 Jun 2013 23:16:34 +0000 (00:16 +0100)]
Remove references to Fn::GetAtt.
These were causing a Circular dependency error during the
creation of a stack.
Change-Id: Iccdf4a081f38aa3a5fe0e250b9e9382958a0f26e
Jenkins [Wed, 19 Jun 2013 22:25:41 +0000 (22:25 +0000)]
Merge "Fix default mysql usernames."
Jenkins [Wed, 19 Jun 2013 22:23:37 +0000 (22:23 +0000)]
Merge "Adding floatingip_start and floatingip_end to heat template."
Jenkins [Wed, 19 Jun 2013 20:03:14 +0000 (20:03 +0000)]
Merge "Add sample template for nagios3 element."
Derek Higgins [Wed, 12 Jun 2013 06:34:13 +0000 (07:34 +0100)]
Fix default mysql usernames.
Username heat looks like it got copy and pasted.
Change-Id: I40666b8e80df7424e223b317ab4c9d6f614c43e6
Derek Higgins [Wed, 19 Jun 2013 13:56:19 +0000 (14:56 +0100)]
Adding floatingip_start and floatingip_end to heat template.
These are needed by the quantum-network-node element
Change-Id: Ic89b7f25752778aa2145768152bbc6e634ea3e5f
Chris Krelle [Wed, 12 Jun 2013 21:41:33 +0000 (14:41 -0700)]
Add sample template for nagios3 element.
Change-Id: I02a80a371a8ca493f4e143def82215f33b29ac6c
Authored-by: Chris Krelle <nobodycam@gmail.com>
Robert Collins [Wed, 12 Jun 2013 05:12:32 +0000 (17:12 +1200)]
Parameterise more settings for nova and quantum.
Change-Id: Ia35431302848666ad013adaeae1d06482cd3117a
Robert Collins [Wed, 12 Jun 2013 02:01:23 +0000 (14:01 +1200)]
Add .gitreview setup.
Change-Id: I22855e7f3c77984ffc81ebf00e62cb78839e63a7
Clint Byrum [Thu, 23 May 2013 22:49:41 +0000 (15:49 -0700)]
Nested stack of nova-compute-instance.yaml
Clint Byrum [Thu, 23 May 2013 22:48:15 +0000 (15:48 -0700)]
New single instance nova-compute.
Clint Byrum [Mon, 20 May 2013 01:48:14 +0000 (18:48 -0700)]
Adding bootstack-vm template.
Clint Byrum [Fri, 17 May 2013 03:13:03 +0000 (20:13 -0700)]
PrivateIp is not assigned yet, plus 127.0.0.1 will work fine
Cody A.W. Somerville [Thu, 16 May 2013 22:25:55 +0000 (18:25 -0400)]
Fixed the nova-compute template.
Clint Byrum [Thu, 16 May 2013 23:10:20 +0000 (16:10 -0700)]
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.
Clint Byrum [Tue, 14 May 2013 21:49:33 +0000 (14:49 -0700)]
Hand modifying notcompute to work with elements.
Clint Byrum [Tue, 14 May 2013 19:15:55 +0000 (12:15 -0700)]
Adding username/password for Nova in notcompute.
Clint Byrum [Thu, 6 Jun 2013 16:32:50 +0000 (09:32 -0700)]
Hand modified notcompute.yaml to work properly.
Clint Byrum [Thu, 6 Jun 2013 16:32:35 +0000 (09:32 -0700)]
Remove unused NovaAPISize from nova-api
Clint Byrum [Thu, 6 Jun 2013 16:30:59 +0000 (09:30 -0700)]
Use slave roles in Makefile.
Clint Byrum [Tue, 14 May 2013 18:41:36 +0000 (11:41 -0700)]
Add a Makefile for regenerating common merges
Clint Byrum [Tue, 14 May 2013 18:39:35 +0000 (11:39 -0700)]
Removing unused TemplateURL
Clint Byrum [Tue, 14 May 2013 18:35:36 +0000 (11:35 -0700)]
Add glance heat and keystone to notcompute
Clint Byrum [Tue, 14 May 2013 18:34:39 +0000 (11:34 -0700)]
Make descriptions less redundant.
Clint Byrum [Tue, 14 May 2013 18:31:18 +0000 (11:31 -0700)]
Adding OpenStack:: hints to engine
Clint Byrum [Tue, 14 May 2013 18:31:06 +0000 (11:31 -0700)]
Simplify keystone into one instance.
Clint Byrum [Tue, 14 May 2013 18:30:52 +0000 (11:30 -0700)]
Add a smaller scale heat-allinone template.
Clint Byrum [Tue, 14 May 2013 18:20:17 +0000 (11:20 -0700)]
Add a 'notcompute' template.
Clint Byrum [Tue, 14 May 2013 18:19:43 +0000 (11:19 -0700)]
Add ability to combine roles into one role.
Clint Byrum [Tue, 14 May 2013 18:02:51 +0000 (11:02 -0700)]
Support DependsOn
Clint Byrum [Tue, 14 May 2013 18:01:53 +0000 (11:01 -0700)]
Replace in AllowedResources
Clint Byrum [Mon, 13 May 2013 17:06:42 +0000 (10:06 -0700)]
Create a utility for merging templates.
Clint Byrum [Tue, 14 May 2013 17:56:25 +0000 (10:56 -0700)]
Fix type-o in rabbitmq.yaml.
Clint Byrum [Fri, 10 May 2013 00:44:37 +0000 (17:44 -0700)]
Adding nova-api and finishing nova-compute split.
Clint Byrum [Fri, 10 May 2013 00:34:46 +0000 (17:34 -0700)]
Splitting nova-api and nova-compute.
Clint Byrum [Thu, 9 May 2013 21:55:07 +0000 (14:55 -0700)]
Fixes for nova element changes.
Clint Byrum [Thu, 9 May 2013 17:47:40 +0000 (17:47 +0000)]
Adding a (non-working) nova template.
Clint Byrum [Thu, 9 May 2013 00:44:04 +0000 (00:44 +0000)]
Fixes for quantum template
Clint Byrum [Thu, 9 May 2013 00:00:34 +0000 (17:00 -0700)]
Add a template for OpenStack Networking (Quantum).
Clint Byrum [Wed, 8 May 2013 23:13:07 +0000 (16:13 -0700)]
Add glance to mysql and base.
Clint Byrum [Wed, 8 May 2013 23:01:42 +0000 (23:01 +0000)]
Merge github.com:SpamapS/templates
Conflicts:
generic-user.yaml
Clint Byrum [Wed, 8 May 2013 22:59:09 +0000 (22:59 +0000)]
Fix swift Metadata section.
Clint Byrum [Tue, 7 May 2013 04:50:09 +0000 (21:50 -0700)]
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.
Clint Byrum [Tue, 7 May 2013 04:43:44 +0000 (21:43 -0700)]
Cannot use generic-user.yaml, copy/paste in
Clint Byrum [Tue, 7 May 2013 04:32:36 +0000 (04:32 +0000)]
Try List param again
Clint Byrum [Tue, 7 May 2013 04:15:56 +0000 (04:15 +0000)]
CommaSeparatedList -> CommaDelimitedList
Clint Byrum [Tue, 7 May 2013 04:10:57 +0000 (04:10 +0000)]
Merge branch 'FIX-GENERIC'
Clint Byrum [Tue, 7 May 2013 04:08:00 +0000 (04:08 +0000)]
Invalid Parameter type "list"
Clint Byrum [Tue, 7 May 2013 01:34:24 +0000 (18:34 -0700)]
Fix yaml formatting