8601 Commits

Author SHA1 Message Date
Jenkins
8f842e60bf Merge "Make scaling out a feature for merge.py." 2014-01-30 02:43:53 +00:00
Jenkins
cd9fce9086 Merge "Make debugging merge.py in the test suite possible." 2014-01-28 23:01:34 +00:00
Jenkins
e174686162 Merge "Permit writing output to other than stdout." 2014-01-28 22:17:30 +00:00
marios
4f423ed6ae Remove InstanceType and ImageId from cinder template
InstanceType and ImageId properties belong to an
AWS::AutoScaling::LaunchConfiguration, for example as used for
NovaCompute0Config in nova-compute-instance.yaml. However this
template doesn't use a LaunchConfig but params instead. AFAICT
we don't need these here (and they cause HEAT template validation
to fail)

Change-Id: If444e4449e3d62cb954de48bc3b55b16dcc8886f
2014-01-28 16:49:58 +02:00
Robert Collins
c071255ad6 Make scaling out a feature for merge.py.
This is a simple implementation designed to work with our current
non-HOT approach. We need to adjust our templates a little to support
this - though future work could make that better, it's orthogonal to
this effort.

Change-Id: I555617e5f24a5882de915f057dc02e008c81e753
2014-01-29 01:39:27 +13:00
Robert Collins
23c8aac2ba Make debugging merge.py in the test suite possible.
Change-Id: Ie30f0421601cbd5cf8f88dcc3dcf818b1db589ba
2014-01-29 01:39:27 +13:00
Robert Collins
0757603f2e Permit writing output to other than stdout.
Change-Id: I8349f347578bab564e4c37ee2c87314881e09b01
2014-01-29 01:39:24 +13:00
Clint Byrum
1d591672fb Allow setting a single NTP Server
We can allow multiple later when we have better tools for such things.

Change-Id: Ie902843c28f8a7258b207745653184784e3e9665
Partial-Bug: #1184486
2014-01-25 22:15:10 -08:00
Jenkins
6cecaac6a3 Merge "Use OS::Heat::UpdateWaitConditionHandle" 2014-01-24 23:18:31 +00:00
Jenkins
8ad2409ddb Merge "Expose bridge_mappings in the overcloud." 2014-01-23 21:34:52 +00:00
Robert Collins
0e961035a0 Expose bridge_mappings in the overcloud.
Some overclouds will want physical networks to be accessible by VMs,
and this is a component of that.

Change-Id: I5f65c040526f785b4e976f87980d94588b3fb63c
2014-01-23 18:04:29 +13:00
Jenkins
01fe17fe1b Merge "Add SSL configuration metadata for overclouds." 2014-01-22 04:21:37 +00:00
Dirk Mueller
5569d09be2 Add license file
Change-Id: I6f1807b2c4f3ec8bc0b181015997516c692fafee
2014-01-20 11:58:20 +01:00
Jenkins
6200c9f484 Merge "Add optional cinder storage node to overcloud" 2014-01-17 09:20:43 +00:00
Clint Byrum
c411d22942 Use OS::Heat::UpdateWaitConditionHandle
This alternate wait condition handle is used to make updates wait for
signals from all parties to signal they're ready.

This change will not work until the following Change Id lands in Heat:

Ibfadc6f9c436ce3d0f468a4e5560233f762038dd

Change-Id: Id11b5c79df5f41e49f1bf3c860e414204a242293
2014-01-16 18:12:57 -08:00
Robert Collins
e5d4ce3c5f Add SSL configuration metadata for overclouds.
This passes SSL keys in via Heat which places a high cost on heat
compromises or the use of a non-SSL heat to do deploys. We'll want
to ensure that that is documented clearly.

Change-Id: I14d441460116fda91fbd1d2097c5598b57155a6d
2014-01-17 14:18:53 +13:00
Ryan Brady
d023604727 Add optional cinder storage node to overcloud
Mergeable block storage yaml template. Makefile updated to create a
overcloud-with-block-storage template to deploy an additional machine
as a block storage node.

Change-Id: I37c06cde114592507a4583f7ec53ffac123d66e3
2014-01-15 08:53:24 -05:00
Jenkins
9e75c7e460 Merge "Add undercloud-vm-ironic-source yaml file" 2014-01-14 18:06:50 +00:00
Jenkins
7bd5d382e9 Merge "Add all and clean targets to makefile" 2014-01-14 17:44:44 +00:00
Jenkins
9b39f37990 Merge "Avoid echoing comment from makefile recipe" 2014-01-14 17:44:40 +00:00
Mark McLoughlin
787418f73e Add all and clean targets to makefile
Just for convenience, particularly 'make clean'.

