496 Commits

Author SHA1 Message Date
Dan Prince
4c35b1b358 Add missing novncproxy settings to controller
This patch adds the missing HAProxy novncproxy parameters to
controller.yaml

These parameters were adding to overcloud-source.yaml
in I0c6a3d6a8fd10da71abbf568633b28bdb5e56aa2.

Change-Id: Icff2f17a301e5e95fa43549ec1566c0c0d5b5353
2014-12-05 20:48:33 -05:00
Dan Prince
42b81e8478 Add missing HAProxy settings to controller
This patch adds the missing parameters to controller.yaml

These parameters were adding to overcloud-source.yaml
in I1581c091b996422fb1374ea4c024d0a88453e10b.

Change-Id: I3e4e0e1feb521dded2679fed508fa97e8dd27661
2014-12-05 20:48:33 -05:00
Dan Prince
cb62cd9838 Add missing Neutron DVR params to without-mergepy
This patch adds the missing parameters to
overcloud-without-mergepy.yaml.

These parameters were adding to overcloud-source.yaml
in I422c65e7d941593083d52ad7fdf0dfd1d2fb3155. Due to
the concurrent review window they never made it
into the new overcloud-without-mergepy.yaml
implementation.

Change-Id: If54dc111aec852f906c9e7ac1bf56f9dcaf678ea
2014-12-05 20:48:33 -05:00
Dan Prince
56c905774f Remove duplicate Neutron params in overcloud
In I422c65e7d941593083d52ad7fdf0dfd1d2fb3155
(Enable Neutron DVR support in TripleO installation)
we added duplicate parameters for NeutronPublicInterfaceRawDevice
and NeutronNetworkType.

In preparation for syncing with overcloud-without-mergepy.yaml
lets remove these dups.

Change-Id: Ib4888bc91f30aeb3aba590b69e4919a93f577143
2014-12-05 20:48:33 -05:00
Dan Prince
9f7ccef25e Add missing Keystone params to without-mergepy
This patch adds the missing KeystoneSSLCertificate and
KeystoneSSLCertificateKey to overcloud-without-mergepy.yaml.

These parameters were adding to overcloud-source.yaml
in Icf46132230512a31b6dec3c07164c95b13dd8f73. Due to
the concurrent review window they never made it
into the new overcloud-without-mergepy.yaml
implementation.

Change-Id: I8b1155ca0a28392e5d5ade57d53bf810d8b5f053
2014-12-05 20:48:33 -05:00
Dan Prince
bf9b176e35 Add missing Rabbit params to without-mergepy
This patch adds the missing RabbitClientUseSSL and
RabbitClientPort to overcloud-without-mergepy.yaml.

These parameters were adding to overcloud-source.yaml
in I7b7613cb60b9095ba5665c335c496fea4514391a. Due to
the concurrent review window they never made it
into the new overcloud-without-mergepy.yaml
implementation.

Change-Id: I182671b84d0a21d7018eb136003968f101384716
2014-12-05 20:48:28 -05:00
Jenkins
fc0158c38c Merge "Remove LiveUpdate params" 2014-12-05 18:51:25 +00:00
Giulio Fidente
266b302546 Align the cinder-storage.yaml template with block-storage.yaml
Change-Id: I00af10e07feed6c9c97ee6cad545dbff88cd6afc
2014-12-05 09:58:13 +01:00
Dan Prince
d1b7e15806 Remove LiveUpdate params
The params were added in I2997d23c584055c40034827e9beb58e6542ea11c
as a means to pass undercloud image data to overcloud instances
so they could perform an update via takeovernode). We've
never actually made use of them via takeovernode... furthermore
these params are a bit stale in that they haven't been applied
to other instance types (storage, etc.).

I propose we remove them entirely and start with a fresh plan for
how these would get used (perhaps a blueprint).  As is these don't
appear to have ever been fully wired up to do anything removing
them should have no effect on end users.

