apex-tripleo-heat-templates.git
10 years agossl: Add support for a CA Certificate
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

10 years agoMerge "Specify group os-apply-config for config resources"
Jenkins [Tue, 20 May 2014 15:56:07 +0000 (15:56 +0000)]
Merge "Specify group os-apply-config for config resources"

10 years agoMerge "Adding SNMPd auth credentials"
Jenkins [Fri, 16 May 2014 12:44:25 +0000 (12:44 +0000)]
Merge "Adding SNMPd auth credentials"

10 years agoIntroduce configurable virtual ip in templates
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

10 years agoDefer to element mysql.innodb_buffer_pool_size
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

10 years agoMerge "Add NeutronControlPlaneID parameter"
Jenkins [Thu, 8 May 2014 03:34:02 +0000 (03:34 +0000)]
Merge "Add NeutronControlPlaneID parameter"

10 years agoMerge "Make size of loop device used by cinder LVM configurable"
Jenkins [Wed, 7 May 2014 13:11:17 +0000 (13:11 +0000)]
Merge "Make size of loop device used by cinder LVM configurable"

10 years agoAdd NeutronControlPlaneID parameter
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

10 years agoMerge "Increase PXE deployment timeout for overcloud"
Jenkins [Mon, 5 May 2014 22:12:03 +0000 (22:12 +0000)]
Merge "Increase PXE deployment timeout for overcloud"

10 years agoSpecify group os-apply-config for config resources
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

10 years agoScale the control plane in hosts files.
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

10 years agoAdding SNMPd auth credentials
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

10 years agoMake size of loop device used by cinder LVM configurable
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

10 years agoIncrease PXE deployment timeout for overcloud
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

10 years agoExpose dnsmasq options
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

10 years agoMerge "Add passthrough configuration glue."
Jenkins [Tue, 22 Apr 2014 19:20:08 +0000 (19:20 +0000)]
Merge "Add passthrough configuration glue."

10 years agoMerge "Adding undercloud ceilometer"
Jenkins [Fri, 18 Apr 2014 10:27:47 +0000 (10:27 +0000)]
Merge "Adding undercloud ceilometer"

10 years agoAdd passthrough configuration glue.
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

10 years agoAdding undercloud ceilometer
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

10 years agoSwitch overcloud to software-config
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

10 years agoMerge "Stop using notCompute in favor of controller"
Jenkins [Fri, 11 Apr 2014 18:50:53 +0000 (18:50 +0000)]
Merge "Stop using notCompute in favor of controller"

10 years agoMerge "Adding NTP to undercloud template"
Jenkins [Thu, 10 Apr 2014 14:47:56 +0000 (14:47 +0000)]
Merge "Adding NTP to undercloud template"

10 years agoStop using notCompute in favor of controller
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

10 years agoMerge "Add mysql innodb buffer pool size"
Jenkins [Tue, 8 Apr 2014 14:33:25 +0000 (14:33 +0000)]
Merge "Add mysql innodb buffer pool size"

10 years agoMerge "Allow setting the cinder iscsi-helper option"
Jenkins [Tue, 8 Apr 2014 00:09:14 +0000 (00:09 +0000)]
Merge "Allow setting the cinder iscsi-helper option"

10 years agoMerge "Add enable_tunneling to swift storage metadata"
Jenkins [Mon, 7 Apr 2014 20:31:32 +0000 (20:31 +0000)]
Merge "Add enable_tunneling to swift storage metadata"

10 years agoMerge "Add BlockStorage0Config Resource"
Jenkins [Mon, 7 Apr 2014 20:31:31 +0000 (20:31 +0000)]
Merge "Add BlockStorage0Config Resource"

10 years agoMerge "Update templates to default to preserve ephemeral"
Jenkins [Sat, 5 Apr 2014 10:29:31 +0000 (10:29 +0000)]
Merge "Update templates to default to preserve ephemeral"

10 years agoAdding NTP to undercloud template
Trent Geerdes [Fri, 4 Apr 2014 18:43:16 +0000 (12:43 -0600)]
Adding NTP to undercloud template

Change-Id: I30c0e175fda448a300cae0b233757d31ce73402f

10 years agoAdd enable_tunneling to swift storage metadata
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

10 years agoAdd mysql innodb buffer pool size
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

10 years agoAllow setting the cinder iscsi-helper option
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

10 years agoAdd BlockStorage0Config Resource
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

10 years agoDrop dnsmasq_range from the undercloud source.
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

10 years agoUpdate templates to default to preserve ephemeral
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

10 years agoMerge "Remove unnecessary cinder metadata"
Jenkins [Wed, 26 Mar 2014 09:38:58 +0000 (09:38 +0000)]
Merge "Remove unnecessary cinder metadata"

