summaryrefslogtreecommitdiffstats
path: root/environments
AgeCommit message (Collapse)AuthorFilesLines
2016-04-14Retain existing ComputeHostnameFormat when upgrading older envsmarios1-0/+2
As discussed at +bug/1569705 after an upgrade to liberty from an older deployment, the hostname of the compute nodes is changed. If we set the ComputeHostnameFormat in the upgrade-pacemaker-init environment file parameter_defaults then we don't need to worry about the new value being specified as default by the upgraded overcloud.yaml since the parameter_defaults value is persisted unless explicitly overridden with a new parameter_defaults value. This is provided as a new environment file that needs to be included in the first upgrade step when upgradinng from an environment that has 'overcloud-compute-N' hostnames. Change-Id: I2c12bd1abac65d7f13d8768f87c5ebda91164578 Related-Bug: 1569705
2016-04-11Always use parameter_defaults in environment filesJiri Stransky6-7/+7
In the environments/ subdirectory of tripleo-heat-templates, we mostly use parameter_defaults, but some of the environment files still use parameters. This can lead to confusing behavior with respect to parameter priority when passing environment files to deploy/update commands. Users might expect that subsequent environment files take priority over preceding ones, but that might not be the case if the preceding environment files use `parameters`, while the subsequent ones use `parameter_defaults`. This commit switches all `parameters:` uses in environments/ subdirectory to `parameter_defaults:`. Change-Id: Ie4c03c7e7f5a5004a0384d35817135f357e9719b Closes-Bug: #1567837
2016-04-11Deploy Gnocchi as a Ceilometer metrics storage backendPradeep Kilambi4-2/+10
* Deploy Gnocchi API. * Storage backends: swift, rbd and file. * Indexer backend default to mysql * Configure Ceilometer to send metrics datas to Gnocchi * Pacemaker config Depends-On: Ic8778a3104e0ed0460423e4bf857682220dc5802 Depends-On: I7d2eb9405e0171fc54fa0b616122f69db5f51ce2 Co-Authored-By: Pradeep Kilambi <pkilambi@redhat.com> Change-Id: Ifde17b1ab8fa2b30544633e455e1c7eb475705aa
2016-04-11Merge "composable keystone services"Jenkins1-0/+6
2016-04-11Don't have separate protocols/ports for Keystone v3Zane Bitter1-3/+0
The change in ab068a824ed51e78bf111387223e58e885ec5c84 is described as temporary, so it would be better if it did not affect the EndpointMap parameter (which is effectively a public interface, since it may be overridden in an environment file). No configuration should end up with different ports/protocols/hosts for Keystone v2 and v3, and somebody customising them should not have to account for them separately. Nor should things break when the need to distinguish between v2 and v3 endpoints goes away. This change removes the KeystoneV3* keys from the EndpointMap input and uses the Keystone* keys instead, so that any change to the internal organisation becomes transparent to the user. Change-Id: If4cdd9232f4dbc9f2af651bbdfe68f09dc26ed2e
2016-04-09composable keystone servicesDan Prince1-0/+6
Adds new puppet and puppet pacemaker specific services for Keystone. The puppet manifests for keystone now live in puppet-tripleo. Hiera settings are driven by the nested stack heat templates and used to control puppet-keystone and puppet-tripleo directly. The Pacemaker template extends the default keystone service and swaps in the pacemaker specific puppet-tripleo profile instead. Change-Id: I8b30438a27e9d5ec4e7d335e0bd1a931a20b03a2 Depends-On: I2faf5a78db802549053ec41678bf83bf28108189
2016-04-08Remove network/noop.yaml, use OS::Heat::NoneDan Prince3-3/+3
Removes the old noop nested stack template for networks and instead uses OS::Heat::None instead. This should avoid a few extra resource checks on create and update. Change-Id: Ia3d7f62dbda2705ffc3d9edcddebcd3ece3cc9d2
2016-03-29Merge "PLUMgrid Neutron integration"Jenkins1-0/+29
2016-03-24Set UpdateIdentifier for upgrade converge, to prevent services downMathieu Bultel1-0/+4
We'd like to let the post puppet pacemaker controller services restart to happen for the convergence step so set the UpdateIdentifier. However also set the PackageUpdate to noop so the yum_update.sh doesn't happen. Since a full haproxy restart is expected, we no longer need the systemctl reload added at Iae3bad745ecdf952a7a0314fe1375d07eb47c454 so remove that too. Some more context at https://bugzilla.redhat.com/show_bug.cgi?id=1321036 Co-Authored-By: marios <marios@redhat.com> Change-Id: I31c2d97d68c97b435f63863fae2c89f18f99681d
2016-03-24Merge "Deploy Aodh services, replacing Ceilometer Alarm"Jenkins1-0/+3
2016-03-23configure horizon with memcached ipv6 when neededEmilien Macchi1-0/+2
* Add MemcachedIPv6 parameter * If MemcachedIPv6 is set at True, configure Horizon with Memcached IPv6 addresses. This patch is required to make Horizon working when running IPv6 networks. Change-Id: I752e727bfb9040b29f5d755f565fa6b54b9511c8
2016-03-23Merge "Comment out the ManagementPort in external-loadbalancer-vip.yaml"Jenkins1-3/+4
2016-03-22Merge "Remove GlanceRegistry from EndpointMap"Jenkins1-3/+0
2016-03-21Remove CephStorageCountDerek Higgins1-2/+1
This is set by tripleoclient, remove it from here so it doesn't override the user provided value. Change-Id: I6110b71e484af749838f91dc5c6c4982b0c83074
2016-03-20Deploy Aodh services, replacing Ceilometer AlarmPradeep Kilambi1-0/+3
Ceilometer Alarm is deprecated in Liberty by Aodh. This patch: * manage Aodh Keystone resources * deploy Aodh API under WSGI, Notifier, Listener and Evaluator * manage new parameters to customize Aodh deployment * uses ceilometer DB for the upgrade path * pacemaker config * Add migration logic to remove pcs resources Depends-On: I5333faa72e52d2aa2a622ac2d4b60825aadc52b5 Depends-On: Ib6c9c4c35da3fb55e0ca8e2d5a58ebaf4204d792 Co-Authored-By: Emilien Macchi <emilien@redhat.com> Change-Id: Ib47a22884afb032ebc1655e1a4a06bfe70249134
2016-03-18Comment out the ManagementPort in external-loadbalancer-vip.yamlMarius Cornea1-3/+4
The Management network is optional and disabled by default. This change preserves backward compatibility and fixes https://bugzilla.redhat.com/show_bug.cgi?id=1317594 Change-Id: I73cf51154c9ee7c05938e2cadf0c5ac107840bad
2016-03-18PLUMgrid Neutron integrationQasim Sarfraz1-0/+29
Enable PLUMgrid neutron liberty plugin in a TripleO overcloud environment. Change-Id: I07025f67ec3f3399aac4dcd10cc37e857772548b Signed-off-by: Qasim Sarfraz <qasims@plumgrid.com>
2016-03-18Remove GlanceRegistry from EndpointMapGiulio Fidente1-3/+0
We don't need an endpoint for the glance-registry service, that is used by glance-api when needed and is not meant to be user-facing. Change-Id: Ia6c9dd6164d3b91adbc937d70fa74d5fbbfb28a3
2016-03-11Merge "Remove unused Neutron Agents container"Jenkins2-4/+3
2016-03-11Merge "Parameterize the heat-docker-agents image"Jenkins1-0/+1
2016-03-10Merge "Enable predictable IPs on non-controllers"Jenkins1-0/+75
2016-03-10Merge "Support the deployment of Ceph over IPv6"Jenkins1-0/+2
2016-03-10Merge "Upgrades: initialization command/snippet"Jenkins1-1/+1
2016-03-10Support the deployment of Ceph over IPv6Giulio Fidente1-0/+2
To deploy Ceph on IPv6, we need to enable ms_bind_ipv6 in addition to passing the list of MON IPs in brackets. Change-Id: I3644b8fc06458e68574afa5573f07442f0a09190
2016-03-09Enable predictable IPs on non-controllersBen Nemec1-0/+75
For the external loadbalancer work, we added the ability to specify fixed ips for controller nodes on all network isolation networks. In order to allow users full control over the placement and ip addresses of deployed nodes, we need to be able to do the same thing for the other node types. Change-Id: I3ea91768b2ea3a40287f2f3cdb823c23533cf290
2016-03-09Remove unused Neutron Agents containerRyan Hallisey2-4/+3
The Neutron Agents is currently not used. Refactor the heat templates to accommodate for this change. Change-Id: Ice3c5ce723fa16cfb66c2b0afbe51d7b282c3210
2016-03-09Merge "Add Rabbit IPv6 only support"Jenkins1-0/+2
2016-03-09Upgrades: initialization command/snippetJiri Stransky1-1/+1
This allows to run a command or a script snippet on all overcloud nodes at the beginning of the upgrade. The intended use is to switch to a new set of repositories on the overcloud. This is done differently in different contexts (e.g. upstream vs. downstream), but generally it should be simple enough to not warrant creation of switchable "UpgradeInit" resource in the resource registry, and a string command/snippet parameter should suffice. Change-Id: I72271170d3f53a5179b3212ec9bae9a6204e29e6
2016-03-09Make External Load Balancer templates work with IPv6Dan Sneddon1-0/+38
This change modifies the network isolation templates that allow for fixed IP addresses on the controllers' IPs and VIPs, and makes them compatible with IPv6 addresses. The latest version of the patchset creates an from_service_v6.yaml in order to properly handle service VIPs on IPv6 networks. Note that since OVS is not currently compatible with IPv6 tunnel endpoints, this patch does not yet enable IPv6 for the Tenant network by default. Change-Id: If881b000c6000ec13b54c0ee39f1c8940f079ae3 Co-Authored-By: Giulio Fidente <gfidente@redhat.com>
2016-03-09Merge "Update enable-tls.yaml with new endpoints"Jenkins1-0/+6
2016-03-09Add Rabbit IPv6 only supportMartin Mágr1-0/+2
Adds Rabbit environment variable required for IPv6 only support Change-Id: Iec209ca83a5b0708ac828c4afaf9d2222e597f24
2016-03-08Update enable-tls.yaml with new endpointsBen Nemec1-0/+6
A couple of new endpoints have been added, and if they're not in the configured value for EndpointMap it will cause problems. Sahara is not added as ssl-enabled because I don't believe it has been added to the loadbalancer yet. Note that there is work underway to CI overcloud SSL, which should catch problems like this in the future. Change-Id: Ia8a106fd94da7be8675ea84f5fbb9ac959771d10
2016-03-07Merge "Allow to enable IPv6 on Corosync"Jenkins1-0/+2
2016-03-07Merge "Revert "Deploy Aodh services, replacing Ceilometer Alarm""Jenkins1-3/+0
2016-03-07Merge "Add IPv6 versions of the Controller NIC configs"Jenkins6-12/+52
2016-03-07Merge "Introduce a UpgradeScriptDeliveryWorfklow as part of tripleo upgrades"Jenkins1-0/+11
2016-03-04Revert "Deploy Aodh services, replacing Ceilometer Alarm"James Slagle1-3/+0
This just a revert to see if reverting this gets back to a normal CI run time. This reverts commit f72aed85594f223b6f888e6d0af3c880ea581a66. Change-Id: I04a0893f6cf69f547a4db26261005e580e1fc90b
2016-03-05Allow to enable IPv6 on CorosyncEmilien Macchi1-0/+2
To enable IPv6 in Corosync, you'll need to set the --ipv6 parameter when building the cluster. To do so, we need to specify this parameter in puppet configuration when running ::pacemaker::corosync class. So we have now a new parameter: CorosyncIPv6 which is a boolean, False by default. If set to True, it will pass right options to enable IPv6 when building the Pacemaker cluster. Change-Id: I485f1399964ddd7a201ed19ec6580b8a136b3acd
2016-03-05Add IPv6 versions of the Controller NIC configsDan Sneddon6-12/+52
This change adds Controller NIC configs for the sample NIC config templates that are compatible with IPv6 on the External network. These controller-v6.yaml templates include a default route for IPv6 on the External network, and a default route for IPv4 on the Control Plane. The Heat parameters ExternalNetworkDefaultRoute and ControlPlaneDefaultRoute are used to set these values. Change-Id: Ifed8cb359eae1d9d623d3eb2fe40ea8a0d1d889a
2016-03-04Parameterize the heat-docker-agents imageRyan Hallisey1-0/+1
Heat docker agents needs to be parameterized so that we can change the tag from the environment file. Change-Id: I352fd0fdf982056de23285e366efe55ca3aaff1b Co-authored-by: Jeff Peeler <jpeeler@redhat.com>
2016-03-04Add IPv6 Support to Isolated NetworksDan Sneddon1-0/+49
This change adds a new set of network templates with IPv6 subnets that can be used instead of the existing IPv4 networks. Each network can use either the IPv4 or IPv6 template, and the Neutron subnet will be created with the specified IP version. The default addresses used for the IPv6 networks use the fd00::/8 prefix for the internal isolated networks (this range is reserved for private use similar to 10.0.0.0/8), and 2001:db8:fd00:1000::/64 is used as an example default for the External network (2001:db8::/32 are the documentation addresses [RFC3849]), but this would ordinarily be a globally addressable subnet. These parameters may be overridden in an environment file. This change will require updates to the OpenStack Puppet Modules to support IPv6 addresses in some of the hieradata values. Many of the OPM modules already have IPv6 support to support IPv6 deployments in Packstack, but some OPM packages that apply only to Instack/TripleO deployments need to be updated. IPv6 addresses used in URLs need to be surrounded by brackets in order to differentiate IP address from port number. This change adds a new output to the network/ports resources for ip_address_uri, which is an IP address with brackets in the case of IPv6, and a raw IP address without brackets for IPv4 ports. This change also updates some URLs which are constructed in Heat. This has been tested and problems were found with Puppet not accepting IPv6 addresses. This is addressed in the latest Puppet. Additional changes were required to make this work with Ceph. IPv6 tunnel endpoints with Open vSwitch are not yet supported (although support is coming soon), so this review leaves the Tenant network as an isolated IPv4 network for the time being. Change-Id: Ie7a742bdf1db533edda2998a53d28528f80ef8e2
2016-03-04Allow for usage of pre-allocated IPs for the management networkSteven Hardy1-0/+3
Id3d4f12235501ae77200430a2dc022f378dce336 added support for pre-allocated IPs on the other overlay networks, but because the patch adding the managment network (I0813a13f60a4f797be04b34258a2cffa9ea7e84f) was under review around the same time, we missed adding the from_pool capability to the ManagementNetwork. Change-Id: If99f37634d5da7e7fb7cfc31232e926bd5ff074a
2016-03-03Deploy Aodh services, replacing Ceilometer AlarmEmilien Macchi1-0/+3
Ceilometer Alarm is deprecated in Liberty by Aodh. This patch: * manage Aodh Keystone resources * deploy Aodh API under WSGI, Notifier, Listener and Evaluator * manage new parameters to customize Aodh deployment * uses ceilometer DB for the upgrade path * pacemaker config Depends-On: I9e34485285829884d9c954b804e3bdd5d6e31635 Depends-On: I891985da9248a88c6ce2df1dd186881f582605ee Depends-On: Ied8ba5985f43a5c5b3be5b35a091aef6ed86572f Co-Authored-By: Pradeep Kilambi <pkilambi@redhat.com> Change-Id: I58d419173e80d2462accf7324c987c71420fd5f6
2016-03-03Introduce a UpgradeScriptDeliveryWorfklow as part of tripleo upgradesmarios1-0/+11
This splits the upgrade script delivery out of the UpgradeWorkflow and into a new task which delivers the upgrade script for compute and object-storage nodes. This is intended to be the first part of the upgrades process, since we need to upgrade swift nodes before the controllers and then only one at a time. So this will deliver the upgrade script which can be invoked by the operator using the existing script in tripleo-common 'upgrade-non-controller.sh'. This can be invoked by passing the -e environments/major-upgrade-script-delivery.yaml (added here) to the openstack overcloud deploy command. Change-Id: I20a0d4978e907111404f8108c502ab53b69a3296
2016-02-29Merge "OpenContrail heat templates"Jenkins1-0/+22
2016-02-29Merge "Change the default value for NetworkNexusVxlanGlobalConfig"Jenkins1-1/+1
2016-02-26Merge "Nova RPC unpinning"Jenkins1-0/+2
2016-02-26Merge "Add a sample network-environment.yaml file to environments"Jenkins1-0/+50
2016-02-25Merge "Add UpgradeLevelNovaCompute parameter"Jenkins1-0/+3
2016-02-25Merge "Introduce update/upgrade workflow"Jenkins1-2/+7