Change-Id: Ic9964ace7fb4c675e84b3b9343fc8239abca44ac
2014-01-14 14:02:34 +00:00
Mark McLoughlin
5ea44eb897 Avoid echoing comment from makefile recipe
We include a comment to explain why nova-compute-instance.yaml is
included in the prerequisite list for overcloud.yaml, but this comment
gets echoed by make before it executes the recipe using a shell.

  $> make overcloud.yaml
  # overcloud-source.yaml [..] won't work here because [..]
  # a prerequisite but don't want to pass it into merge.py
  python ./tripleo_heat_merge/merge.py overcloud-source.yaml [..]
  mv overcloud.yaml.tmp overcloud.yaml

Instead, maintain a list of files included by overcloud.yaml in a
variable and put a comment above that.

Change-Id: I1af69fbb33e1833170f086aec9b54c5c4e57138f
2014-01-14 13:57:10 +00:00
Roman Podoliaka
cf45003e97 Add a wait condition to undercloud stack
Using of Heat wait conditions allows us to reliably reason when a
stack creation is complete (as the completion handle is triggered
when os-refresh-config completes).

Change-Id: I89725143532177a0b4aea23c1c31bc7737da0896
2014-01-13 14:55:11 +02:00
Devananda van der Veen
47cd2aeca9 Add undercloud-vm-ironic-source yaml file
Copies the undercloud-vm-source yaml file and removes portions which
were particular to nova-baremetal, replacing them and paving the way
for further Ironic-specific changes.

Change-Id: Ied49b0f8018291a0851cf2e10d83a174cb180479
2014-01-10 23:31:44 -08:00
Jenkins
5b3593cc0d Merge "Add Ceilometer parameters for the overcloud" 2014-01-08 13:01:04 +00:00
Clint Byrum
31f519ef88 Configure undercloud to use ext4 ephemeral FS
Ext4 is significantly more efficient when being created, and we do not
need to support older OS's or platforms that do not support ext4.

This will be ineffective until the change to the nova element lands,
but it is harmless to land this first. That change is referenced by this
Gerrit change ID in tripleo-image-elements:

Ic754f3b342b632a6919d4ad1b808627ec9fa4308

Closes-Bug: #1266262
Change-Id: Icca5fd94ca230141818ee9adb416f6f062869c6b
2014-01-06 17:34:21 -08:00
Tomas Sedovic
ed3663bb15 Add Ceilometer parameters for the overcloud
Change-Id: I205bb2c0bb7c9b956fd3e0d6b266bdf5afb48864
2014-01-02 12:07:34 +01:00
marios
c9ce27c981 Make merge.py installable as a package using pbr
Now that merge.py is invokable from another script
(Ia6b6416fe10358d23f2b120283eecaf4c1178cfd) and from comments at that
review, it makes sense to offer a nicer way to consume the merge
functionality.

Once you git clone tripleo-heat-templates you can python setup.py
install and get /usr/bin/tripleo_heat_merge as well as a
tripleo_heat_merge package in python2.7/site-packages.

Makefile edits required because we moved merge.py into the
tripleo_heat_merge directory for the packaging.

Change-Id: I587fa7a826f93f89e8e5c266af7f5765438fe738
2013-12-17 15:53:08 +02:00
Robert Collins
f6289d0127 Permit setting overcloud image update policies.
This is the first step towards preserving state on stack updates when the image
id has changed.

I chose REPLACE as the default value because that is the current behaviour and
we can override it from the command line.

Change-Id: I64eab51892922ab51a89a9f389457fd1ed979fb2
2013-12-17 15:26:32 +13:00
marios
3697a4ef02 Adds included-template-dir param for resolving template FileIncludes
In I587fa7a826f93f89e8e5c266af7f5765438fe738 there is a problem with
the overcloud.yaml Make target. Once the merge.py script is moved from
where the templates are, FileInclude paths cannot be resolved relative
to the script. The included-template-path defaults to './'

Change-Id: I220c5e52d8062e98aa28a1c582e29c7e844bc9ae
2013-12-16 17:02:48 +02:00
marios
18c5998d29 Make merge.py invokable from another script
Until now this script has been used at the command line. Tuskar would like
to consume the merge.py functionality to generate the overcloud heat stack
template. A main() is thus added here as well as a few related nits like
ensuring paths are absolute for included files. The actual merge
functionality is split into its own method so it can be invoked more
cleanly from calling scripts. The main method is then used at the command
line as before

For more info about how this will all be used by Tuskar see
I578b4e9f238590ea245b827bc75d252568d194fe

Change-Id: Ia6b6416fe10358d23f2b120283eecaf4c1178cfd
2013-11-29 15:01:26 +02:00
Jenkins
b1b60b2587 Merge "Fix case of OpenStack in templates." 2013-11-27 18:00:15 +00:00
Dan Prince
b9198ad03a Fix case of OpenStack in templates.
merge.py seems to look for OpenStack::ImageBuilder::Elements

But we use Openstack::ImageBuilder::Elements in our templates.

Change-Id: I94ee367cf77c3f2929ee23d2dcdd28622849c89e
2013-11-26 11:20:22 -05:00
Dan Prince
dbda731e48 Name the undercloud resources with 'undercloud'.
Using notcompute for the undercloud resources is a bit confusing
so lets rename them accordingly. This change shouldn't effect
the devtest scripts or toci because we don't pass a parameter
in for the undercloud.

