69 Commits

Author SHA1 Message Date
Derek Higgins
f5c903c896 Reuse the undercloud service passwords as db passwords.
We need to stop using "unset" as the password for all databases. Ideally we
would add a "XxxxDSN" parameter (e.g. KeystoneDSN) but to remain consistent
with the overcloud for now we reuse the service passwords

Change-Id: I35c4fa3478eea92f81aa381fd2ab5fac5aae849f
2015-05-05 13:59:14 +01:00
Nicholas Randon
42a3b36247 Remove invalid NTP configuration in templates
Currently the all templates have an invalid setting for NTP
setup for the fudge setting. This should be removed from
the templates which will remove the warning seen in syslog.

ntpd[...]: inappropriate address xxx.xxx.xxx.xxx for the
    fudge command, line ignored

Partial-Bug: 1408379
Relates-To: Ib9931b84925d9ceb32f18e9adc5be64402fbf61e
Change-Id: I56a03dc0a899a8c515f2a05d678d7e80e9b7b93c
2015-01-08 15:54:05 +00:00
Steve Kowalik
6f16c96383 Remove default flavor from every template
With the push to using the new setup-flavors provided by
os-cloud-config, the default flavor will no longer be called
'baremetal', and Heat will always validate the default even if it
is overridden. To that end, remove the default flavor from every
flavor definition. Just to be certain, also add a custom_constraint
to every flavor definition that was missing it.

Change-Id: I24251e73be4e86738857f73b89499f592c4908de
2014-11-27 13:07:10 +11: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
9b2446c88d Merge "Enable Neutron DVR support in TripleO installation" 2014-11-11 15:25:11 +00:00
Jenkins
b6fac3c901 Merge "Add SSL PKI properties for keystone" 2014-10-30 09:11:01 +00: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
Jenkins
737185abf1 Merge "Secure the MySQL bind-address on the undercloud" 2014-10-15 22:01:55 +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
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
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
Steve Baker
d6e40a3fff Use the server name attribute
The 'show' attribute results in a nova API call, which has
performance overhead even with attribute memoization.
The name attribute was added to expose the name without needing
an API call, since the resource already knows the name. This
change switches from using 'show' to 'name' throughout.

Change-Id: I1e83dd008cd02e5cec97868db0d5a695f07b7199
2014-09-14 10:05:43 +12:00
Jenkins
a916a8b2f8 Merge "Make turning debug on globally easy." 2014-09-02 21:53:16 +00:00
Robert Collins
cfb9931ce4 Change | to > in templates.
Clint pointed out that | prevents things rendering properly on
arbitrarily wide screens. For most things that makes sense but it
doesn't for the JSON examples IMO so I didn't alter those.

Change-Id: Ifb7dcc265c225b000bd5d26500212d41ea0233c8
2014-08-30 20:53:54 +12:00
Jenkins
ec7abd73d7 Merge "Expose public_interface_tag support." 2014-08-29 23:13:00 +00:00
Robert Collins
91e763f748 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
2014-08-28 13:34:38 -04:00
Robert Collins
3757966936 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
2014-08-28 08:23:17 +12:00
Jenkins
aea200427d Merge "Make signal_transport a parameter" 2014-08-25 04:18:47 +00:00
Jenkins
b7363014fe Merge "Set the MySQL root password" 2014-08-19 13:17:50 +00:00
Clint Byrum
bf62abdc07 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
2014-08-18 16:45:29 -07:00
Nicholas Randon
de1ea55597 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
2014-08-14 14:27:41 +01:00
Therese McHale
e01f11cc43 Set the MySQL root password
Set the MySQL root password to a random string
for the undercloud and overcloud

Change-Id: I6d38ca82c77a4aa8f58089c50aa5bf320ec0ecc6
2014-08-14 11:46:35 +01:00
Steve Baker
8a99e7d461 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
2014-08-13 10:53:46 +12:00
Jenkins
06fcc32314 Merge "Fix overcloud controller scaling" 2014-08-10 05:45:33 +00:00
Tomas Sedovic
a5413281e0 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
2014-08-07 11:46:20 +02:00
Jan Provaznik
4fd5693c3c 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
2014-08-06 16:08:05 +02:00
Steve Baker
02772ba287 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
2014-08-04 08:57:52 +12:00
Steve Baker
beca15dec5 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
2014-08-04 08:57:52 +12:00
Robert Collins
303200408b Specify the network for nodes
Without this, when there are multiple admin networks (e.g. a VLAN)
Nova will refuse to guess and we'll fail to deploy.

Change-Id: Id1dca43ef287fda2adcfdf5b5d30145b055dbe76
2014-07-07 10:25:03 +12:00
Jenkins
9e33760e06 Merge "Set glance protocol and port as Heat configurable" 2014-06-27 07:53:53 +00:00
Jan Provaznik
8fc307cc22 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
2014-06-25 09:23:35 +02:00
Jenkins
b5b85036c4 Merge "Add custom public IP support to the undercloud." 2014-06-20 18:55:45 +00:00
Ryan Moore
9a3f38a7df 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
2014-06-16 09:55:41 +01:00
Robert Collins
b08bb1cf49 Add custom public IP support to the undercloud.
Now we're trying to automate VLAN deployed underclouds, this
suddenly becomes relevant.

Change-Id: I800a0ceab7443d685551d7a919724f6cf45fd891
2014-06-04 13:25:34 +12:00
Nicholas Randon
27c4f4a28b 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
2014-06-03 12:56:58 +00:00
Nicholas Randon
5771b71899 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
2014-06-03 13:43:17 +01:00
Gregory Haynes
42f32ba951 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
2014-06-02 11:09:00 -07:00
Robert Collins
8c39eda54c 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
2014-05-28 18:52:18 +12:00
Jenkins
5de81f897d Merge "Adding SNMPd auth credentials" 2014-05-16 12:44:25 +00:00
Clint Byrum
5e5d633451 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
2014-05-08 08:33:01 -07:00
Ladislav Smola
4e3fc267a0 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
2014-04-28 15:07:37 +02:00
Duncan Thomas
d6b5b1d869 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
2014-04-25 13:19:52 +01:00
Ladislav Smola
bbf98eb053 Adding undercloud ceilometer
-adding Undercloud Ceilometer that will collect statistics
 about Overcloud nodes, via SNMP

Change-Id: I1e90ad8d5bad16bc1c418ca2dbd78163abe6267c
2014-04-16 15:52:38 +02:00
Jenkins
a830cea3b1 Merge "Stop using notCompute in favor of controller" 2014-04-11 18:50:53 +00:00
Jenkins
64a616c426 Merge "Adding NTP to undercloud template" 2014-04-10 14:47:56 +00:00
Dan Prince
0223d35c0c Stop using notCompute in favor of controller
Updates all references for notCompute and notcompute
to use 'controller' instead.

Change-Id: I70ef83f35064ab388bdc7e1a6da62b6585580010
Partial-bug: #1300324
2014-04-09 13:26:41 -04:00
Jenkins
101e7e9be4 Merge "Add mysql innodb buffer pool size" 2014-04-08 14:33:25 +00:00
Jenkins
2e184b20a1 Merge "Update templates to default to preserve ephemeral" 2014-04-05 10:29:31 +00:00
Trent Geerdes
d837c677ee Adding NTP to undercloud template
Change-Id: I30c0e175fda448a300cae0b233757d31ce73402f
2014-04-04 12:43:49 -06:00