10 years agoMerge "Adding image update policy to undercloud template"
Jenkins [Wed, 26 Mar 2014 03:11:14 +0000 (03:11 +0000)]
Merge "Adding image update policy to undercloud template"

10 years agoFix Ironic templates
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

10 years agoPass undercloud metadata to overcloud compute
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

10 years agoAdding image update policy to undercloud template
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

10 years agoMerge "Change nova compute driver location"
Jenkins [Mon, 17 Mar 2014 10:21:02 +0000 (10:21 +0000)]
Merge "Change nova compute driver location"

10 years agoChange 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

10 years agoRemove unnecessary cinder metadata
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

10 years agoAdd Wait Condition to Block Storage Templates
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

10 years agoMerge "Add heat.stack_domain_admin_password"
Jenkins [Thu, 13 Mar 2014 00:30:55 +0000 (00:30 +0000)]
Merge "Add heat.stack_domain_admin_password"

10 years agoMerge "Merge Block Storage into Overcloud"
Jenkins [Wed, 12 Mar 2014 18:01:37 +0000 (18:01 +0000)]
Merge "Merge Block Storage into Overcloud"

10 years agoMerge "Remove Duplicate Rabbit Parameters"
Jenkins [Wed, 12 Mar 2014 16:24:18 +0000 (16:24 +0000)]
Merge "Remove Duplicate Rabbit Parameters"

10 years agoAdd heat.stack_domain_admin_password
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

10 years agoMerge "Swift storage heat templates"
Jenkins [Wed, 12 Mar 2014 08:05:44 +0000 (08:05 +0000)]
Merge "Swift storage heat templates"

10 years agoRemove Duplicate Rabbit Parameters
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

10 years agoMerge Block Storage into Overcloud
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

10 years agoMerge "Add rabbit.cookie attribute"
Jenkins [Tue, 11 Mar 2014 05:51:41 +0000 (05:51 +0000)]
Merge "Add rabbit.cookie attribute"

10 years agoSwift storage heat templates
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

10 years agoAdds block-storage-nfs template
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

10 years agoMerge "Fix Merge::Map for scatter-gather in Configs."
Jenkins [Thu, 6 Mar 2014 01:45:46 +0000 (01:45 +0000)]
Merge "Fix Merge::Map for scatter-gather in Configs."

10 years agoMerge "Add a check target."
Jenkins [Thu, 6 Mar 2014 01:45:46 +0000 (01:45 +0000)]
Merge "Add a check target."

10 years agoFix bad indentation
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

10 years agoFix Merge::Map for scatter-gather in Configs.
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

10 years agoAdd a check target.
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

10 years agoMerge "Add GlanceLogFile and GlanceNotifierStrategy"
Jenkins [Wed, 5 Mar 2014 10:53:18 +0000 (10:53 +0000)]
Merge "Add GlanceLogFile and GlanceNotifierStrategy"

10 years agoMerge "Make Wait Conditions depend on config creation"
Jenkins [Wed, 5 Mar 2014 09:29:37 +0000 (09:29 +0000)]
Merge "Make Wait Conditions depend on config creation"

10 years agoMake 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

10 years agoAdd GlanceLogFile and GlanceNotifierStrategy
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

10 years agoAdd rabbit.cookie attribute
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

10 years agoDifferent Flavors for Tuskar roles
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

10 years agoFix the hosts setting - nova uses novalocal.
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

10 years agoGather all hypervisor names into /etc/hosts.
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

10 years agoAdd a Merge::Map feature.
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

10 years agoFix tests.
Robert Collins [Thu, 20 Feb 2014 02:50:01 +0000 (15:50 +1300)]
Fix tests.

We're not gating yet - this skew crept in.

Change-Id: I97b064f6d0cb75bf80b423951101687b6d26d90c

10 years agoRemove uses of functions in parameter defaults
Clint Byrum [Thu, 20 Feb 2014 15:40:01 +0000 (15:40 +0000)]
Remove uses of functions in parameter defaults

This doesn't work in recent versions of Heat and it shouldn't really
have ever worked.

Change-Id: I60772173f8d5baa5768b5626266b2e61cd93fbe2
Closes-Bug: #1282594

10 years agoAdd username parameter for rabbit
Richard Su [Tue, 11 Feb 2014 23:52:37 +0000 (15:52 -0800)]
Add username parameter for rabbit

Username is currently assumed to be guest in the configuration
files. This change makes it more explicit.

Configuration files in tripleo-image-elements will be updated
to use this parameter in an upcoming patch.

