summaryrefslogtreecommitdiffstats
path: root/overcloud-without-mergepy.yaml
AgeCommit message (Collapse)AuthorFilesLines
2015-07-24Merge "NFS backend for Cinder"Jenkins1-0/+20
2015-07-23Merge "Wire in hieradata overrides via ExtraConfig for CephStorage"Jenkins1-0/+8
2015-07-23Merge "Wire in hieradata overrides via ExtraConfig for ObjectStorage"Jenkins1-0/+9
2015-07-23Merge "Convert PublicVirtualIP to new port creation method"Jenkins1-17/+12
2015-07-22Merge "Wire in hieradata overrides via ExtraConfig for BlockStorage"Jenkins1-0/+8
2015-07-22Convert PublicVirtualIP to new port creation methodDan Sneddon1-17/+12
This change brings PublicVirtualIP in line with the rest of the VIPs in how it is created. This allows the network where PublicVirtualIP is instantiated to be on cltplane when network isolation is not used, and on the external network when network isolation is used. This change removes the PublicVirtualNetwork parameter, since it is no longer used. In order to continue to support the PublicVirtualFixedIPs parameter, which is used to provide a specific IP for the PublicVirtualIP, the FixedIP parameter was added to cltplane_vip.yaml, vip.yaml, and noop.yaml. The value of PublicVirtualIP is passed to FixedIP in the VIP templates. This change also moves the default network for keystone public api to the external net (which will fallback to ctlplane if network isolation isn't used). Change-Id: I3f5d35cbe55d3a148e95cf49dfbaad4874df960b
2015-07-17Merge "Increase default max_connections for MySQL from 1024 to 4096"Jenkins1-1/+1
2015-07-16Wire in hieradata overrides via ExtraConfig for CephStorageSteven Hardy1-0/+8
Adds support for global (ExtraConfig) and role-specific (CephStorageExtraConfig) hiera overrides, similar to those added for the Controller, NovaCompute, BlockStorage, ObjectStorage roles. Change-Id: Idbe73b86a772491cd3c55ba69b5a95cc291d2598
2015-07-16Wire in hieradata overrides via ExtraConfig for ObjectStorageSteven Hardy1-0/+9
Adds support for global (ExtraConfig) and role-specific (ObjectStorageExtraConfig) hiera overrides, similar to those added for the Controller, NovaCompute and BlockStorage roles. Change-Id: I7dd0d8003017e2738366983cb5d8e08b3f3fa334
2015-07-16Wire in hieradata overrides via ExtraConfig for BlockStorageSteven Hardy1-0/+8
Adds support for global (ExtraConfig) and role-specific (BlockStorageExtraConfig) hiera overrides, similar to those added for the Controller and NovaCompute roles. Change-Id: Iaf9665b53407e6a657f56d6516469f2c88bafbdd
2015-07-16Increase default max_connections for MySQL from 1024 to 4096Giulio Fidente1-1/+1
As a matter of fact it seems that the 1024 connections barrier can easily be reached with modern hardware, see: https://bugzilla.redhat.com/show_bug.cgi?id=1240824 Change-Id: I194a0dd725907350ca16ea3c41f3ed4f68a11bcf
2015-07-15Enable hieradata ExtraConfig overrides for ControllerSteven Hardy1-34/+3
Wires in the ControllerExtraConfig and ExtraConfig parameters so that they may be used to specify overrides of the default hieradata. Note if this is used to override values specified via parameters rather than hard-coded values in puppet/hieradata caution should be used as the overridden values will always take precendence regardless of the parameter input, unless the parameter is provided directly to the Deployment resource applying the manifiest (e.g not the pattern currently employed in most of t-h-t) Also note that ControllerExtraConfig takes precedence over the deployment-wide ExtraConfig. For example, here's how you would pass a value which disables the heat-api-cfn service on all controllers. This would be put into an environment file, then passed to the heat stack-create via an extra -e option: parameters: controllerExtraConfig: heat::api_cfn::enabled: false Note the parameter capitalization is different in the top-level overcloud-without-mergepy template for some reason. Change-Id: I6d6e3e78460308134d95c01892bb242aba70e9ca
2015-07-15Merge "Adds the NeutronTunnelIdRanges and NeutronVniRanges parameters"Jenkins1-0/+12
2015-07-15Merge "Allow a user to disable MongoDB journaling"Jenkins1-0/+5
2015-07-13Merge "Output internal API VIPs"Jenkins1-0/+27
2015-07-13Adds the NeutronTunnelIdRanges and NeutronVniRanges parametersmarios1-0/+12
This adds the NeutronTunnelIdRanges and NeutronVniRanges parameters which govern the GRE or VXLAN tunnel IDs (respectively) that are to be made available for overcloud tenant networks. These both default to "1:1000," to retain the current behaviour. They are propagated to the hiera data for puppet deploys and there is a separate change to support passing these into the config via the neutron tripleo-image-element at https://review.openstack.org/#/c/199592/ Change-Id: I967a8cae218a31e888abc438e9de5756ae627adb Related-Bug: https://bugzilla.redhat.com/show_bug.cgi?id=1240631
2015-07-13Allow a user to disable MongoDB journalingYanis Guenane1-0/+5
By default MongoDB enables a journaling system that prevents loss of data in case of an unexpected shut-down. When journaling is enabled, MongoDB will create the journal files before actually starting the daemon[1]. The journaling feature is useful in production environment, but not really on a CI-like system, where we only want to make sure MongoDB is setup correctly and running, hence here we allow a user to enable/disable MongoDB journaling. [1] http://docs.mongodb.org/manual/core/journaling/ Change-Id: I0e4e65af9f650c10fdf5155ff709b4eb984cf4e1 Closes-bug: #1468246
2015-07-10Allow configuration of MySQL max_connections settingGiulio Fidente1-0/+5
The number of connections created to the database depends on the number of running processes and this is a factor of both the nodes count and the cores count. We make it configurable so it can be increased when needed. Change-Id: I41d511bde95d0942706bf7c28cd913498ea165fb
2015-07-10Merge "Add services to ServiceNetMap to select hostnames resolution network"Jenkins1-0/+5
2015-07-09Adds the NeutronDhcpAgentsPerNetwork parametermarios1-0/+5
Currently for both puppet and image-elements based deploys we set the dhcp_agents_per_network in neutron.conf to 2 and there is no control over that number (in the hieradata for the former and the image element for the latter). This change adds the NeutronDhcpAgentsPerNetwork parameter and also changes the default to 3 when not explicitly set. In the puppet case propagate this parameter in the hieradata for the neutron class and in the non-puppet case expose a new item in the neutron config to be consumed by the neutron image element (that change will point here) Change-Id: Id97c7796db7231b636f2001e28412452cf89562b
2015-07-09Merge "Add RemovalPolicies param for resource groups"Jenkins1-0/+38
2015-07-08Merge "Add NeutronExternalNetworkBridge parameter"Jenkins1-0/+5
2015-07-08Add services to ServiceNetMap to select hostnames resolution networkGiulio Fidente1-0/+5
The *HostnameResolveNetwork services define the network against which the hostnames in /etc/hosts should be resolved, defaults to 'internal_api' for all except CephStorage for which it uses 'storage' as they do not have connectivity to 'internal_api'. Closes-Bug: 1471179 Change-Id: Ia8971f8a63016966236e7975ac2d97921a314255
2015-07-08Add RemovalPolicies param for resource groupsJan Provaznik1-0/+38
This allows to specify particular nodes when scaling down number of nodes in a resource group. Change-Id: Idc3682ed430f351d533b990b44e8038866434e42
2015-07-08Output internal API VIPsJiri Stransky1-0/+27
Seeding of overcloud keystone endpoints is currently done via a script that is external to the overcloud heat stack. Previously the script didn't have a way to figure out what are the IP addresses that it should use for internal service endpoints. This patch adds those IP addresses into the stack outputs so that the script can properly configure internal endpoints. Change-Id: I9ae4fc4413a79d6b7e2dce1571fd7083c23348ca
2015-07-07NFS backend for CinderJiri Stransky1-0/+20
Adds support for NFS backend for Cinder, but remains disabled by default. Change-Id: I9ebef072ed115efe980fa4904ea80f02384522af
2015-07-06Add NeutronExternalNetworkBridge parameterDan Prince1-0/+5
This patch adds a new parameter to configure the neutron external network bridge. This setting applies to the bridge used in the Neutron l3_agent.ini file and can by useful if you wish to set external_network_bridge = '' in that file. As part of this fix we also update the environment file for network isolation so that we automatically set the new NeutronExternalNetworkBridge to an empty string. This fixes an issue where overcloud floating IPs did not work correctly when using the external network interface for floating IP traffic. Change-Id: I3bfcda8746780ea0851d88ed6db8557e261cef0d
2015-07-01Allow to enable fencing, pass through fencing configJiri Stransky1-0/+38
Add two new parameters: EnableFencing and FencingConfig. FencingConfig is a json with an expected structure documented in the templates. It gets passed further to puppet-tripleo, which configures the fencing devices. Fencing is configured and enabled in the last step after all pacemaker resources and constraints have been created, which should be a more stable approach than the other way round. Change-Id: Ifd432bfd2443b6d13e7efa006d4120bb0eaa2554 Depends-On: I819fc8c126ec47cd207c59b3dcf92ff699649c5a Depends-On: I8b7adff6f05f864115071c51810b41efad887584
2015-06-24Merge "Make puppet-applying *Post resources depend on hieradata"Jenkins1-0/+6
2015-06-21Add support for isolating block storage netsDan Prince1-1/+6
This patch updates the cinder block storage role for Puppet so that it supports network isolation. This includes using the (optional) isolated networks for MySQL, Glance API, and iscsi network traffic. Change-Id: Icdfbf5fce7380e6049babca0cd50ca2e4008c1b0
2015-06-18Merge "Rename ServiceNetMap: NeutronLocalIp"Jenkins1-1/+1
2015-06-18Merge "Remove DefaultSignalTransport from top-level template"Jenkins1-6/+0
2015-06-18Merge "Remove NO_SIGNAL from ControllerClusterConfig"Jenkins1-1/+1
2015-06-18Merge "Remove NO_SIGNAL from Controller|ObjectSwiftDeployment"Jenkins1-2/+0
2015-06-18Merge "Remove NO_SIGNAL from ControllerBootstrapNodeDeployment"Jenkins1-1/+0
2015-06-17Merge "Remove Redis VirtualIP from params and build it from Neutron::Port"Jenkins1-5/+11
2015-06-17Merge "Allow control of hostname formatting"Jenkins1-1/+53
2015-06-17Merge "Remove unused EnablePacemaker param from templates"Jenkins1-6/+0
2015-06-17Allow control of hostname formattingSteven Hardy1-1/+53
Currently, we use the heat default server names, which results in some fairly unreadable hostnames due to the level of nesting in the templates. e.g ov-sszdbj5rdne-0-bhseh65edxv6-Controller-zoqc6tlypbdp Instead, we allow the user to specify a format string per role, defaulted to a string which formats the name e.g <stackname>-controller-<index> e.g overcloud-controller-0 Optionally additional hostname components (not replaced by heat) could be added, such that deployment time customization of hostnames via firstboot scripts (e.g cloud-init) may be possible. Should anyone wish to maintain the old heat-generated names, they can pass an empty string via these parameters, which heat will treat as if no "name" property was provided to OS::Nova::Server. Change-Id: I1730caa0c2256f970da22ab21fa3aa1549b3f90b
2015-06-16Make puppet-applying *Post resources depend on hieradataSteven Hardy1-0/+6
When you do a stack-update which affects, e.g ControllerDeployment such that some value in hieradata is updated (for example changing the "Debug" parameter to True), we only write the hieradata file and don't reapply the manifests. So we introduce a dependency on the deploy_stdout values from all hieradata applying configs, such that the manifests will be re-applied on update if the data is changed. This requires https://review.openstack.org/#/c/190282/ so that 99-refresh-completed will return the derived config ID as part of the deploy_stdout payload. Closes-Bug: #1463092 Change-Id: I1175248c3236d0c42e37d062afce550efce8aadc
2015-06-16Merge "Add support for isolating swift storage nets"Jenkins1-0/+1
2015-06-13Remove Redis VirtualIP from params and build it from Neutron::PortGiulio Fidente1-5/+11
The redis_vip should come from a Neutron Port as its cidr depends on the Neutron Network configuration. This change adds 2 new files and modifies 1 in the network/ports directory: - noop.yaml - Passes through the ctlplane Controller IP (modified) - ctlplane_vip.yaml - Creates a new VIP on the control plane - vip.yaml - Creates a VIP on the named network (for isolated nets) Also, changes to overcloud-without-mergepy.yaml create the Redis Virtual IP. The standard resource registry was modified to use noop.yaml for the new Redis VIP. The Puppet resource registry was modified to use ctlplane_vip.yaml by default, but can be made to use vip.yaml when network isolation is used by using an environment file. vip.yaml will place the VIP according to the ServiceNetMap, which can also be overridden. We use this new VIP port definition to assign a VIP to Redis, but follow-up patches will assign VIPs to the rest of the services in a similar fashion. Co-Authored-By: Dan Sneddon <dsneddon@redhat.com> Change-Id: I2cb44ea7a057c4064d0e1999702623618ee3390c
2015-06-10Rename ServiceNetMap: NeutronLocalIpDan Prince1-1/+1
This patch renames the NeutronLocalIp option to be called NeutronTenantNetwork. This is more consistent with all of the other ServiceNetMap settings which end in 'Network' and initial end user feedback found the old name a bit cryptic as well. This is the network for neutron tenant traffic so lets just name it that. Change-Id: Id49afe75c372887453413c092190a5775aa3e1ee
2015-06-10Isolate network traffic for Nova VNC proxyDan Prince1-0/+1
This patch makes it possible to configure the isolated network for the Nova vnc proxy client. Change-Id: I462dfaea94e5fe9cb260ba91a42433a250f07984
2015-06-10Add support for isolating swift storage netsDan Prince1-0/+1
This patch updates the Puppet Swift storage role so that it supports network isolation. By default all traffic still flows on the ctlplane network but if network isolation is enabled then network traffic will flow over the configured storage_mgmt network interface. This patch also fixes a few critical issues with the swift storage role that prevented it from working: - oac_data for the swift devices was overriding the data provided in the swift_devices_and_proxy hieradata file. - the role was missing declarations to load hieradata files for swift_devices_and_proxy and all_nodes - The required snmpd settings were not getting set correctly in the 'object' hiera data file. With all of these changes the Swift storage role works correctly with and without network isolation. Change-Id: I541abb2604380f603bba91ad88e54783ee450a8f
2015-06-09Merge "Add Redis as a Pacemaker resource"Jenkins1-0/+4
2015-06-08Config & deployments to update overcloud packagesSteve Baker1-0/+13
This change adds config and deployment resources to trigger package updates on nodes. The deployments are triggered by doing a stack-update and setting one of the parameters to a unique value. The intent is that rolling update will be controlled by setting breakpoints on all of the UpdateDeployment resources inside the role resource groups. Change-Id: I56bbf944ecd6cbdbf116021b8a53f9f9111c134f
2015-06-05Add Redis as a Pacemaker resourceYanis Guenane1-0/+4
Change-Id: I731b408f24da01c1bc897bfffe8fd4d5638932ed
2015-06-05Merge "Wire Neutron VLAN ranges param as array to puppet"Jenkins1-1/+1
2015-06-05Wire Neutron VLAN ranges param as array to puppetGiulio Fidente1-1/+1
Turns NeutronNetworkVLANRanges into a list and makes it consumable by neutron::plugins::ml2::network_vlan_ranges as an array. Previously usage of vlans was impossible due to puppet-neutron failing to join() network_vlan_ranges. Also fixes wiring of network_vlan_ranges on computes and adds a sample environment file to test use of vlans for tenant networks. Change-Id: I8725cdb9591dd8d0b7125fdacbefdc9138703266