477 Commits

Author SHA1 Message Date
Jenkins
9b2446c88d Merge "Enable Neutron DVR support in TripleO installation" 2014-11-11 15:25:11 +00:00
Jenkins
897c8b8aa9 Merge "Use parameter constraints for image, key and flavor" 2014-10-31 15:42:22 +00:00
Jenkins
4bfb71e1ed Merge "Add converted version of block and object storage" 2014-10-31 01:41:49 +00:00
Jenkins
a9d03c8ba7 Merge "Don't replace OS::Neutron::Port on update" 2014-10-30 16:38:34 +00:00
Jenkins
b6fac3c901 Merge "Add SSL PKI properties for keystone" 2014-10-30 09:11:01 +00:00
Steve Hardy
9cf073075c Don't replace OS::Neutron::Port on update
Due to an ununsual interface to OS::Neutron::Port resources,
it's necessary to specify replacement_policy: AUTO, or the
resource is unconditionally replaced on every stack update.

I've started discussion re possibly changing the default in
Heat, but right now, we need this or we have the bad outcome
of replacing all (!) compute and controller nodes on every
stack-update, even if the templates are unmodified.

Passing the AUTO value should be safe regardless of any
potential change of default value in Heat.

Change-Id: I6dd02ae17407f8f4c81ae418e5027f4f38ae4e9b
Closes-Bug: #1383709
2014-10-28 19:29:50 +00:00
Phil Neal
309931c3d0 Add overcloud options for SSL RabbitMQ connections
Adds configuration options for Rabbit port and use_ssl settings using a shared
RabbitMQ parameter.