Change-Id: I33c28a3554fe117c5a0a6e641ea277f7a95f2b35
2013-11-26 08:58:42 -05:00
Clint Byrum
38fcc17219 Wait for o-r-c on nova compute as well.
We have seen situations where nova-compute is not ready when notcompute
has run its waitcondition. That leads to  errors while we fail to boot
instances until there is at least one nova compute available.

We also update nova-compute-instance.yaml so that it continues to work
stand-alone.

Change-Id: Iadea7a34e2cd4576cc78659b99c12e1041af5b45
2013-11-25 13:31:02 -08:00
Dan Prince
e6afddb3ca Use merge.py for the undercloud templates.
This will require some changes to our devtest scripts
and TOCI to ensure we build the overcloud-vm template
before attempting to use it.

Change-Id: I14b5e4a0ccf5f18429bfc33e527bdb4760b8d1a3
2013-11-25 09:14:07 -05:00
Chris Krelle
5e23ab27f0 enable Ironic password for keystone auth
The current version of the ironic-source.yaml uses AdminPassword, it
should use the ironic users password and not the admin user password.
The patch corrects an authentication error by adding IronicPassword
to ironic-source.yaml file.

Change-Id: Idbe4950bb3026e2201ddfddc4b58c2bf98972be9
2013-11-20 15:33:52 -08:00
Derek Higgins
378783f876 Add metadata to configure swift
o Adds the required swift metadata (in swift-source.yaml).
o Sets up glance to use the swift backend on the overcloud.
o Sets up glance to use the file backend on the undercloud and seed,
  i.e. maintain the Status quo.

Change-Id: I4a70ffbf9c51f1fea5cfc84d8718d3d30d36b3f2
2013-11-18 13:34:44 +00:00
Jenkins
dea5f2faac Merge "Drop NeutronNativePXE option from undercloud tmpls" 2013-11-07 08:31:11 +00:00
Dan Prince
fff47517c0 Drop NeutronNativePXE option from undercloud tmpls
Depends on https://review.openstack.org/55338

We now just want to default to using Neutron native PXE.

Change-Id: Idec46638b88d7c050e721588e5dbddf233d02493
2013-11-06 12:31:19 +08:00
Imre Farkas
df18ea222c Fix KeystoneURL
Currently KeystoneURL reports back the noncompute instance IP, not the proper
API endpoint for the Keystone service.

Change-Id: If121620ec549d33f81522465f72e501b7723dd7d
2013-11-05 15:06:20 +01:00
Derek Higgins
99b21423ee Rename heat_watch_server_url to watch_server_url
The other *_server_url parameters are not prefixed with heat_ and this
is already in the heat namespace.

Change-Id: I24effcfedccb7b69b4e4d022db6676da51083401
2013-10-29 14:54:07 +00:00
Jenkins
7d14e86bfd Merge "Add Ironic-source.yaml" 2013-10-24 11:41:18 +00:00
Jenkins
4671819e7e Merge "Disable nova bm file injection in undercloud" 2013-10-23 23:46:44 +00:00
Chris Krelle
2fcc443bf2 Add Ironic-source.yaml
Mergeable Ironic yaml template. Makefile updated to create a
undercloud-vm-ironic template. This patch will allow Ironic
developers to include Ironic in the undercloud vm.

Change-Id: Ie3998336a12f3509742634e59de5c9bee922d579
2013-10-23 14:41:58 -07:00
Roman Podolyaka
445dda5863 Disable nova bm file injection in undercloud
We are now relying on host routes feature of neutron-dhcp-agent,
so it's time to disable nova bm file injection in undercloud
and use neutron-dhcp-agent instead (if file injection is enabled
the static route for metadata server is not set and overcloud
machines hit seed vm metadata server instead of undercloud one).

Co-Authored-By: Derek Higgins <derekh@redhat.com>

Partial-Bug: #1241042

Change-Id: I04a7fb0399031cbf475a427cceac080296f9bc8d
2013-10-23 17:57:09 +03:00
Jenkins
fff9c57ac6 Merge "Add KeystoneURL to Outputs section" 2013-10-23 09:51:27 +00:00
Chris Jones
80da8e3968 Add release configuration.
We can now release through openstack.org infrastructure.

Change-Id: I6dff6ae4a97db15bdc4ce419e46e9a125bec277c
2013-10-22 17:49:35 +01:00
Imre Farkas
5a99a0198f Add KeystoneURL to Outputs section
Having the KeystoneURL accessible in Heat allows the user to access the
overcloud services using the service catalog.

Change-Id: Ie6ef1aadf2f027d0b0793fea59385832c9f0c25f
2013-10-22 17:00:54 +02:00
Jenkins
b3b5b60051 Merge "Add tuskar API service configuration" 2013-10-16 01:53:14 +00:00