Erik Colnick [Wed, 8 Oct 2014 13:04:07 +0000 (07:04 -0600)]
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
Jenkins [Mon, 20 Oct 2014 10:07:19 +0000 (10:07 +0000)]
Merge "Passthrough{Specific} and allNodesConfig for BlockStorage nodes"
Giulio Fidente [Tue, 5 Aug 2014 16:44:33 +0000 (18:44 +0200)]
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
Jenkins [Thu, 16 Oct 2014 15:42:43 +0000 (15:42 +0000)]
Merge "Refactor Heat dependencies for nova compute"
Jenkins [Wed, 15 Oct 2014 22:17:27 +0000 (22:17 +0000)]
Merge "Configures haproxy to serve novnc_proxy"
Jenkins [Wed, 15 Oct 2014 22:01:55 +0000 (22:01 +0000)]
Merge "Secure the MySQL bind-address on the undercloud"
Tom Cammann [Thu, 18 Sep 2014 10:28:08 +0000 (11:28 +0100)]
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>
Alexis Lee [Wed, 8 Oct 2014 14:17:29 +0000 (15:17 +0100)]
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
Jenkins [Tue, 7 Oct 2014 20:50:59 +0000 (20:50 +0000)]
Merge "Add SwiftMinPartHours parameter"
Therese McHale [Tue, 7 Oct 2014 12:57:51 +0000 (13:57 +0100)]
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
Loganathan Parthipan [Wed, 1 Oct 2014 11:53:23 +0000 (12:53 +0100)]
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
Jenkins [Tue, 30 Sep 2014 11:53:51 +0000 (11:53 +0000)]
Merge "Remove unnecessary completion signal"
Lorcan [Fri, 12 Sep 2014 12:40:24 +0000 (13:40 +0100)]
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
Jenkins [Fri, 26 Sep 2014 12:23:12 +0000 (12:23 +0000)]
Merge "undercloud: use Nova compute Ironic driver"
Dan Prince [Fri, 19 Sep 2014 14:44:32 +0000 (10:44 -0400)]
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
Dan Prince [Fri, 19 Sep 2014 14:27:52 +0000 (10:27 -0400)]
Drop CinderLVMLoopDeviceSize from the undercloud
This parameter is unused so lets drop it.
Change-Id: Ie0bec06b14b6b284716604281d29fea065c2a03b
Tom Cammann [Thu, 18 Sep 2014 09:54:37 +0000 (10:54 +0100)]
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
Jenkins [Thu, 18 Sep 2014 06:41:08 +0000 (06:41 +0000)]
Merge "Deprecate Role and ImageBuilder metadata handling"
Jenkins [Tue, 16 Sep 2014 09:15:26 +0000 (09:15 +0000)]
Merge "Parametrize Swift partition power"
Jenkins [Mon, 15 Sep 2014 19:18:08 +0000 (19:18 +0000)]
Merge "Parameterize network type and tunnel types"
James Slagle [Tue, 5 Aug 2014 00:04:18 +0000 (20:04 -0400)]
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
Steve Baker [Sat, 13 Sep 2014 22:05:43 +0000 (10:05 +1200)]
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
Jenkins [Fri, 12 Sep 2014 09:18:47 +0000 (09:18 +0000)]
Merge "Fix spelling of controller0_VLANPort"
Jenkins [Wed, 10 Sep 2014 12:01:42 +0000 (12:01 +0000)]
Merge "Add specific pass-through config for each role"
Tomas Sedovic [Wed, 25 Jun 2014 13:03:16 +0000 (15:03 +0200)]
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
Jenkins [Mon, 8 Sep 2014 15:17:24 +0000 (15:17 +0000)]
Merge "Update overcloud examples for ExtraConfig"
Dan Prince [Fri, 5 Sep 2014 20:30:00 +0000 (16:30 -0400)]
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
Dan Prince [Fri, 5 Sep 2014 19:39:35 +0000 (14:39 -0500)]
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
Eamonn O'Toole [Mon, 28 Jul 2014 15:33:06 +0000 (16:33 +0100)]
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
James Polley [Thu, 4 Sep 2014 05:35:59 +0000 (15:35 +1000)]
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
Jenkins [Tue, 2 Sep 2014 21:53:16 +0000 (21:53 +0000)]
Merge "Make turning debug on globally easy."
Jenkins [Tue, 2 Sep 2014 20:18:37 +0000 (20:18 +0000)]
Merge "Change | to > in templates."
Jenkins [Mon, 1 Sep 2014 14:31:33 +0000 (14:31 +0000)]
Merge "Remove unused Neutron values"
Nicholas Randon [Mon, 21 Jul 2014 15:43:38 +0000 (16:43 +0100)]
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
Robert Collins [Sat, 30 Aug 2014 08:51:56 +0000 (20:51 +1200)]
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
Jenkins [Fri, 29 Aug 2014 23:13:00 +0000 (23:13 +0000)]
Merge "Expose public_interface_tag support."
James Slagle [Fri, 29 Aug 2014 19:36:23 +0000 (15:36 -0400)]
Remove unused Neutron values
These Neutron parameters are not actually needed or used on a Swift
Storage instance. neutron-openvswitch-agent does not even need to be
present on a Swift node.
Change-Id: I5d61cc1d22a719b186e6d89baaf25f119e0416d7
Robert Collins [Mon, 30 Jun 2014 04:53:25 +0000 (16:53 +1200)]
Expose public_interface_tag support.
Proper VLAN support requires adding the IP address to a new device,
rather than br-ex/br-ctlplane. This is added in the
tripleo-image-elements change https://review.openstack.org/103449
(I3f77f72ac623792e844dbb4d501b6ab269141f8e) and here we just expose
it with appropriate glue to get the IP address from Neutron.
With this we can now describe a VLAN public interface scenario
to the undercloud and overcloud control planes.
Change-Id: I4d2194fc813aebb0708d6fddf4f05bae5f091fd8
Robert Collins [Fri, 8 Aug 2014 07:26:04 +0000 (19:26 +1200)]
Make turning debug on globally easy.
We can obviously use passthrough for this, but I rather suspect that
OMFG something is broken get me debug will be a common phrase.
Change-Id: I62539630a4737bbbe6883ed71929f38c819ceed4
Jenkins [Tue, 26 Aug 2014 11:35:34 +0000 (11:35 +0000)]
Merge "Make Swift replica count configurable."
Jenkins [Tue, 26 Aug 2014 10:57:50 +0000 (10:57 +0000)]
Merge "Permit specifying VLAN mappings to overclouds."
Jenkins [Mon, 25 Aug 2014 20:18:57 +0000 (20:18 +0000)]
Merge "Fixup network configuration for ext-net"
Kiall Mac Innes [Thu, 21 Aug 2014 18:36:22 +0000 (19:36 +0100)]
MySQL connections via HAProxy should not timeout
With the default 60 second timeout, many services will periodically
log "MySQL has gone away" as HAProxy has closed the connection.
Change-Id: Ied67344fbabcd77def4483be37a4706190ab28a0
Jenkins [Mon, 25 Aug 2014 04:23:32 +0000 (04:23 +0000)]
Merge "Set vnc to use controller virtual_ip"
Jenkins [Mon, 25 Aug 2014 04:18:47 +0000 (04:18 +0000)]
Merge "Make signal_transport a parameter"
Ryan Moore [Fri, 20 Jun 2014 14:23:27 +0000 (15:23 +0100)]
Set vnc to use controller virtual_ip
The address for the vnc proxy is incorrectly configured in the nova
configuration file.
The correct IP address is the Public Virtual IP address of the
controller node as created by:
I9649ee74ebaf62b6b929b28243a07c789a08867c
The nova image_element nova.conf already has:
novncproxy_base_url=http://{{nova.public_ip}}:6080/vnc_auto.html
but nothing was setting nova.public_ip - until now
Closes-Bug: #
1332554
Change-Id: I41214834511680170393dd4325b510f549373141
Jenkins [Wed, 20 Aug 2014 21:35:48 +0000 (21:35 +0000)]
Merge "Remove hardcoded version."
Robert Collins [Wed, 20 Aug 2014 01:04:17 +0000 (13:04 +1200)]
Remove hardcoded version.
We use semantic versioning, not pbr's pre-version facility. This
line causes local package builds to have the wrong version, and
pbr will in future detect this and error.
Change-Id: Ia625d31e87d137e867badcdeac1f33630257bb8c
Jenkins [Tue, 19 Aug 2014 13:17:50 +0000 (13:17 +0000)]
Merge "Set the MySQL root password"
Clint Byrum [Tue, 12 Aug 2014 00:13:22 +0000 (17:13 -0700)]
Make signal_transport a parameter
There may be times where an update needs to change this without changing
the template, such as when updates will be done by something other than
Heat (i.e. Ansible).
Change-Id: I89d1153acab697b64468f841b3f2d17c169da649
Jenkins [Mon, 18 Aug 2014 22:15:14 +0000 (22:15 +0000)]
Merge "Fix bash env var conditionals in merge.py call to be consistent"
Jenkins [Mon, 18 Aug 2014 19:10:17 +0000 (19:10 +0000)]
Merge "Make BlockStorage deployment dependent on controller0AllNodes"
Jenkins [Mon, 18 Aug 2014 14:54:26 +0000 (14:54 +0000)]
Merge "Ensure glance.host and glance.cinder are set for BlockStorage nodes"
Jenkins [Mon, 18 Aug 2014 13:09:34 +0000 (13:09 +0000)]
Merge "Rename NovaCompute resources suffix to be consistent with controller"
Giulio Fidente [Tue, 5 Aug 2014 16:39:49 +0000 (18:39 +0200)]
Ensure glance.host and glance.cinder are set for BlockStorage nodes
Change-Id: I03056681b795a2078a678dcb0cd29002310e5843
Related-bug:
1351110
Giulio Fidente [Thu, 14 Aug 2014 16:38:42 +0000 (18:38 +0200)]
Make BlockStorage deployment dependent on controller0AllNodes
As per the NovaCompute nodes, this change makes deployment of
BlockStorage nodes dependent on controller0AllNodes.
Change-Id: I4bc4d33d42463a0abadc2bfd4e48b1a4e554d396
Jenkins [Fri, 15 Aug 2014 20:02:03 +0000 (20:02 +0000)]
Merge "Use VIP for rabbit/keystone and mysql in block-storage.yaml"
Jenkins [Fri, 15 Aug 2014 19:58:35 +0000 (19:58 +0000)]
Merge "Remove unneeded neutron config parts from block-storage.yaml"
Jenkins [Fri, 15 Aug 2014 12:44:50 +0000 (12:44 +0000)]
Merge "Add strict dependencies to the undercloud template"
Giulio Fidente [Thu, 14 Aug 2014 17:04:58 +0000 (19:04 +0200)]
Replace occurrences of list_join with Fn::Join
When change I6730ffe1e27d952d563c16a9480298fbef9f61fe got merged we
introduced some occurrences of list_join which should have been
migrated to Fn::Join (change I039f57ab39c1fcfc319a7a34265ba4fabf4ccd08)
This caused overcloud CI jobs to fail with:
Property error : allNodesConfig: config Items to join must be strings
This change fixes this by replacing newly introduced occurrences
of list_join with Fn::Join
Change-Id: Ibac193781d31d6f81e955e7b9381e13cfdd0ab1d
Giulio Fidente [Thu, 14 Aug 2014 16:18:20 +0000 (18:18 +0200)]
Use VIP for rabbit/keystone and mysql in block-storage.yaml
Previously BlockStorage nodes were using the controller ip instead of the virtual ip to reach rabbit, keystone and mysql.
Change-Id: I23f87511e59d4d3527403b1a81c1b3df65c6a904
Giulio Fidente [Tue, 5 Aug 2014 16:28:45 +0000 (18:28 +0200)]
Remove unneeded neutron config parts from block-storage.yaml
Some of the keys defined in block-storage.yaml for neutron and
passed to the BlockStorage nodes were related to neutron, but
BlockStorage nodes do not route instances traffic so do not need
to be deployed with the OVS agent.
Change-Id: Icc7d5ea0d91370ccdf7cb4742d052fea004bae44
Jenkins [Thu, 14 Aug 2014 15:50:22 +0000 (15:50 +0000)]
Merge "Add BlockStorage and SwiftStorage nodes into hosts"
Jenkins [Thu, 14 Aug 2014 15:47:29 +0000 (15:47 +0000)]
Merge "Fix BLOCKSTORAGESCALE and SWIFTSTORAGESCALE in Makefile"
Nicholas Randon [Thu, 14 Aug 2014 10:40:29 +0000 (11:40 +0100)]
Add strict dependencies to the undercloud template
Currently there is very weak ordering of StructuredDeployments during
heat stack creation on the undercloud. This can cause the deployment which
sends the completion signal back to Heat to happen before all others have
completed, which in turn leads Heat to state the stack is ready while ORC
is still configuring services
The only workaround to this is to wait an unknown amount of time after the
heat stack completes before the system is usable.
This patch prevents the completion signal from being returned early, by
ensuring these are strictly ordered:
undercloudIronicDeployment (if used)
undercloudNovaDeployment
undercloudPassthroughDeployment
undercloudDeployment
Note: The reference numbering for the undercloud has been removed.
Change-Id: I98499dd54bb907d29cf355fe83b5c285a7375e97
Therese McHale [Wed, 25 Jun 2014 15:32:08 +0000 (16:32 +0100)]
Set the MySQL root password
Set the MySQL root password to a random string
for the undercloud and overcloud
Change-Id: I6d38ca82c77a4aa8f58089c50aa5bf320ec0ecc6
Robert Collins [Sat, 19 Jul 2014 20:03:33 +0000 (08:03 +1200)]
Permit specifying VLAN mappings to overclouds.
To use a VLAN based public network we need the ext-net network to be a
VLAN with a segmentation id - but we can't do this unless we also have
the datacentre physical network marked as allowing vlans.
We could make this strictly opt-in, but as this doesn't affect the
switch configuration (and thus actual machine capabilities) having it
on by default seems reasonable. OTOH we can't force it on, because
high security environments may well want a defense in depth setup
where neutron admins cannot configure VLANs that they are not meant
to have access too (consider that the cloud machine admins may be
separate to the folk running the services on top of them...)
Change-Id: I9687751753f810896c6d065750910da40132c9fa
Robert Collins [Sat, 19 Jul 2014 22:05:24 +0000 (10:05 +1200)]
Fixup network configuration for ext-net
We currently make the external network a single-node gre network but
this is not at all correct for HA environments - we need a provider
network, which means having a bridge mapping, a flat network
specified, and then because we run the same ovs config everywhere we
need br-ex on the hypervisors too. This is entirely reasonable since
DVR will require this as well (and solve lots of scaling issues...).
Change-Id: I8b63ab51e7e20b235430fad8d786d8da005d84a1
Jenkins [Wed, 13 Aug 2014 20:05:17 +0000 (20:05 +0000)]
Merge "Make removing nodes from scaled items possible."
Robert Collins [Wed, 13 Aug 2014 00:02:52 +0000 (12:02 +1200)]
Make Swift replica count configurable.
Using 1 is thoroughly non-HA :)
This is the HOT version of this patch.
Change-Id: Ic96bcdc03dacb9650520bd9ac1ce3805c6dac2fa
implements: blueprint tripleo-icehouse-ha-production-configuration
Steve Baker [Sun, 10 Aug 2014 21:18:01 +0000 (09:18 +1200)]
Switch to heat_template_version: 2013-05-23
To support underclouds and seeds running older than the very
latest heat.
2013-05-23 lacks function list_join, so this change reverts to
using the equivalent function Fn::Join.
Change-Id: I039f57ab39c1fcfc319a7a34265ba4fabf4ccd08
Closes-Bug: #
1354305
Julia Kreger [Wed, 9 Jul 2014 20:43:35 +0000 (16:43 -0400)]
Change overcloud to use VIP for MySQL
This change sets applications to utilize the VIP address for database
connectivity and sets HAProxy in between the applications and MySQL.
Depends upon tripleo-image-elements changes:
Ia6f26305f8e744e4ff938dff85de1193183ecd8f
Iac1274cc52014f25887d696261b32146afc926dd
I5af70abb96021146c098f788db349808d806a348
Related to blueprint tripleo-icehouse-ha-production-configuration
Change-Id: Ia9d6ed2771f756d2a97ae5df7ed737a062a59cf2
Jonathan Brownell [Mon, 28 Jul 2014 19:46:02 +0000 (12:46 -0700)]
Move cacert property out of "stunnel" and into a new "ssl" group
The CA certificate is currently passed via ssl-source.yaml as
"stunnel.cacert", but this value is not currently used by stunnel
since we have no use case for client cert authentication.
This change proposes that it also be exposed as
"ssl.ca_certificate", which is consistent with the overall SSL
direction being driven by the PKI spec:
I32473fe797a4c1e28d14c3b82c8892c7c59a4e55
This new CA certificate value will be installed as a trusted CA
on all cloud nodes that issue SSL-secured connection requests to
OpenStack or other infrastructure (MySQL, RabbitMQ) services.
Change-Id: Ibacd7c98980520e11c0df89632013f2ba2dbe370
Jenkins [Tue, 12 Aug 2014 12:12:43 +0000 (12:12 +0000)]
Merge "Restore rabbit.host and add an haproxy rabbit listener"
Robert Collins [Tue, 12 Aug 2014 03:29:19 +0000 (15:29 +1200)]
Make removing nodes from scaled items possible.
This makes it possible to remove a dead node (e.g. if NovaCompute2 has
failed, regenerate the template with ,2 in the scale parameter, and
NovaCompute2 will not be enumerated.
Change-Id: I65d85a88152ed4adee60895173f8a05611a6440b
Jenkins [Sun, 10 Aug 2014 05:45:33 +0000 (05:45 +0000)]
Merge "Fix overcloud controller scaling"
Giulio Fidente [Mon, 4 Aug 2014 19:02:18 +0000 (21:02 +0200)]
Restore rabbit.host and add an haproxy rabbit listener
To balance load over the rabbit cluster we want to route access
to it via haproxy.
This also helps workaround bug #856764 as an additional benefit.
This change sets rabbit.host to the ControlVirtualIP (to be used by
the elements) and adds an haproxy listener for the rabbit nodes.
Related to blueprint tripleo-icehouse-ha-production-configuration
Depends on I3ff37ec18b9191ca8e861519bed142cbdbd5faa2
Change-Id: I49b622a604542f456bd9a37da8dae3353218e640
Related-Bug: 856764
Jenkins [Fri, 8 Aug 2014 10:34:12 +0000 (10:34 +0000)]
Merge "Use VIP for keystone host in swift template"
Jenkins [Fri, 8 Aug 2014 10:33:28 +0000 (10:33 +0000)]
Merge "fix incorrect reference to rabbit_username"
Jenkins [Fri, 8 Aug 2014 08:12:49 +0000 (08:12 +0000)]
Merge "Move config options under neutron.ovs"
Jenkins [Thu, 7 Aug 2014 22:26:55 +0000 (22:26 +0000)]
Merge "Set basic pacemaker and corosync properties in undercloud"
Tomas Sedovic [Thu, 7 Aug 2014 09:39:16 +0000 (11:39 +0200)]
Fix overcloud controller scaling
Controller scaling was broken by the commit
02772ba2877b9f6d427c6fd760bf19d6334c68a8. Merge.py raises an exception
when it tries to scale the default value "controller0" of the
`BootstrapNodeResource` parameter.
This reverts back to using Fn::Select for specifying the bootstrap host,
the rest of the Fn::Select -> get_attr changes are kept.
Change-Id: I0cdebf75d4752a35f547d4fbb81545ece3172405
Jan Provaznik [Thu, 31 Jul 2014 12:40:38 +0000 (08:40 -0400)]
Use VIP for keystone host in swift template
As a side effect this fixes invalid keystone host generation
when multiple controller nodes are used.
Change-Id: I081976f0da94fc0232dfa2c34de03bbb4abf1a85
Jan Provaznik [Thu, 31 Jul 2014 19:30:07 +0000 (15:30 -0400)]
Set basic pacemaker and corosync properties in undercloud
Because services which depend on pacemaker (ceilometer central
agent and neutron services) are used in undercloud too, we need to
set basic pacemaker and corosync metadata for undercloud.
Related to: Ifa83d62c2132bcdcb40d0b7c80ce3adadc0b5587
Related to: I63f054a8c80f9f676a77341c89e605b5b472d078
Change-Id: Icc97e36a1db198b973041346cf2056f68de661a2
Giulio Fidente [Mon, 4 Aug 2014 19:30:06 +0000 (21:30 +0200)]
Rename NovaCompute resources suffix to be consistent with controller
This change renames a few NovaCompute resources so that the naming
is consistent with the controller resources naming choice.
Change-Id: I8c22867b208c5e16fd52bb3157f838f762b71470
James Slagle [Wed, 23 Jul 2014 19:30:26 +0000 (15:30 -0400)]
Move config options under neutron.ovs
These config options are supposed to be under neutron.ovs (see template
for neutron openvswitch agent). They were mistakenly moved to be just
under neutron when the migration to SoftwareConfig was done.
Change-Id: I5769dc1dc501d48c965f8e4e36238cfcaac64a17
Giulio Fidente [Tue, 5 Aug 2014 16:23:43 +0000 (18:23 +0200)]
Add BlockStorage and SwiftStorage nodes into hosts
With this we populate the hosts key (needed for /etc/hosts editing)
with the BlockStorage and SwiftStorage nodes too.
Change-Id: I6730ffe1e27d952d563c16a9480298fbef9f61fe
Giulio Fidente [Tue, 5 Aug 2014 16:14:16 +0000 (18:14 +0200)]
Fix BLOCKSTORAGESCALE and SWIFTSTORAGESCALE in Makefile
The BLOCKSTORAGESCALE and SWIFTSTORAGESCALE vars were incorrectly
ignored in the Makefile (and forcibly set to 0)
Change-Id: I37614153d8c87d25aa17e759fcd228a8a1fda4a4
Giulio Fidente [Tue, 5 Aug 2014 16:11:26 +0000 (18:11 +0200)]
Remove duplicate config section from block-storage.yaml
Deletes a duplicate config section from file block-storage.yaml
(and a duplicate admin-password key too).
Change-Id: I226517ea467751d00dbf217a6b6e4e0839538225
Jonathan Brownell [Fri, 25 Jul 2014 21:07:52 +0000 (14:07 -0700)]
Fix bash env var conditionals in merge.py call to be consistent
Bash syntax ${ENV:-'0'} and ${ENV='0'} vary only in their behavior
when $ENV is set to an empty string (in which case the former
expression results in '0' while the latter results in ''.)
There is no reason the Makefile should be using the latter
expression, and rather confusing when the two different forms
are used side-by-side on the same line.
Change-Id: I66bb5ea7437c3f2aa9bc4e1afc9b522c450ff976
Giulio Fidente [Mon, 4 Aug 2014 19:14:26 +0000 (21:14 +0200)]
fix incorrect reference to rabbit_username
Fixes a typo in nova-compute-config.yaml file where rabbit_username
was mistakenly written as rabbit_user_name; compute nodes received
null as rabbit username as consequence.
Change-Id: I796b9bdccd1863647a667edbbc96731fc924c55d
Steve Baker [Fri, 18 Jul 2014 00:55:31 +0000 (12:55 +1200)]
Convert Fn::Select to extended get_attr
Overcloud bootstrap_nodeid is now specified by parameter
BootStrapNodeResource with default value controller0.
This avoids the need to use Fn::Select on the mergy.py
built list of controllers to specify the first controller.
Change-Id: Id9cfeab50b90ceeeae51ea0e35997b7495b28cc4
Partial-Blueprint: tripleo-juno-remove-mergepy
Steve Baker [Sun, 3 Aug 2014 20:43:34 +0000 (08:43 +1200)]
Port all templates to HOT
This change was generated and validated by running the following:
make hot clean all validate-all
This converts all templates to be valid HOT.
Fn::Select is not converted in this change but this will actually
work with heat_template_version 2013-05-23. Fn::Select is converted
manually in the next change in this series.
This change also sets the heat_template_version to 2014-10-16 which
includes the list_join intrinsic functions used throughout these
templates.
Partial-Blueprint: tripleo-juno-remove-mergepy
Change-Id: Ib3cbb83f6ae94adb7b793ab1b662bd5c55cbb5b3
Jenkins [Fri, 1 Aug 2014 11:13:34 +0000 (11:13 +0000)]
Merge "Remove ImageBuilder::Elements from templates"
Jenkins [Fri, 1 Aug 2014 05:04:04 +0000 (05:04 +0000)]
Merge "Fix swift memcache and device properties"
Steve Baker [Tue, 8 Jul 2014 00:14:28 +0000 (12:14 +1200)]
merge.py --hot to process and generate HOT
This adds a --hot flag to merge.py which will assume source templates
are in the HOT format, and generate a HOT template artifact.
Tests have also been ported to HOT, along with some minor corrections
to the existing tests to make the source and result templates valid
heat templates.
Partial-Blueprint: tripleo-juno-remove-mergepy
Change-Id: If18ff79f89456123c884a1ab2f910ce4cc9a6e0b
Nicholas Randon [Thu, 31 Jul 2014 11:46:20 +0000 (12:46 +0100)]
Add strict dependencies to the overcloud template
Currently there is very weak (no) ordering of StructuredDeployments during
heat stack creation (and, importantly, update) on the overcloud. This can
cause the deployment which sends the completion signal back to Heat to
happen before all others have completed, which in turn leads Heat to state
the stack is ready while ORC is still configuring services
The only workaround to this is to wait an unknown amount of time after the
heat stack completes before the system is usable.
This patch prevents the completion signal from being returned early, by
ensuring these are strictly ordered:
controller0Deploy
controller0Passthrough
controller0AllNodesDeploy
NovaCompute0Deploy
NovaCompute0Passthrough
NovaCompute0AllNodesDeploy
Change-Id: I0a549370b7aca55b1145de521ad51218428deaf5
Nicholas Randon [Wed, 30 Jul 2014 09:17:56 +0000 (10:17 +0100)]
Correct overcloud template to inherit passthrough
Inherit passthrough from nova-compute-instance.yaml, rather than
having an exact copy in overcloud-source.yaml.
Change-Id: I4f5a4a7be5835cb68755734aa72f8d9670cba0d4
Nicholas Randon [Wed, 30 Jul 2014 09:11:12 +0000 (10:11 +0100)]
Rename NovaCompute0Config to NovaCompute0Deploy
Rename NovaCompute0Config to NovaCompute0Deploy as this makes
the structured deployment name match the one in
nova-compute-instance.yaml.
Change-Id: I79f66c09006aa7f7118af1f48e1f6f10b87daec6
Nicholas Randon [Tue, 29 Jul 2014 13:02:42 +0000 (14:02 +0100)]
controller0AllNodesConfig to controller0AllNodes.
Rename all occurrences of controller0AllNodesConfig to
controller0AllNodes as this is in line with compute node
deployments. Also the current naming is confusing as this is a
deployment step not a configuration step.
Change-Id: I8efa3b6a64a099e1e8ee43009472152aed5f8ad8