aboutsummaryrefslogtreecommitdiffstats
path: root/puppet/controller.yaml
AgeCommit message (Collapse)AuthorFilesLines
2016-03-22Fix redis coordination urlPradeep Kilambi1-3/+4
The coordination url connection string to redis is incorrectly formatted with password. More details: https://bugzilla.redhat.com/show_bug.cgi?id=1320036 Change-Id: I93f5e93dfce4ba2629aa57534e8d33d5d1e6d77b
2016-03-21Merge "Allow option to disable Swift ring management"Jenkins1-4/+6
2016-03-21Merge "Wire in HAProxy stats user and password"Jenkins1-0/+11
2016-03-21Allow option to disable Swift ring managementChristian Schwede1-4/+6
There are quite a few cases where it is useful to disable ring building on the nodes. For example: - using different weights, regions, and zones - replacing a node in an existing Swift cluster - adding a new node to an existing cluster - using storage policies and therefore multiple rings - using different nodes and disks for account, container and object servers This patch allows it to disable ring building. Rings need to be maintained manually then, and copied to all storage and proxy nodes within a cluster. This patch is similar to I01311ec3ca265b151f8740bf7dc57cdf0cf0df6f, except that it uses the current templates. Change-Id: I56978b15823dd6eaf4b6fd3440df2f895e89611a
2016-03-18Merge "Remove default for the RabbitMQ password"Jenkins1-1/+0
2016-03-18Remove default for the RabbitMQ passwordJuan Antonio Osorio Robles1-1/+0
Since the password is now autogenerated from the tripleoclient, there is no need to keep the default value here. Change-Id: If41cb56134966456f8590da04f392faffe5c62a1 Closes-Bug: #1557688
2016-03-17Merge "Remove forced rabbitmq::file_limit conversion to string"Jenkins1-8/+1
2016-03-15Merge "Ensure access to Redis is password protected"Jenkins1-1/+10
2016-03-14Merge "Keystone domain for Heat"Jenkins1-1/+3
2016-03-11Merge "Pass public_addr to ceph::profile::params instead of ceph::mon"Jenkins1-1/+1
2016-03-10Keystone domain for HeatMartin Mágr1-1/+3
This patch adds support for configuring Keystone domain for Heat via heat-keystone-setup-domain script. It should be reverted as soon as Keystone v3 is fully functional. This patch won't be fully functional without either python-keystoneclient fix [1] or workaround [2]. [1] https://bugs.launchpad.net/python-keystoneclient/+bug/1452298 [2] https://review.openstack.org/180563 Change-Id: Ie9cdd518b299c141f0fdbb3441a7761c27321a88 Co-Authored-By: Jiri Stransky <jistr@redhat.com> Depends-On: Ic541f11978908f9344e5590f3961f0d31c04bb0c
2016-03-09Wire in HAProxy stats user and passwordBen Nemec1-0/+11
Change-Id: I26b7a1cd1b7b6520db1df49c60a86c2bb5bce1b0 Depends-On: I12e835964a0370de73e45ef0a8603656ecb02d0c Depends-On: I8a5844e89bd81a99d5101ab6bce7a8d79e069565
2016-03-09Ensure access to Redis is password protectedGiulio Fidente1-1/+10
Depends-On: I1a8741b9e00775763911222cbe0af677b59e03a1 Change-Id: I373f97ada4e4101700a12b42dfb8ee4b2ff701f2
2016-03-09Remove forced rabbitmq::file_limit conversion to stringJiri Stransky1-8/+1
Combined with a fix in puppetlabs-rabbitmq, we can lift the forced conversion of rabbitmq::file_limit into a string in Hiera. See the referenced puppetlabs-rabbitmq pull request for explanation of the issue. Change-Id: I0ec720b5e06763e86ea93f59cfe05842b3d13269 Depends-On: https://github.com/puppetlabs/puppetlabs-rabbitmq/pull/401
2016-03-09Merge "Add Rabbit IPv6 only support"Jenkins1-0/+6
2016-03-09Merge "Change the CinderISCSIHelper to lioadm"Jenkins1-1/+1
2016-03-09Add Rabbit IPv6 only supportMartin Mágr1-0/+6
Adds Rabbit environment variable required for IPv6 only support Change-Id: Iec209ca83a5b0708ac828c4afaf9d2222e597f24
2016-03-08Change the CinderISCSIHelper to lioadmGiulio Fidente1-1/+1
Previously we used to always set CinderISCSIHelper to lioadm from the client. With [1] we aim at cleaning up the client from any default so this change move the actual default into the templates. 1. Iabc94ad1cce6f1744429aca9f866a59a698f5680 Change-Id: I662e4b0e3cf909ec2583d087ca1d246715caf0f7 Related-Bug: 1554564
2016-03-08Store events in CeilometerRichard Su1-0/+6
Adds an option to toggle whether events are stored in Ceilometer. The default is false and remains unchanged. Change-Id: I9accb679b97cf7172c67f3cd5f218bdaee507c94 Related-Bug: rhbz#1312373
2016-03-07Merge "Allow to enable IPv6 on Corosync"Jenkins1-0/+6
2016-03-07Merge "Use MysqlVirtualIPUri for nova_api and sahara database"Jenkins1-2/+2
2016-03-07Merge "Revert "Deploy Aodh services, replacing Ceilometer Alarm""Jenkins1-28/+0
2016-03-07Fixup swift device string to delimit the ipv6 address with []marios1-2/+2
The swift device string is formatted in the outputs of the controller template and swift-storage templates. For ipv6 we need to delimit the address with [] as discussed in https://bugzilla.redhat.com/show_bug.cgi?id=1296701#c0 Change-Id: Ie611d62c3668a65a7be52777a613d265682c6a8b Co-Authored-By: Jiri Stransky <jistr@redhat.com> Closes-Bug: 1534135
2016-03-04Revert "Deploy Aodh services, replacing Ceilometer Alarm"James Slagle1-28/+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/+6
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-05Use MysqlVirtualIPUri for nova_api and sahara databaseGiulio Fidente1-2/+2
Without this the nova_api and sahara database_connection string won't add brackets around the IP address, when IPv6, causing db sync to fail. Change-Id: I262e5de993ae59ad665edb043119aac2e09c6fdc
2016-03-04Add IPv6 Support to Isolated NetworksDan Sneddon1-11/+39
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/+2
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/+28
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-02Merge "Add HostnameMap to allow granular control of hostnames"Jenkins1-1/+8
2016-03-01Merge "Enable heat-manage purge_deleted cron job"Jenkins1-0/+7
2016-02-29Merge "OpenContrail heat templates"Jenkins1-0/+1
2016-02-29Merge "Enable notifications on the overcloud"Jenkins1-0/+3
2016-02-26Merge "Emits a different hostname for each network the node is on"Jenkins1-3/+46
2016-02-26Merge "Nova RPC unpinning"Jenkins1-0/+6
2016-02-25Enable notifications on the overcloudBen Nemec1-0/+3
Configures all services to send notifications to rabbit. The puppet modules are not consistent regarding how this is done - some expose notification config as a top-level param, others you need to set it through a *_config structure, and cinder provides a separate class dedicated to enabling ceilometer notifications. Change-Id: I23e2ddad3c59a06cfbfe5d896a16e6bad2abd943
2016-02-24Emits a different hostname for each network the node is onGiulio Fidente1-3/+46
Populates /etc/hosts with an entry for each IP address the node is on, which will be useful to migrate services configuration from using IPs into using hostnames. This is how the lines look like on a host which doesn't have all ports: 172.16.2.6 overcloud-novacompute-0.localdomain overcloud-novacompute-0 192.0.2.9 overcloud-novacompute-0-external 172.16.2.6 overcloud-novacompute-0-internalapi 172.16.1.6 overcloud-novacompute-0-storage 192.0.2.9 overcloud-novacompute-0-storagemgmt 172.16.0.4 overcloud-novacompute-0-tenant 192.0.2.9 overcloud-novacompute-0-management the network against which the default (or primary) name is resolved can be configured (for computes) via ComputeHostnameResolveNetwork Change-Id: Id480207c68e5d68967d67e2091cd081c17ab5dd7
2016-02-24Nova RPC unpinningJiri Stransky1-0/+6
During upgrades, we only run Puppet on the whole deployment to converge the state, after the upgrade workflow itself has been fully completed. That is an opportunity to utilize Puppet to make sure Nova Compute RPC doesn't remain pinned to the older version. Change-Id: I6ebc813a80dfd9dfbbb213c38724487e044507b8
2016-02-23Nova Neutron configuration now uses keystone v3 endpointDavid Moreau Simard1-1/+1
Our current nova-neutron configuration does not work with the latest puppet-nova. In particular, this patch[1]. This commit adds keystone v3 endpoints to the map and gets the nova::network::neutron configuration to use them. [1] https://github.com/openstack/puppet-nova/commit/d09868a59c451932d67c66101b725182d7066a14 Change-Id: Ifb8c23c81c665c2732fa5cd757760668b06a449a
2016-02-22Update nova::network::neutron variables to drop deprecated parametersDavid Moreau Simard1-4/+4
This commit ensures we are not using any deprecated parameters for nova::network::neutron and are using the right variable names. Change-Id: Ic1b41e2cdbb6b180496822cc363c433e9388aa02
2016-02-19Merge "Add TripleO Heat Template Parameters for Neutron Tenant MTU"Jenkins1-0/+12
2016-02-18Merge "Configure keystone public_endpoint"Jenkins1-1/+1
2016-02-18Merge "Enable the ML2 port security extension driver by default"Jenkins1-1/+1
2016-02-17Add TripleO Heat Template Parameters for Neutron Tenant MTUDan Sneddon1-0/+12
This change adds the TripleO Heat Parameters and Puppet hieradata to support setting the MTU for Neutron tenant networks. A new parameter, NeutronTenantMtu is introduced, and this gets used for the NeutronDnsmasqOptions and in Puppet hieradata. NeutronTenantMtu is also used in the Puppet hieradata for both the compute and control nodes. Two values are set: nova::compute::network_device_mtu which sets /etc/nova/nova.conf: network_device_mtu = <NeutronTenantMtu> neutron::network_device_mtu which sets in /etc/neutron/neutron.conf: network_device_mtu = <NeutronTenantMtu> finally, the NeutronDnsmasqOptions parameter becomes a str_format that maps the NeutronTenantMtu onto the DHCP options, so a default of 'dhcp-option-force=26,%MTU%' would be formatted to 'dhcp-option-force=26,1300' if NeutronTenantMtu were 1300. This will set dnsmasq to serve an MTU via DHCP that matches the NeutronTenantMtu: /etc/neutron/dnsmasq-neutron.conf:dhcp-option-force=26,1300 Typically, you would change all three of these settings to use small or jumbo frames in VMs. When using tunneling, NeutronTenantMtu should be set at least 50 bytes smaller than the physical network MTU in order to make room for tunneling overhead. Note that this change does not support setting the MTU on veth interfaces if veth patches are used to br-int instead of OVS patches. Change-Id: I38840e082ee01dc3b6fc78e1dd97f53fa4e63039
2016-02-15Pass public_addr to ceph::profile::params instead of ceph::monGiulio Fidente1-1/+1
The ceph::mon resource is a define not a class so the hieradata is not applied transparently; this change passes it to ceph::profile::params instead which is a class. Change-Id: Ia6518b769feb147f862b67915432d1bb7b47a415 Depends-On: I56f969328c68ed83a9b2d54ff4254dbcd6f55de0
2016-02-12Add missing : in hieradata key nameJames Slagle1-1/+1
This hieradata key, neutron::agents::ml2::ovs:bridge_mappings was missing a : before bridge_mappings causing the value to be blank in /etc/neutron/plugins/ml2/openvswitch_agent.ini even if a value had been specified. Change-Id: I377565d3fb821be1bb2dc7d92ec1ad25a4a3b1f1
2016-02-12Merge "Nova now requires an api database to be created"Jenkins1-0/+10
2016-02-12Enable heat-manage purge_deleted cron jobSteve Baker1-0/+7
Without this the heat database tables will grow without limit. Change-Id: I687e733db1a73ebc2047609a03be768093010dd4 DependsOn: Ia2b80e5003450cd794ebb0c9ca72200ec8616e81
2016-02-11Merge "Increase default Cinder LVM backing file to 10G"Jenkins1-1/+1
2016-02-10Nova now requires an api database to be createdDavid Moreau Simard1-0/+10
This enables the creation of the nova_api database that is now mandatory since https://review.openstack.org/#/c/245828/ Change-Id: Ia8242f23864ebb14ccf858a77ba754059e9c2d4a Related-Bug: #1539793