Change-Id: Ia176f4d573a3a293560c72236a4181befa678301

10 years agoFix typo in undercloud-vm-source.yaml
Derek Higgins [Thu, 13 Feb 2014 21:22:37 +0000 (21:22 +0000)]
Fix typo in undercloud-vm-source.yaml

There is no NoEcho type.

Change-Id: Id652b80f394a0d0b9e4b83ca9a61d2b547a14c3e

10 years agoMerge "Support TripleO-CI for overcloud builds."
Jenkins [Thu, 13 Feb 2014 21:07:09 +0000 (21:07 +0000)]
Merge "Support TripleO-CI for overcloud builds."

10 years agoMerge "Allow manual hosts entry exports in overcloud."
Jenkins [Thu, 13 Feb 2014 21:07:09 +0000 (21:07 +0000)]
Merge "Allow manual hosts entry exports in overcloud."

10 years agoSupport TripleO-CI for overcloud builds.
Robert Collins [Wed, 12 Feb 2014 22:03:56 +0000 (11:03 +1300)]
Support TripleO-CI for overcloud builds.

For Tripleo-CI we can't generate the key in the VM and hand it out,
because we have restricted access to the machine. Plus, this has been
ugly forever. Pass an SSH key in, rather than pulling one out.

Change-Id: I1def0757758e30e63891ff099106dac158bd8d83

10 years agoMerge "Add a debian-mirror heat template"
Jenkins [Thu, 13 Feb 2014 19:11:24 +0000 (19:11 +0000)]
Merge "Add a debian-mirror heat template"

10 years agoAllow manual hosts entry exports in overcloud.
Robert Collins [Fri, 7 Feb 2014 02:57:07 +0000 (15:57 +1300)]
Allow manual hosts entry exports in overcloud.

This makes it possible to have SSL connections to APIs from compute
hosts with no DNS or external connectivity - something the
ci-overcloud has.

Change-Id: I089ef8fdfb4a59279f09bf3cd2a4474000e4bfa6

10 years agoMake it possible to do physical networks for VMs.
Robert Collins [Fri, 7 Feb 2014 02:37:45 +0000 (15:37 +1300)]
Make it possible to do physical networks for VMs.

This patch makes it possible to setup physical networks for VMs,
separate to the control plane configuration which is needed for
routed/natted access to physical networks.

Future work is needed to automate ci-overcloud configuration of the
control plane where we need two distinct bridges, but this is enough
to stop folk dying of boredom setting up a sizeable ci-overcloud.

Change-Id: I6ac7129f22bb797467adb0408638781d20081f19

10 years agoPermit overriding the undercloud controller ip.
Robert Collins [Tue, 11 Feb 2014 18:59:58 +0000 (07:59 +1300)]
Permit overriding the undercloud controller ip.

Currently we infer the controller IP address from Neutron, but when
we get HA, the controller address may move around so would need to
be the floating IP. Equally, folk doing unusual sets may need to
have the IP address be something other than what the seed Neutron
handed out.

Change-Id: I97441d009b831fd7356a6c58f4c9edc7532f7d05

10 years agoDrop PowerUserName from overcloud-source.yaml
Dan Prince [Sat, 8 Feb 2014 21:55:20 +0000 (16:55 -0500)]
Drop PowerUserName from overcloud-source.yaml

This parameter is only used for underclouds... no need
for it here.

Change-Id: I8cfda18ef4c9d7aa20fca7f1ba596541c3aad1ac

10 years agoSupport neutron.flat-networks in overclouds.
Robert Collins [Tue, 4 Feb 2014 00:07:03 +0000 (13:07 +1300)]
Support neutron.flat-networks in overclouds.

This is needed to allow configuring the template in
I9fa923b63033edb694720bfe5fc756a7c0fbfd2a.

Change-Id: I65810db156cb3d93291ac56fcf96e3ed2c87e1b2

10 years agoMake make overcloud.yaml DTRT always.
Robert Collins [Mon, 3 Feb 2014 23:59:54 +0000 (12:59 +1300)]
Make make overcloud.yaml DTRT always.

Change-Id: I3aebf49c87434026b9eea9de9a67cb3196bc48b2

10 years agoMerge "Remove InstanceType and ImageId from cinder template"
Jenkins [Mon, 3 Feb 2014 01:13:20 +0000 (01:13 +0000)]
Merge "Remove InstanceType and ImageId from cinder template"

10 years agoRemove image parameter changing from merge
Clint Byrum [Fri, 31 Jan 2014 19:05:09 +0000 (11:05 -0800)]
Remove image parameter changing from merge

The merge tool originally was meant to merge somewhat different things,
and thus this was helpful in the early versions. However, at this point
we want parameters to be more stable and we don't generally merge things
that have their own image parameter.

