Clint Byrum [Wed, 4 Jun 2014 07:42:29 +0000 (00:42 -0700)]
Compute all hosts matrix once
Then feed in through separate deployments. This reduces the exponential
growth of calculating the entire list for every server.
Change-Id: Ib1187eabeb91b46e29ddcf5065056e43a69bb2a0
Jenkins [Fri, 27 Jun 2014 07:53:53 +0000 (07:53 +0000)]
Merge "Set glance protocol and port as Heat configurable"
Jan Provaznik [Tue, 24 Jun 2014 10:55:20 +0000 (12:55 +0200)]
Add parameters for setting up keystone keys/certs in undercloud
This will allow us distribute identical keys/certs to all
control nodes in HA mode.
CAKey was removed because it's not required by keystone.
Change-Id: I187492d5fac448e57f8cd687f9cb751520df5921
Jenkins [Fri, 20 Jun 2014 18:55:45 +0000 (18:55 +0000)]
Merge "Add custom public IP support to the undercloud."
Ryan Moore [Thu, 3 Apr 2014 15:37:54 +0000 (16:37 +0100)]
Set glance protocol and port as Heat configurable
This change is to set the glance protocol and port as
configurable via the Heat template. Presently the port is
hard-coded in the elements nova.conf file, and the protocol
is assumed as being the default (http).
This change will allow the glance_api_servers
to be set (in nova.conf) using the constituent parts:
glance_protocol://glance_host:glance_port
Change to nova.conf to read this value is:
Idccc0d60c9f6b17a853c6de1bbea64bfc7e028b2
Default port value is set to the nova default(9292) which is
currently hard-coded in the elements nova.conf file.
Default protocol value is set to the nova default(http).
Change-Id: I3c7218292797c62c36e2aaab4f325bf053ef140b
Jenkins [Mon, 16 Jun 2014 05:24:38 +0000 (05:24 +0000)]
Merge "Use virtual ip for OS services"
Jenkins [Wed, 11 Jun 2014 09:53:31 +0000 (09:53 +0000)]
Merge "Add parameters for setting up keystone keys/certs"
Jenkins [Tue, 10 Jun 2014 20:09:36 +0000 (20:09 +0000)]
Merge "Remove the tuskar-source template"
Jan Provaznik [Mon, 9 Jun 2014 10:27:29 +0000 (06:27 -0400)]
Use virtual ip for OS services
VIP should be used when pointing an OS service to
another OS service in config files (most typical is
setting Keystone's host IP, but also Glance and Netron
host needs to be set in Nova config file).
Change-Id: Id91e6ef2747981f17a43afd279d4eebaad01fe4d
Clint Byrum [Mon, 28 Apr 2014 08:42:53 +0000 (01:42 -0700)]
Replace nagios3 template with HOT rewrite
Rewrote template from scratch using HOT. Mail delivery does not work yet
but it does produce Nagios.
Change-Id: I347f8a008aa7db1145da0988053c791e6f2dbbc2
Jenkins [Fri, 6 Jun 2014 15:13:50 +0000 (15:13 +0000)]
Merge "Add Controller scale param to merge.py"
Rob Parker [Wed, 28 May 2014 20:39:59 +0000 (20:39 +0000)]
Setup SSL for Ceilometer
Establish the Public (SSL) port, 13777, and connect it to the internal port, 8777
Change-Id: I7bba7f8224b6e31fc4f5444eee679ca5a4ce4ebe
Tomas Sedovic [Wed, 4 Jun 2014 10:16:24 +0000 (12:16 +0200)]
Remove the tuskar-source template
There is no need for a tuskar-specific undercloud template. Tuskar is
installed via elements just like any other undercloud service.
This template is not being used in devtest and I'm not sure it ever has
been.
Change-Id: I531d927b1984873b32f440d33a130788670f7cd9
Jenkins [Wed, 4 Jun 2014 08:46:24 +0000 (08:46 +0000)]
Merge "Add passthrough configuration glue."
Jenkins [Wed, 4 Jun 2014 06:48:54 +0000 (06:48 +0000)]
Merge "Fixes to swift-storage-source.yaml"
Robert Collins [Fri, 30 May 2014 19:57:00 +0000 (07:57 +1200)]
Add custom public IP support to the undercloud.
Now we're trying to automate VLAN deployed underclouds, this
suddenly becomes relevant.
Change-Id: I800a0ceab7443d685551d7a919724f6cf45fd891
Nicholas Randon [Fri, 2 May 2014 15:52:18 +0000 (16:52 +0100)]
Add passthrough configuration glue.
This provides a means for users to pass configuration through to the
machines they are deploying without us modelling that.
Change-Id: Ia8d1564bd0f3e7b988497a84e00831619047cd94
Nicholas Randon [Fri, 2 May 2014 15:52:18 +0000 (16:52 +0100)]
Move to software-config for the undercloud.
Change the undercloud deployment to use software-config similar to
that used by the overcloud.
Change-Id: I81bced2062e461fe10301969d856d709c0b573c3
Jenkins [Tue, 3 Jun 2014 11:22:36 +0000 (11:22 +0000)]
Merge "Sequence deploys - compute after control plane."
Gregory Haynes [Mon, 2 Jun 2014 17:15:20 +0000 (10:15 -0700)]
Move bootstrap-host out from bootstack
We have had a change of opinion and are moving bootstrap_host properties
out of bootstack in order to prevent mysql / rabbit from depending on
boot-stack.
Change-Id: I85399019c5fc448e98362ef832988abc8d9d459d
Jenkins [Fri, 30 May 2014 16:50:50 +0000 (16:50 +0000)]
Merge "ssl: Add support for a CA Certificate"
Robert Collins [Wed, 28 May 2014 04:26:21 +0000 (16:26 +1200)]
Export new bootstack keys for cluster init.
These provide a single consistent interface for checking whether
a given node is the bootstrap node, or not the bootstrap node
for database initialisation etc.
Change-Id: I7c5a09cb3477b61c4050e4a47a680ffc9aee97d8
Gregory Haynes [Wed, 16 Apr 2014 21:14:47 +0000 (14:14 -0700)]
Add Controller scale param to merge.py
We need a paremeter to attempt scaling of the Controller resources in
merge.py.
Change-Id: I4a79059e72850da4a5a3fe30dbb9df92a9dca212
Eamonn O'Toole [Wed, 7 May 2014 16:03:48 +0000 (17:03 +0100)]
Fixes to swift-storage-source.yaml
We've found a couple of bugs in swift-storage-source.yaml which
were exposed when we tried to use the template to build a second
Swift storage node. These errors are:
a. Error in swift-devices metadata description - indentation
wasn't correct and a "-" was missing
b. Keystone config data required by the swift-proxy element
weren't defined
c. The signal_transport property wasn't defined and set to
NO_SIGNAL for SwiftStorage0Deploy (this meant that the
completion condition for the resource was never satisfied)
d. The user_data_format property for the SwiftStorage0
resource was not defined and set to SOFTWARE_CONFIG, which
meant that the SwiftStorage servers never got their config data
We've fixed the above errors. We've added an
OS::Heat::StructuredConfig and corresponding
OS::Heat::StructuredDeployment for the Keystone config data.
Change-Id: I858ebf9eea4ed33987143277f4c986b4934555d1
Jenkins [Wed, 21 May 2014 18:53:56 +0000 (18:53 +0000)]
Merge "Use vip address where controller0 was used for endpoints"
Jenkins [Wed, 21 May 2014 13:06:42 +0000 (13:06 +0000)]
Merge "Adding Swift proxy-server memcache metadata"
Jan Provaznik [Wed, 21 May 2014 06:06:24 +0000 (02:06 -0400)]
Add parameters for setting up keystone keys/certs
This will allow us distribute identical keys/certs to all
control nodes in HA mode.
Change-Id: Ie84f3897717c02e196a405746865996c0a929977
Dima Shulyak [Mon, 19 May 2014 09:24:21 +0000 (12:24 +0300)]
Use vip address where controller0 was used for endpoints
This change is required to resolve scaling issue for
OVERCLOUD_CONTROLSCALE > 1
Basicly change affected all the places where endpoints
were configured to use controller0 ctlplane ip address
Change-Id: I76eb9d2b81d3ef5e9fae408f2432515f4de13e12
Jenkins [Tue, 20 May 2014 16:30:17 +0000 (16:30 +0000)]
Merge "Configure NTP for overcloud compute"
Stuart McLaren [Thu, 3 Apr 2014 16:30:24 +0000 (16:30 +0000)]
ssl: Add support for a CA Certificate
Add SSLCACertificate to the overcloud yaml.
This allows a CA certificate to be specified in cases where the Cert
does not come from a CA in the system bundle.
Partially implements: blueprint tripleo-ssl-overcloud
Full set of blueprint changes:
https://review.openstack.org/#/c/85098
https://review.openstack.org/#/c/85099
https://review.openstack.org/#/c/85100
Change-Id: I67d7c1362df323762023be5c74fbe75b1583570c
Jenkins [Tue, 20 May 2014 15:56:07 +0000 (15:56 +0000)]
Merge "Specify group os-apply-config for config resources"
Jenkins [Fri, 16 May 2014 12:44:25 +0000 (12:44 +0000)]
Merge "Adding SNMPd auth credentials"
Robert Collins [Thu, 15 May 2014 20:49:15 +0000 (08:49 +1200)]
Sequence deploys - compute after control plane.
The control plane has to be up before the compute deployments can
work. By sequencing these we permit stopping the o-r-c scripts in
the overcloud rather than trying and failing to configure things.
It also reduces the total deploy time by front loading control
plane configuration - Heat has some sequence code which prevents
parallel instantiation on deployments, and the control plane bring
up is critical path for deploying OpenStack.
Change-Id: I0bb2f8ab41c4af1443af60f7547673d495e4e0fb
Dima Shulyak [Tue, 22 Apr 2014 12:52:43 +0000 (15:52 +0300)]
Introduce configurable virtual ip in templates
added ControlVirtualIP resource of type OS::Neutron::Port
Added ControlVirtualInterface - by default br-ex
To specify the IP address to use as ControlVirtualIP,
or for any others custom needs, you could provide:
-P 'ControlFixedIPs=[{"ip_address" : "192.0.2.251"}]'
Related to blueprint tripleo-icehouse-ha-production-configuration
Change-Id: Ie82750ac1537c80311a869880f636bda59ca5c58
Clint Byrum [Thu, 8 May 2014 15:33:01 +0000 (08:33 -0700)]
Defer to element mysql.innodb_buffer_pool_size
Choosing 100MB here is not a production default. We also don't need two
places with the default value set. The closer a default is to the actual
usage of it, the better, so we'll set 0 here, which will defer to the
default in the element.
Change-Id: I1b41b604286245c2fb83249778db835253c02fc5
Jenkins [Thu, 8 May 2014 03:34:02 +0000 (03:34 +0000)]
Merge "Add NeutronControlPlaneID parameter"
Jenkins [Wed, 7 May 2014 13:11:17 +0000 (13:11 +0000)]
Merge "Make size of loop device used by cinder LVM configurable"
Dmitry Shulyak [Fri, 2 May 2014 05:06:57 +0000 (08:06 +0300)]
Add NeutronControlPlaneID parameter
Creation of OS::Neutron::Port requires network_id parameter
OS::Neutron::Port will be used for VIP creation
Creating port for network by name, e.g:
neutron port-create ctlplane
works only with neutron cli
Change-Id: Ia8bd6f700a4897efd277fd67189d2e04ad716b87
Jenkins [Mon, 5 May 2014 22:12:03 +0000 (22:12 +0000)]
Merge "Increase PXE deployment timeout for overcloud"
Dan Prince [Fri, 18 Apr 2014 21:04:54 +0000 (17:04 -0400)]
Configure NTP for overcloud compute
Updates the overcloud nova-compute templates so that
the NTP server is properly configured.
Change-Id: I4fc407153da5e031dcf5e5e5e1b3b74d932dba45
Partial-bug: #
1309677
Steve Baker [Fri, 2 May 2014 04:02:35 +0000 (16:02 +1200)]
Specify group os-apply-config for config resources
This will indicate to os-collect-config that this config
resource represents os-apply-config configuration data,
so it can only write out top-level config files for
os-apply-config data (or Heat::Ungrouped for backwards
compatibility).
Change-Id: I3552fdd6df8106ab83cfd17d5f4b137cf33fbc36
Related-Bug: #
1299109
Robert Collins [Wed, 23 Apr 2014 01:23:15 +0000 (13:23 +1200)]
Scale the control plane in hosts files.
Being able to figure out the hypervisors from the control nodes seems
useful, and equally all the hypervisors should know about all the
control nodes (at least until we have virtual IPs all in place), and
lastly the control plane need to know each other by hostname.
Change-Id: I92877501c58d8c210e7b2c94935e107355271fb9
Ladislav Smola [Fri, 25 Apr 2014 12:06:46 +0000 (14:06 +0200)]
Adding SNMPd auth credentials
-Undercloud Ceilometer has to have access to SNMPd credentials,
so it can poll the Overcloud nodes
-In every Overcloud node, we need to set the same cretentials
to SNMPd.conf
Change-Id: Icf7c0c1772b6380b7136108e61c15cafe17274ba
Duncan Thomas [Thu, 17 Apr 2014 17:28:05 +0000 (13:28 -0400)]
Make size of loop device used by cinder LVM configurable
This was hard-coded to 5 gig, which is useless for anything other
than tempest runs and smoke testing
block-storage-nfs.yaml has intentionally not been changed, since
volume_size_mb is not used in that setup. Cleaning up that code will
be done separately.
Change-Id: I476b906a8d439d3e6643dd0c214965c5862418e8
Matthew Gilliard [Thu, 10 Apr 2014 08:39:21 +0000 (09:39 +0100)]
Increase PXE deployment timeout for overcloud
The PXE deployment often times out on baremetal deployment with >5
overcloud nodes because the time being measured includes the
dd of the image, which can be slow when many images are sent
from the same undercloud host.
Ideally we'd make the image sizes smaller, and/or make the
undercloud cache the images more sanely. It would also be
possible to split the timout to measure dd-time and boot-time
separately, but for now we just make the timeout configurable so
a user can raise it if they have problems.
Change-Id: I15540eec7a68eab4c9d128b65a95b1c0a2b64582
Co-Author: nicholas.randon@hp.com
James Slagle [Tue, 25 Mar 2014 12:34:29 +0000 (08:34 -0400)]
Expose dnsmasq options
Adds a new parameter, NeutronDnsmasqOptions, to the overcloud template.
Allows the ability to set dnsmasq options for neutron dhcp agent. This
will allow us to configure mtu to be 1400 for tenant instances on the
overcloud. This should help with poor network performance and vm's that
are just plain unreachable via ssh due to the GRE tunnel overhead.
The default here has been set to:
dhcp-option-force=26,1400
This is the recommended way to configure OpenStack with the Open vSwitch
plugin per:
http://docs.openstack.org/admin-guide-cloud/content/openvswitch_plugin.html
All the documentation I can find on the web (openstack-dev,
ask.openstack.org, etc), recommend applying this setting. Others have
reported slow vm performance as well, and this resolves that issue
(apparently anyway...we'd need to test).
Change-Id: If24326045987b5a484ba2f71f591092987966536
Partial-Bug: #
1270646
Jenkins [Tue, 22 Apr 2014 19:20:08 +0000 (19:20 +0000)]
Merge "Add passthrough configuration glue."
Jenkins [Fri, 18 Apr 2014 10:27:47 +0000 (10:27 +0000)]
Merge "Adding undercloud ceilometer"
Robert Collins [Wed, 16 Apr 2014 04:08:45 +0000 (16:08 +1200)]
Add passthrough configuration glue.
This provides a means for users to pass configuration through to the
machines they are deploying without us modelling that.
Change-Id: I7134eb0c6be2d5cb1795b2f03cfba4afb69dc837
blueprint: passthrough-config
Eamonn O'Toole [Tue, 8 Apr 2014 16:05:34 +0000 (17:05 +0100)]
Adding Swift proxy-server memcache metadata
Swift proxy-servers use memcache to store and share metadata. This
change adds swift.proxy-memcache metadata to the swift-source and
swift-storage-source yaml templates modelled on the existing
swift.devices metadata. This metadata will be consumed by the
swift-proxy/os-config-applier/etc/swift/proxy-server.conf element
if the metadata exists.
Change-Id: If0b5724f69e7ec1c98e4dbdbeb9f08c4a18151b6
Ladislav Smola [Fri, 11 Apr 2014 10:48:23 +0000 (12:48 +0200)]
Adding undercloud ceilometer
-adding Undercloud Ceilometer that will collect statistics
about Overcloud nodes, via SNMP
Change-Id: I1e90ad8d5bad16bc1c418ca2dbd78163abe6267c
Clint Byrum [Wed, 19 Mar 2014 22:16:32 +0000 (15:16 -0700)]
Switch overcloud to software-config
This migrates the overcloud to using OS::Heat::StructuredConfig and
OS::Heat::StructuredDeployment. With those tools, we can decouple
servers from software configuration and begin to deprecate features in
tripleo_heat_merge.
Change-Id: Ice85f0711e90d0fabf1d1bc4698201c4d6758508
Jenkins [Fri, 11 Apr 2014 18:50:53 +0000 (18:50 +0000)]
Merge "Stop using notCompute in favor of controller"
Jenkins [Thu, 10 Apr 2014 14:47:56 +0000 (14:47 +0000)]
Merge "Adding NTP to undercloud template"
Dan Prince [Mon, 31 Mar 2014 18:12:49 +0000 (14:12 -0400)]
Stop using notCompute in favor of controller
Updates all references for notCompute and notcompute
to use 'controller' instead.
Change-Id: I70ef83f35064ab388bdc7e1a6da62b6585580010
Partial-bug: #
1300324
Jenkins [Tue, 8 Apr 2014 14:33:25 +0000 (14:33 +0000)]
Merge "Add mysql innodb buffer pool size"
Jenkins [Tue, 8 Apr 2014 00:09:14 +0000 (00:09 +0000)]
Merge "Allow setting the cinder iscsi-helper option"
Jenkins [Mon, 7 Apr 2014 20:31:32 +0000 (20:31 +0000)]
Merge "Add enable_tunneling to swift storage metadata"
Jenkins [Mon, 7 Apr 2014 20:31:31 +0000 (20:31 +0000)]
Merge "Add BlockStorage0Config Resource"
Jenkins [Sat, 5 Apr 2014 10:29:31 +0000 (10:29 +0000)]
Merge "Update templates to default to preserve ephemeral"
Trent Geerdes [Fri, 4 Apr 2014 18:43:16 +0000 (12:43 -0600)]
Adding NTP to undercloud template
Change-Id: I30c0e175fda448a300cae0b233757d31ce73402f
James Slagle [Thu, 27 Mar 2014 15:02:41 +0000 (11:02 -0400)]
Add enable_tunneling to swift storage metadata
Add the enable_tunneling option to the neutron-openvswitch-agent
metadata for the swift storage template. If not preset, this option is
left blank in the openvswitch plugin configuration plugin. This causes
the service to fail to start because a blank value is not permissible
for a boolean option.
Change-Id: Ieadcdab295913121bd00dbd25e4245024bc2240f
Jan Provaznik [Tue, 1 Apr 2014 10:53:38 +0000 (06:53 -0400)]
Add mysql innodb buffer pool size
Innodb buffer pool size in mysql config file is now set to 592M,
this value is for VMs with 2G RAM too much. This patch makes the
pool size configurable and decreases default value to 100 MB
(this should be sufficient for default devtest setup). A patch which
for tripleo-image-element which sets this value in my.cnf will follow.
Change-Id: I0d2529abe51d4dc34415bf6c40da7a267bf3e65b
Ben Nemec [Wed, 5 Mar 2014 23:51:25 +0000 (17:51 -0600)]
Allow setting the cinder iscsi-helper option
This is necessary to support iscsi helpers other than tgtadm, such
as lioadm.
Change-Id: I8a63872185f73372fcf6c90d3dde31e5bb0a168b
James Slagle [Thu, 27 Mar 2014 15:00:28 +0000 (11:00 -0400)]
Add BlockStorage0Config Resource
Add a BlockStorage0Config resource in the block-storage.yaml template.
This was missing previously and was causing the behavior of having all
block storage nodes only being created after all other nodes were up in
a deployment (I presume b/c of the wait conditions).
Also, we need the BlockStorage0Config resource so that we can get the
configuration of neutron-openvswitch-agent from the metadata, previously
the values in the file were unset, causing the service to fail to start.
Change-Id: I297de24079d1ece66d35213b4ef1f2c8c50e73f0
Dan Prince [Wed, 26 Mar 2014 16:42:01 +0000 (12:42 -0400)]
Drop dnsmasq_range from the undercloud source.
We don't make use of dnsmasq_range anywhere so lets remove it.
Change-Id: Id3e14aee8a9f720a09bc2c8ace99e06c4a2d09a9
Cian O'Driscoll [Wed, 26 Mar 2014 11:18:27 +0000 (11:18 +0000)]
Update templates to default to preserve ephemeral
Updated heat templates to default to preserve ephemeral partition
on a heat stack update. Allows undercloud and overcloud to be
re-imaged/updated and state preserved.
Change-Id: I6626af48d8c55672022a46fe48e5725ad2619f0c
Jenkins [Wed, 26 Mar 2014 09:38:58 +0000 (09:38 +0000)]
Merge "Remove unnecessary cinder metadata"
Jenkins [Wed, 26 Mar 2014 03:11:14 +0000 (03:11 +0000)]
Merge "Adding image update policy to undercloud template"
Robert Collins [Mon, 24 Mar 2014 04:23:40 +0000 (17:23 +1300)]
Fix Ironic templates
The merge of ironic-source wasn't actually merging, leading to bad
templates. As part of this add the needed SSH virtual power key
(because like nova-bm, Ironic requires that for now).
We also need to set the compute_manager for nova with Ironic, so that
gets set too.
Change-Id: I0d7d535dbac3584b3eb12865259ee6403e20c98f
Allison Randal [Wed, 19 Mar 2014 15:00:33 +0000 (08:00 -0700)]
Pass undercloud metadata to overcloud compute
Capture some undercloud metadata into the overcloud compute
configs, so the overcloud nodes can pull updated images from
the undercloud glance. Unset by default, but able to be set
during stack-create or stack-update.
Change-Id: I2997d23c584055c40034827e9beb58e6542ea11c
Cian O'Driscoll [Fri, 21 Mar 2014 10:46:18 +0000 (10:46 +0000)]
Adding image update policy to undercloud template
Allows image policy to be specified when updating the undercloud
stack. This enables the preservation of persistent ephemeral disks.
Change-Id: Id7bc0a72ae1737d2fdadb3f47006bd0cfb0bc42f
Closes-Bug: #
1295616
Jenkins [Mon, 17 Mar 2014 10:21:02 +0000 (10:21 +0000)]
Merge "Change nova compute driver location"
Chris Krelle [Fri, 14 Mar 2014 15:10:15 +0000 (08:10 -0700)]
Change nova compute driver location
This patch changes the location of the Ironic Nova compute driver
in nova.conf so that it uses the driver from within the Ironic
directory tree. This patch will need to be reverted once the Ironic Nova
driver lands in the nova.
Change-Id: I9199d506f3665cb0827edd642a1806713a42b90e
Ryan Brady [Fri, 14 Mar 2014 15:03:02 +0000 (11:03 -0400)]
Remove unnecessary cinder metadata
Previously all cinder functionality was in a single element and
required "volume: 'true'" to install the cinder-volume service.
Now cinder has been split into multiple elements and you build
an image with the cinder-volume element to achieve the same goal.
This patch removes the "volume: 'true'".
Change-Id: I2ed2e6f7c7db7619aee7ce4ba730f310344e0b0e
Ryan Brady [Thu, 13 Mar 2014 17:15:21 +0000 (13:15 -0400)]
Add Wait Condition to Block Storage Templates
In some environments the heat stack-create command would complete
even though the block storage node would still be in a
build/spawning state. This patch adds a wait condition to ensure
the block storage node has a chance to complete and the stack-create
command to complete properly.
Change-Id: Idb524625b8d6df1ff6f927c22b72bc6d3d611686
Partial-Bug: #
1290764
Jenkins [Thu, 13 Mar 2014 00:30:55 +0000 (00:30 +0000)]
Merge "Add heat.stack_domain_admin_password"
Jenkins [Wed, 12 Mar 2014 18:01:37 +0000 (18:01 +0000)]
Merge "Merge Block Storage into Overcloud"
Jenkins [Wed, 12 Mar 2014 16:24:18 +0000 (16:24 +0000)]
Merge "Remove Duplicate Rabbit Parameters"
Clint Byrum [Tue, 4 Mar 2014 21:31:01 +0000 (13:31 -0800)]
Add heat.stack_domain_admin_password
This new parameter will be used to configure Heat for the new required
stack domain admin.
Change-Id: Ieace33154a14f472aab8ac76b2b876db77230110
Partial-Bug: #
1287453
Jenkins [Wed, 12 Mar 2014 08:05:44 +0000 (08:05 +0000)]
Merge "Swift storage heat templates"
Ryan Brady [Wed, 12 Mar 2014 00:06:54 +0000 (20:06 -0400)]
Remove Duplicate Rabbit Parameters
This patch removes the duplicate rabbit username and password
parameters. These parameters cause a conflict when running
merge.py because they already exist in the overcloud template.
Change-Id: I01d386577734c7c516a477e1e402882294ac4376
Ryan Brady [Tue, 11 Mar 2014 15:56:29 +0000 (11:56 -0400)]
Merge Block Storage into Overcloud
This patch removes the seperate overcloud-with-block-storage.yaml
make target and merges the functionality into the main overcloud.yaml
target. The default BLOCKSTORAGESCALE is 0. Change this number to add
additional block storage nodes.
This patch also updates the overcloud-with-block-storage-nfs target
to more closely resemble the overcloud.yaml target, including swift
and ssl templates as needed. The default BLOCKSTORAGESCALE is 1.
Change this number to add additional block storage nodes.
Change-Id: Ifcc733cfbf9f356393c3f6c72b2bbbb0214d3040
Jenkins [Tue, 11 Mar 2014 05:51:41 +0000 (05:51 +0000)]
Merge "Add rabbit.cookie attribute"
Richard Su [Wed, 5 Mar 2014 22:58:22 +0000 (14:58 -0800)]
Swift storage heat templates
Updated the existing swift-source template to properly list all
swift devices.
Created a new swift-storage-source template to add additional
swift-storage only nodes.
The default SWIFTSTORAGESCALE is 0. Change this number to add
additional swift storage nodes.
Change-Id: Ia05f4ad44593316430d60541106d23b032c3e760
Ryan Brady [Thu, 20 Feb 2014 12:40:31 +0000 (07:40 -0500)]
Adds block-storage-nfs template
To support the changes to the cinder element to allow the nfs
backend to be utilized, this template has been added to show
the usage of the nfs_shares key in the cinder metadata.
The value is a list of strings containing share addresses.
This change is added to facilitate an example to test
the cinder element change: https://review.openstack.org/#/c/74563/
You may setup the nfs server manually or use the nfs-server
element at https://review.openstack.org/#/c/74712/.
Change-Id: I5b6cb118b34421ea07a81ed1fe68db24b1d4f19d
Jenkins [Thu, 6 Mar 2014 01:45:46 +0000 (01:45 +0000)]
Merge "Fix Merge::Map for scatter-gather in Configs."
Jenkins [Thu, 6 Mar 2014 01:45:46 +0000 (01:45 +0000)]
Merge "Add a check target."
James Slagle [Wed, 5 Mar 2014 23:51:57 +0000 (15:51 -0800)]
Fix bad indentation
Lines for notifier-strategy and log-file had 1 level too much of
identation causing an error in the available metadata.
Change-Id: I559855887349bf2bbab87788ef9baa216bde60d8
Robert Collins [Wed, 5 Mar 2014 22:01:50 +0000 (11:01 +1300)]
Fix Merge::Map for scatter-gather in Configs.
When Merge::Map was used like so:
NovaCompute0Config:
Merge::Map:
NovaCompute0:
Fn:....
We were adjusting the inner NovaCompute0 to the current scaling loop
position rather than exploding it out as part of the map. For now, we
want maps to be global in context so the fix is fortunately simple.
Change-Id: Ibea723d4c763f593d934a9d2acfd31ce369f6408
Robert Collins [Wed, 5 Mar 2014 21:41:21 +0000 (10:41 +1300)]
Add a check target.
Just developer convenience - I'm used to autotools 'make check'
environments.
Change-Id: Idf5bb882f798d22d4513756b5273d4ae19caa5c0
Jenkins [Wed, 5 Mar 2014 10:53:18 +0000 (10:53 +0000)]
Merge "Add GlanceLogFile and GlanceNotifierStrategy"
Jenkins [Wed, 5 Mar 2014 09:29:37 +0000 (09:29 +0000)]
Merge "Make Wait Conditions depend on config creation"
Clint Byrum [Wed, 26 Feb 2014 22:27:24 +0000 (14:27 -0800)]
Make Wait Conditions depend on config creation
Currently our wait conditions are racing with Heat resolving
configurations. There should be plenty of time but sometimes Heat may
be dealing with a temporarily problematic Nova API and spinning on that.
While that is happening, the in-instance tools will not have their full
configuration available to them. We don't want the wait condition timeout
to start until the box has had its actual config exposed to it.
Change-Id: I0eab8fe7547d3cbcebb1559fd3d06206b1750e96
James Slagle [Wed, 26 Feb 2014 20:53:17 +0000 (15:53 -0500)]
Add GlanceLogFile and GlanceNotifierStrategy
Expose 2 new parameters to control glance configuration:
- GlanceLogFile
- GlanceNotifierStrategy
This will allow the glance configuration options log_file and
notifier_strategy to be set in glance-api.conf and glance-registry.conf
Change-Id: I1af1ecfdfe0859f2baba4579aab6e947a2a54308
Jan Provaznik [Thu, 30 Jan 2014 22:16:18 +0000 (17:16 -0500)]
Add rabbit.cookie attribute
All nodes in rabbitmq cluster should have same cookie. This patch adds
default random cookie to existing templates.
Change-Id: I6579089bd95b0169db20635479e077f3ecade8e2
Ladislav Smola [Mon, 24 Feb 2014 15:04:52 +0000 (10:04 -0500)]
Different Flavors for Tuskar roles
- different Flavors for control, compute and storage nodes
- for devtest use, they default to 'baremetal', so nothing
changes
- for Tuskar, there is a possibility to have them different for
every role
Change-Id: I8c1b80f55a91c7a7fd5e560ccdb8da82ec374084
Robert Collins [Fri, 21 Feb 2014 01:25:51 +0000 (14:25 +1300)]
Fix the hosts setting - nova uses novalocal.
Not '.local'. Doh.
Change-Id: I61ac6e5d6dfefcfe8c78618f6fc5d4c2c61831f0
Robert Collins [Thu, 20 Feb 2014 05:26:22 +0000 (18:26 +1300)]
Gather all hypervisor names into /etc/hosts.
Nova compute uses hostnames to do live migration, so we need this, or
DNS, and for now this is simpler, as we don't have Designate available
in the undercloud.
Change-Id: Idf0b106c5fbe60680b23a730eb37619a3d796869
Robert Collins [Thu, 20 Feb 2014 04:14:43 +0000 (17:14 +1300)]
Add a Merge::Map feature.
We need to scatter gather in a few situations - determining rabbit
cluster membership, galera membership and configuring hosts for Nova
to permit live migration (which requires host->host communication).
This patch is a proof of concept for an eventual heat feature,
expressed in merge.py. The example given should work for actual use,
but I'll deliver that change separately.
Change-Id: I68e9b2471866810cc698ca3ea28ddf5bb1688d7b