Change-Id: I96f91fb0d67e7fe203d3767c8ab89ce82adbe331
2014-12-01 10:05:44 -05:00
Jenkins
bacde7fdb6 Merge "Don't replace OS::Neutron::Port on update of undercloud" 2014-11-26 08:35:04 +00:00
Jerry Zhao
d5aeed2060 Fix empty local_ip in ml2_conf.ini on undercloud
empty local_ip in ml2_conf.ini would make neutron-openvswitch-agent
fail to start, then fail to bridge dhcp to br-ctlplane and pxe boot an
overcloud, so provide the value in undercloud-source.yaml.

Related-Bug: #1394956

Change-Id: If3a94b9c2b971ceb7601f91a2db64989960fb5d3
2014-11-25 15:55:12 -08:00
Jenkins
47b452dd0d Merge "Split out Nova software config" 2014-11-19 20:25:17 +00:00
Jenkins
6f816b14a3 Merge "Add swift.mount-check metadata" 2014-11-18 10:48:06 +00:00
Dan Prince
eaa52183af Split out Nova software config
This is a step towards supporting pluggable software configurations
in the heat templates. By moving compute-config out of compute.yaml
we make it possible to define alternate implementations by
changing the OS::TripleO::Compute::SoftwareConfig value in the
overcloud-resource-registry.yaml heat environment file.

Co-Authored-By: Steve Hardy <shardy@redhat.com>

Change-Id: I250dc1a8c02626cf7d1a5d2ce92706504ec0c7de
2014-11-14 11:56:22 -05:00
Jenkins
3043a28d07 Merge "Use HAProxy httpchk for openstack services" 2014-11-14 10:10:14 +00:00
Nicholas Randon
8b17c4939d Provide a single stunnel connect_host
At present connect_host is specified by each port, individually, as
the same value. Move connect_host to be a direct child of the stunnel
element so it is only specified once.

Although previously we could theoretically specify a different
connect_host for each service, in practice they were the same and
that never would have worked.

This change means Mustache like {{#stunnel.connect_host}} will work.

Change-Id: I25c4bb09cf28a3728e959d4dd583af26a602ad90
Partial-Bug: #1391926
2014-11-13 10:20:53 +00:00
Eamonn O'Toole
c48c1761df Add swift.mount-check metadata
We've submitted a patch (https://review.openstack.org/#/c/130172/)
to set the value of mount_check to swift.mount-check if it exists,
and otherwise to set mount_check to false.  By default TripleO
deployments set mount_check to false since they do not use mounted
disks to store data.  However we (HP) and others are now using
TripleO to deploy Swift servers with mounted drives for data, in
which case mount_check should be set to True.  This change adds
swift.mount-check data and sets it to the value of the
SwiftMountCheck parameter, which has a default value of False.

Change-Id: I36fece56bafa9fe9c4883b572687b3fc819eeae1
2014-11-12 17:09:04 +00:00
Jenkins
9b2446c88d Merge "Enable Neutron DVR support in TripleO installation" 2014-11-11 15:25:11 +00:00
James Polley
906d7cd40b Don't replace OS::Neutron::Port on update of undercloud
This change is congruent with I6dd02ae17407f8f4c81ae418e5027f4f38ae4e9b
but applies to undercloud configs rather than overcloud configs.

I've listed this as closing 138709 even though that bug didn't talk
about the undercloud as this seems like it's another instance of the
same issue seen there.

Change-Id: I3ee80043bb455460991e78525fa4310934df4697
Closes-Bug: #1383709
2014-11-10 11:43:51 +01:00
Tom Cammann
2cab499f43 Use HAProxy httpchk for openstack services
Instead of the default TCP connection check use the HTTP check. This
provides a more reliable way to tell if the service is up or not, only
2xx and 3xx response codes will signal a healthy service. This check can
also be used in conjunction with check-ssl to enable checks for services
running SSL/TLS in overcloud.

Change-Id: I1581c091b996422fb1374ea4c024d0a88453e10b
2014-11-07 15:43:33 +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