8601 Commits

Author SHA1 Message Date
Clint Byrum
46c4ce3717 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
2013-08-14 20:27:58 -07:00
Clint Byrum
99a1e75250 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
2013-08-14 20:27:54 -07:00
Clint Byrum
c7241b26e5 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
2013-08-14 20:25:14 -07:00
Clint Byrum
2334a8f0b2 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
2013-08-14 18:39:57 -07:00
Robert Collins
5e069fece4 Add ability to set overcloud hypervisor type.
This is needed for non-nested-kvm capable environments.

Change-Id: I2b87071941c04d3c99a687082db42d2a84f481fd
2013-08-12 23:51:22 +12:00
Robert Collins
f31e4ce336 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
2013-08-12 22:41:35 +12:00
Robert Collins
9d80bede79 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
2013-08-12 20:29:14 +12:00
Robert Collins
f733956be8 Ignore built files.
We don't want someone accidentally committing them.

Change-Id: Iec4df61d3b7b1e1bd30f4cbba6b9991062758101
2013-08-12 20:24:26 +12:00
Robert Collins
15c91d8883 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
2013-08-12 13:49:01 +12:00
divakar-padiyar-nandavar
61a0528543 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
2013-08-08 08:09:13 -06:00
Jenkins
94eb778d71 Merge "overcloud-source: Fix overcloud parameters." 2013-07-16 09:42:32 +00:00
Robert Collins
257ebe0324 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
2013-07-15 20:25:10 -07:00
Robert Collins
57706693eb 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
2013-07-15 13:54:58 +12:00
Clint Byrum
dc23c472a2 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
2013-07-12 17:14:55 -07:00
Clint Byrum
3af1536287 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
2013-07-10 21:49:51 -07:00
Clint Byrum
793dd12964 Generate overcloud.yaml using overcloud-source.
This new version does not need any nested stacks and correctly
references notcompute.

Change-Id: I16f846f7983a956b5159d17bef85cf6a87d69b45
2013-07-10 17:24:53 -07:00
Clint Byrum
7ed33928b2 Add an example of Type: FileInclude.
Change-Id: Ie9d45ea5e26e38e8782e7a3d0a626e36090f5388
2013-07-10 14:16:33 -07:00
Clint Byrum
4a43e6395d 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
2013-07-10 14:11:40 -07:00
Clint Byrum
aebad8ce24 Add FileInclude special type.
We need to be able to combine pieces without uploading bits to an
accessible URL.

Change-Id: If0cec8ce7c77fed786d54dd0af2eb7823c088920
2013-07-10 14:11:40 -07:00
Derek Higgins
36b4e49819 Quantum -> Neutron rename
Almost all references to quantum have been changed
neutron in tripleo-image-elements.

Change-Id: Ib17353d5834dd95d0348f62111074180c6e47181
2013-07-10 12:53:44 +01:00
Robert Collins
ed22078207 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
2013-07-10 15:09:41 +12:00
Robert Collins
13ae966069 Set a default image name for compute nodes.
Defaults that match devtest.md will make adoption easier.

Change-Id: I6b8c2b13cada5454ff52681451f9124b67ea44a9
2013-07-10 14:59:02 +12:00
Robert Collins
d071b3dcc3 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
2013-07-10 14:45:48 +12:00
Robert Collins
688a489021 Refine the Makefile rules.
The make rules in use were duplicative, which leads to maintenance
headaches.

Change-Id: Ic9e37796422caa2427c1575eb776c5d6a98516c3
2013-07-10 14:35:32 +12:00
Clint Byrum
6529485a2a 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
2013-07-09 14:17:39 -07:00
Clint Byrum
3c12e51a84 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
2013-07-09 14:14:36 -07:00
Jenkins
c1661002b0 Merge "Update undercloud-vm for new networking config." 2013-07-08 19:47:31 +00:00
Chris Krelle
0c5bd2fc23 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>
2013-07-06 08:33:55 -07:00
Robert Collins
1da5280d0c Update undercloud-vm for new networking config.
It is currently broken due to mismatched config keys.

Change-Id: If3ce934730cb974af7bcd7c6b3134e499f4e2a0d
2013-07-06 16:08:48 +12:00
Derek Higgins
7633278ba4 Remove reference to KeystoneLaunch
This resource was remove in
6504e6bd09b8b3b14ce56490ea3e17daf8cc0a93
"Simplify keystone into one instance."

Change-Id: Iea1502e4f00539abc4b8d04ea37e55c2133f7ae7
2013-07-03 15:52:40 +01:00
Robert Collins
5fd08e1bf0 A template for dev-test underclouds.
Change-Id: Ibf59b34341129712c0e3187aa87ac90c092a74a7
2013-06-27 15:47:27 +12:00
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