Meanwhile this feature caused problems as we change resource names.

This is a backward incompatible change of default behavior, but the old
behavior can be had again by passing --change-image-params.

Change-Id: I78cf31f0443f3d9f274758f5471a5bca9155635d

10 years agoAdd a debian-mirror heat template
Steve Kowalik [Thu, 23 Jan 2014 02:01:02 +0000 (13:01 +1100)]
Add a debian-mirror heat template

Populate defaults for the debian-mirror image-element using a heat
template.

Change-Id: I28de1d04be7292dad1bc448ff8bbde634cebd6f3

10 years agoRemove file injection config option.
Robert Collins [Thu, 30 Jan 2014 22:01:45 +0000 (11:01 +1300)]
Remove file injection config option.

We're just forcing it off now that the seed is Neutron based.

Change-Id: I3ebc1454aba9d2c2587628f9cded6e0f445f3606

10 years agoPrep work for a scalable control plane.
Robert Collins [Wed, 29 Jan 2014 00:29:49 +0000 (13:29 +1300)]
Prep work for a scalable control plane.

This is complete as far as it goes but it isn't enough to make running
a scaled out control plane actually work. Specifically, the constructs
to point at API hosts based on looking up a network address aren't
suirtable for scaled out - we need to be using the virtual IP or DNS
round robin or other such resilient configurations, but that is
largely / entirely orthogonal to making the template be ready for
scaling.

Change-Id: Ib9e6db5e7d5db84e4746afdabea046d2b8702bbb

10 years agoUpdate overcloud to support N compute hosts.
Robert Collins [Tue, 28 Jan 2014 06:39:43 +0000 (19:39 +1300)]
Update overcloud to support N compute hosts.

This uses the new merge feature earlier in this series.

Exporting COMPUTESCALE before running make will build a different
template. Note that since Make doesn't depend on variable values, you
need to delete overcloud.yaml between building with different scales.

Change-Id: If05b99ae3596bcc794e3a899ab1443aeb14ec754

10 years agoMerge "Make scaling out a feature for merge.py."
Jenkins [Thu, 30 Jan 2014 02:43:53 +0000 (02:43 +0000)]
Merge "Make scaling out a feature for merge.py."

10 years agoMerge "Make debugging merge.py in the test suite possible."
Jenkins [Tue, 28 Jan 2014 23:01:34 +0000 (23:01 +0000)]
Merge "Make debugging merge.py in the test suite possible."

10 years agoMerge "Permit writing output to other than stdout."
Jenkins [Tue, 28 Jan 2014 22:17:30 +0000 (22:17 +0000)]
Merge "Permit writing output to other than stdout."

10 years agoRemove InstanceType and ImageId from cinder template
marios [Tue, 28 Jan 2014 14:38:52 +0000 (16:38 +0200)]
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

10 years agoMake scaling out a feature for merge.py.
Robert Collins [Tue, 28 Jan 2014 06:20:40 +0000 (19:20 +1300)]
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

10 years agoMake debugging merge.py in the test suite possible.
Robert Collins [Tue, 28 Jan 2014 06:19:16 +0000 (19:19 +1300)]
Make debugging merge.py in the test suite possible.

Change-Id: Ie30f0421601cbd5cf8f88dcc3dcf818b1db589ba

10 years agoPermit writing output to other than stdout.
Robert Collins [Tue, 28 Jan 2014 06:18:57 +0000 (19:18 +1300)]
Permit writing output to other than stdout.

Change-Id: I8349f347578bab564e4c37ee2c87314881e09b01

10 years agoAllow setting a single NTP Server
Clint Byrum [Sun, 26 Jan 2014 06:13:48 +0000 (22:13 -0800)]
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

10 years agoMerge "Use OS::Heat::UpdateWaitConditionHandle"
Jenkins [Fri, 24 Jan 2014 23:18:31 +0000 (23:18 +0000)]
Merge "Use OS::Heat::UpdateWaitConditionHandle"

10 years agoMerge "Expose bridge_mappings in the overcloud."
Jenkins [Thu, 23 Jan 2014 21:34:52 +0000 (21:34 +0000)]
Merge "Expose bridge_mappings in the overcloud."

10 years agoExpose bridge_mappings in the overcloud.
Robert Collins [Fri, 17 Jan 2014 10:16:06 +0000 (23:16 +1300)]
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

10 years agoMerge "Add SSL configuration metadata for overclouds."
Jenkins [Wed, 22 Jan 2014 04:21:37 +0000 (04:21 +0000)]
Merge "Add SSL configuration metadata for overclouds."