Change-Id: I7b7613cb60b9095ba5665c335c496fea4514391a
2014-10-27 13:30:16 -06:00
Jenkins
04dd8be010 Merge "Simplify the layout of haproxy net binds config" 2014-10-27 08:07:49 +00:00
Jenkins
cd389e065f Merge "Add block completion signal" 2014-10-24 07:40:24 +00:00
Steven Hardy
928cd735f3 Use parameter constraints for image, key and flavor
If you don't have (or provide) the wrong image, KeyName,
or flavor, we fail at some later point (not always early,
depending on what's wrong).

Since Icehouse, Heat has had a "custom constraints" method
of dynamically validating parameter values, by comparing the
value provided with a list from the underlying service.

Despite the name, there's nothing "custom" about the constraints,
these ones are included in Heat by default (though they are pluggable,
which is where the name comes from..)

See the docs for more info:
http://docs.openstack.org/developer/heat/template_guide/hot_spec.html#custom-constraint

Note, I've not considered network validation here, this could
possibly be added in a subsequent patch.

These constraints are evaluated via any of the following:
- heat template-validate -f <template>
- heat stack-preview <arguments given to create>
- heat stack-create <arguments, fails fast before creating anything>
- heat stack-update <arguments, fails fast before updating anything>

Change-Id: I3a6374ce5421575cdde893c62aa97c750a07acd8
2014-10-23 18:42:50 +01:00
Erik Colnick
23d85de69b Enable Neutron DVR support in TripleO installation
This change adds the necessary elements to the overcloud-source.yaml,
nova-compute-config.yaml and nova-compute-instance.yaml to allow Neutron
Distributed Virtual Routers (DVR) to be enabled.  The added elements are
set to default to values such that DVR is not enabled in keeping with
backwards compatibility.

Change-Id: I422c65e7d941593083d52ad7fdf0dfd1d2fb3155
blueprint: support-neutron-dvr
2014-10-23 03:22:58 -06:00
Gregory Haynes
0064f5e8b6 Add SSL PKI properties for keystone
To implement the SSL PKI spec we need to change the keystone ssl cert
and cert key properties to be more generalizable. We also need to
support the old properties for backwards compatibility.

Change-Id: Icf46132230512a31b6dec3c07164c95b13dd8f73
2014-10-22 08:09:04 -07:00
Nicholas Randon
44a1924bc0 Simplify the layout of haproxy net binds config
Make the net binds simpler to maintain.

Change-Id: I7c7f2cde38a88976afe33097cdfe4a93d62a6417
2014-10-22 09:38:49 +00:00
Peter Belanyi
24f40d5312 Add converted version of block and object storage
This patch extends the previous 'Don't use merge.py for overcloud'
commit with the cinder-storage.yaml and swift-storage.yaml templates.

Requirements for this to deploy:

1. Block and object storage images have to be built
(overcloud-cinder-volume and overcloud-swift-storage)

2. The images have to be loaded by devtest_overcloud.sh
OVERCLOUD_CINDER_ID=$(load-image -d $TRIPLEO_ROOT/overcloud-cinder-volume.qcow2)
OVERCLOUD_SWIFT_ID=$(load-image -d $TRIPLEO_ROOT/overcloud-swift-storage.qcow2)

Change-Id: I45f9d9f051970a83e26c0fd924d7c98276958113
2014-10-21 13:39:09 +02:00
Alexis Lee
c270cf0c5e Add block completion signal
In I973d197245ed32612bde9209479e6ae3a443fc69, the signal_transport was
set to NO_SIGNAL to prevent the resource staying CREATE_IN_PROGRESS
forever. This means that Heat reports the stack is configured before it
actually is.

The correct fix was to add completion-signal to BlockStorageConfig.
However now there's a BlockStorage0AllNodesDeployment, we simply have to
receive the signal from allNodesConfig by setting the deployment
signal-transport.

Change-Id: I1f6408ca39fddd146e7aae140f61d265bbf563ec
2014-10-21 10:32:45 +00:00
Tomas Sedovic
bcdcc28cb6 Compute and controller templates without merge.py
This provides three templates: overcloud-without-mergepy.yaml,
compute.yaml and controller.yaml. These can be used in combination with
overcloud-resource-registry.yaml to deploy the overcloud on their own --
without having to do any pre-processing (via merge.py).

To test these you have to add the resource registry environment (in
addition to the existing `-e` option) and use the new overcloud template
in the Heat call in devtest_overcloud.sh (line 374):

    heat $HEAT_OP -e $TRIPLEO_ROOT/overcloud-env.json \
        -e "$TRIPLEO_ROOT/tripleo-heat-templates/overcloud-resource-registry.yaml" \
        -t 360 \
        -f $TRIPLEO_ROOT/tripleo-heat-templates/overcloud-without-mergepy.yaml \
        -P "ExtraConfig=${OVERCLOUD_EXTRA_CONFIG}" \
        $STACKNAME

The existing overcloud Heat environment
($TRIPLE_ROOT/overcloud-env.json) should keep on working.  Scaling is
now being controlled by the `ControllerCount` and `ComputeCount`
template parameters, though.

NOTE: the changes here depend on a fairly recent Heat build (commit
e5f285f6cb from ~7th September, 2014). In other words, this requires
Juno Heat.

Also, passing more than one environment file to Heat requires
python-heatclient version 0.2.11.

Change-Id: I687a00c7dc164ba044f9f2dfca96a02401427855
2014-10-20 14:12:41 +02:00
Jenkins
7b48754b98 Merge "Passthrough{Specific} and allNodesConfig for BlockStorage nodes" 2014-10-20 10:07:19 +00:00
Giulio Fidente
34df5f9af9 Passthrough{Specific} and allNodesConfig for BlockStorage nodes
Purpose of this change is to allow passthrough of *specific values*
for *same key* in particular to BlockStorage nodes. Same
behaviour is already implemented for controllers and computes.

Change-Id: I7074a8f7d406adaa56e55013b10bd520fcacfcf6
2014-10-17 17:16:11 +02:00
Jenkins
83914a012b Merge "Refactor Heat dependencies for nova compute" 2014-10-16 15:42:43 +00:00
Jenkins
ad0692e3e8 Merge "Configures haproxy to serve novnc_proxy" 2014-10-15 22:17:27 +00:00
Jenkins
737185abf1 Merge "Secure the MySQL bind-address on the undercloud" 2014-10-15 22:01:55 +00:00
Tom Cammann
faf2c2f45a Refactor Heat dependencies for nova compute
Allows heat to have more control of the parallelism of the deploy
and allow easy integration of the new heat dependencies required for
nova compute integration. At present is difficult understand and has
unnecessary complex dependencies.

Change-Id: Ie566b8b14cbd98fe29cc2368a96d45cc74ca4715
Co-Authored-By: Nicholas Randon <nicholas.randon@hp.com>
2014-10-14 14:29:21 +00:00
Alexis Lee
6f3f9ec6da Sort inputs and parameters
They're mostly rather higgledy-piggledy at the moment which makes it
quite difficult to compare against files where these are sorted. EG
compute.yaml from I687a00c7dc164ba044f9f2dfca96a02401427855.

Change-Id: I508a3d0f6a79810d2100fdd1ad143bcd37bf8c00
2014-10-08 15:40:39 +01:00
Jenkins
a35679f539 Merge "Add SwiftMinPartHours parameter" 2014-10-07 20:50:59 +00:00
Therese McHale
3ba00edb2a Secure the MySQL bind-address on the undercloud
The MySQL bind-address on the undercloud should be set to
localhost for security.

Change-Id: I0ea485fa6673c06087f5c5baedf591fba54288a4
2014-10-07 14:03:51 +01:00
Loganathan Parthipan
02140eb5b1 Configures haproxy to serve novnc_proxy
This patch configures haproxy to serve novnc_proxy which currently
listens on 0.0.0.0. So before this patch goes in novnc needs to be
listening on local-ipv4 like the rest of the services. The following
patch does that in image-elements.

https://review.openstack.org/#/c/125326/

Change-Id: I0c6a3d6a8fd10da71abbf568633b28bdb5e56aa2
2014-10-01 12:53:23 +01:00
Jenkins
7d703cb7e7 Merge "Remove unnecessary completion signal" 2014-09-30 11:53:51 +00:00
Lorcan
24a45cb0de Add SwiftMinPartHours parameter
This parameter adds the facility for an operator to set the length
of time in hours that a partition in a swift ring can be altered
following a rebalance of that ring. The default value is set to one.

The corresponding element change is here:
Ie6438386a54794e1ae2f31ad925db01c2c10ed6d

Change-Id: Icc5e431a7e2884b3ca3a255b6fd901619bc98460
2014-09-29 10:22:28 +01:00
Jenkins
0df4f416f9 Merge "undercloud: use Nova compute Ironic driver" 2014-09-26 12:23:12 +00:00
Dan Prince
46e724baa0 undercloud: use Nova compute Ironic driver
Updates the NovaComputeDriver and NovaSchedulerHostManager
defaults so that we use the Nova in-tree versions of
the Ironic compute and scheduler host managers.

The old Ironic in-tree drivers are now deprecated.

Change-Id: I91667a3e7861591285c931006c448cc304649349
2014-09-19 10:44:32 -04:00
Dan Prince
53aaa6b528 Drop CinderLVMLoopDeviceSize from the undercloud
This parameter is unused so lets drop it.

Change-Id: Ie0bec06b14b6b284716604281d29fea065c2a03b
2014-09-19 10:27:52 -04:00
Tom Cammann
f33720a3cc Remove unnecessary completion signal
There is a spurious completion signal in nova compute config which is
confusing and unnecessary.

Change-Id: I302470933c80443a1069faa03cc924f14ba71ca3
Co-Author: Nicholas Randon
2014-09-18 10:54:37 +01:00
Jenkins
6e76648330 Merge "Deprecate Role and ImageBuilder metadata handling" 2014-09-18 06:41:08 +00:00
Jenkins
622d4cb6cf Merge "Parametrize Swift partition power" 2014-09-16 09:15:26 +00:00
Jenkins
4608c70e12 Merge "Parameterize network type and tunnel types" 2014-09-15 19:18:08 +00:00
James Slagle
eb7fe9bb9b Parameterize network type and tunnel types
Remove the hardcoding of gre as the Neutron tenant network type for the
Overcloud. This will enable the ability to deploy an Overcloud that uses
vxlan instead of gre tunnels. A new parameter, NeutronTunnelTypes, is
added to allow configuring the tunnel_types parameter in the Neutron ML2
configuration.

This change is required by https://review.openstack.org/#/c/92913

Change-Id: I2c2e2153a61349e58ada28c87aa2338c9f00e7bd
2014-09-15 08:16:48 -04:00
Steve Baker
d6e40a3fff Use the server name attribute
The 'show' attribute results in a nova API call, which has
performance overhead even with attribute memoization.
The name attribute was added to expose the name without needing
an API call, since the resource already knows the name. This
change switches from using 'show' to 'name' throughout.

Change-Id: I1e83dd008cd02e5cec97868db0d5a695f07b7199
2014-09-14 10:05:43 +12:00
Jenkins
fd18617b30 Merge "Fix spelling of controller0_VLANPort" 2014-09-12 09:18:47 +00:00
Jenkins
218bd3cad5 Merge "Add specific pass-through config for each role" 2014-09-10 12:01:42 +00:00
Tomas Sedovic
9e262a51e9 Deprecate Role and ImageBuilder metadata handling
Our templates and elements no longer depend on `OpenStack::Role` or
`OpenStack::ImageBuilder::Elements` metadata. Using either now prints out a
deprecation warning.

Change-Id: I91e79b00bacca8caf13d4b6fa83d90e9c20b241c
2014-09-10 11:30:15 +02:00
Jenkins
cdfe285f79 Merge "Update overcloud examples for ExtraConfig" 2014-09-08 15:17:24 +00:00
Dan Prince
b15bdfc8cc Update overcloud examples for ExtraConfig
The existing examples for the overcloud ExtraConfig options
use an ironic setting that would likely never apply (Ironic
isn't for the overcloud).

This patch modifies the default section setting to use
the Nova force_config_drive option instead as a
config example.

Change-Id: Ieb893552fe9466b90b9d9a831a676d114efb6db1
2014-09-05 16:30:00 -04:00
Dan Prince
656b8385ef Undercloud params for compute driver and manager
Add undercloud template parameters for NovaComputeDriver,
NovaComputeManager, and NovaSchedulerHostManager.

The motivation here is to be able to test configure Nova to use
the new (in-tree) Ironic compute driver (which used to live
in Ironic).

NOTE: The initial Nova in-tree Ironic driver won't have its
own ClusteredComputeManager (compute_manager). Even so I've
gone ahead and added a parameter for NovaComputeManager
so we can modify this accordingly in the future without
making hard coded template changes.

Change-Id: Ib48a6b6d8a6cff157bdf3948bd0330e9b29dd46a
2014-09-05 16:18:01 -04:00
Eamonn O'Toole
b7964165b7 Parametrize Swift partition power
The Swift partition power is currently hard-coded to 10.  While
this is fine for small Swift clusters there are some users who
will want to configure rings with higher partition powers.  We
have parametrized the value of the partition power, and the
default is set to 10.

Change-Id: If115cf5cf2f4c2ff7d28b0f5ae3d2ca3f4b4be5a
2014-09-05 11:19:22 +01:00
James Polley
033111d66a Fix spelling of controller0_VLANPort
Prior to this change, using these templates fails as
controller0_VLANPort is defined, but we attempt to use
controller0VLANPort instead.

Change-Id: Ieb2eece4e7d48177acae0bef916192d8e6a4a4a3
2014-09-04 15:35:59 +10:00
Jenkins
a916a8b2f8 Merge "Make turning debug on globally easy." 2014-09-02 21:53:16 +00:00
Jenkins
b2e3a746d4 Merge "Change | to > in templates." 2014-09-02 20:18:37 +00:00
Jenkins
2d6e729c59 Merge "Remove unused Neutron values" 2014-09-01 14:31:33 +00:00
Nicholas Randon
8e0331271d Add specific pass-through config for each role
Supplement ExtraConfig with specific versions - ControllerExtraConfig and
NovaComputeExtraConfig. This allows the user to specify different
configurations for each role.

Change-Id: Ieaee80e414130504a5e40e878a5a4ca1c196ca2b
2014-09-01 15:03:36 +01:00
Robert Collins
cfb9931ce4 Change | to > in templates.
Clint pointed out that | prevents things rendering properly on
arbitrarily wide screens. For most things that makes sense but it
doesn't for the JSON examples IMO so I didn't alter those.

Change-Id: Ifb7dcc265c225b000bd5d26500212d41ea0233c8
2014-08-30 20:53:54 +12:00