summaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2015-07-24Merge "Set default external port to noop for puppet"Jenkins1-1/+1
2015-07-24Merge "Use 'public' instead of 'nova' as default floating pool name"Jenkins4-0/+9
2015-07-23Set default external port to noop for puppetDan Prince1-1/+1
In 9b89dd20162d962480d3cb84161ed6bfd4fa9de8 we had a regression where the default "external" traffic port was set to a VIP when using puppet. We should not ever specify a VIP to be used for the actual machine IPs (VIPs are only guaranteed to work once the load balancer is running). Also, This doesn't match the non-puppet case. Change-Id: Icd179a70001f2bd7a97e31c7f6445001330674cd
2015-07-23Merge "Wire in hieradata overrides via ExtraConfig for CephStorage"Jenkins3-0/+38
2015-07-23Merge "Wire in hieradata overrides via ExtraConfig for ObjectStorage"Jenkins3-0/+32
2015-07-23Merge "Convert PublicVirtualIP to new port creation method"Jenkins6-24/+48
2015-07-23Use 'public' instead of 'nova' as default floating pool nameGiulio Fidente4-0/+9
The dafault in nova.conf for default_floating_pool is set to nova which is confusing given to make Tempest tests to pass one has to create a public network with such a name. Change-Id: I148222a9f276309ede062ee5292993898ff899d6
2015-07-23Merge "Provide list of memcached servers to Nova"Jenkins2-2/+6
2015-07-22Merge "Wire in hieradata overrides via ExtraConfig for BlockStorage"Jenkins3-34/+26
2015-07-22Merge "Wire in hieradata overrides via ExtraConfig for NovaCompute"Jenkins1-34/+8
2015-07-22Convert PublicVirtualIP to new port creation methodDan Sneddon6-24/+48
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-22Provide list of memcached servers to NovaGiulio Fidente2-2/+6
Memcached is used by novnc to share the auth tokens. Change-Id: I18415b6ae38b46e3c92e4ce84b858a014ef8398b
2015-07-21Increase default start timeout for Pacemaker from 20s to 90sGiulio Fidente1-5/+12
On slow environments the start operation of some services can take longer than 20s so we increase the default for start operation to 90s, more info can be found at: https://bugzilla.redhat.com/show_bug.cgi?id=1242052 Systemd defaults to 90s as well. Change-Id: Ie4652bad518075be77937d47830f263034eda79c
2015-07-21Merge "Puppet: wire in tripleo::packages"Jenkins12-75/+12
2015-07-21Merge "Fix Puppet Configuring NetApp Cinder Backend"Jenkins4-10/+48
2015-07-20Puppet: wire in tripleo::packagesDan Prince12-75/+12
This wires in use of a new puppet-tripleo class which encapsulates the logic to enable/disable package installation and upgrades. By using the new class we can remove the global Package provider declaration at the top of each module. Change-Id: I5c6e5fd8600031bd8fb6195649721607c560f9d5 Depends-on: Ie8fbc344149bc8c9977e127de77636903607617a
2015-07-20Fix Puppet Configuring NetApp Cinder BackendRyan Hefner4-10/+48
It was incorrectly assumed that Puppet variables assigned to a defined class (as seen in cinder-netapp.yaml) would be applied to any resources created with that type. This is not how Puppet works. The full range of configuration parameters to cinder::backend::netapp have been added back in. They are still pulling from Hiera like they were intended before, but it needs to be a little more explicit for Puppet to be happy. Change-Id: I2e00eae829713b2dbb1e4a5f296b6d08d0c21100
2015-07-20Merge "Ensure compute nodes use internalURL as catalog_info"Jenkins2-0/+5
2015-07-20Merge "Allow overlapping IPs in Neutron"Jenkins1-0/+1
2015-07-19Merge "Ensure CinderStorage nodes use internalURL as catalog_info"Jenkins2-0/+7
2015-07-19Merge "Use parameter_defaults in env files"Jenkins2-2/+10
2015-07-17Allow overlapping IPs in NeutronJiri Stransky1-0/+1
Change-Id: I7703013b62bd67869c268fb8689389ec0eeb5aad
2015-07-17Merge "Increase default max_connections for MySQL from 1024 to 4096"Jenkins3-3/+3
2015-07-17Merge "Enable hieradata ExtraConfig overrides for Controller"Jenkins2-70/+12
2015-07-17Ensure CinderStorage nodes use internalURL as catalog_infoGiulio Fidente2-0/+7
By default Cinder will get the publicURL for Nova and Swift, which is not reachable by the CinderStorage nodes. Change-Id: I25b7900c9ab261e0f706257ffdf6844533b63b94
2015-07-17Ensure compute nodes use internalURL as catalog_infoGiulio Fidente2-0/+5
By default Nova will get the publicURL instead, which is not reachable by the compute nodes. Change-Id: I57b6a7a7eddb0ffaf6d2d152d932f390c48f908e
2015-07-16Wire in hieradata overrides via ExtraConfig for CephStorageSteven Hardy3-0/+38
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 Hardy3-0/+32
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 Hardy3-34/+26
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-16Wire in hieradata overrides via ExtraConfig for NovaComputeSteven Hardy1-34/+8
Adds support for global (ExtraConfig) and role-specific (NovaComputeExtraConfig) hiera overrides, similar to those added for the controller. For example, you can pass an environment file like: parameters: NovaComputeExtraConfig: nova::scheduler::filter::ram_allocation_ratio: 1.8 compute_classes: - ::nova::scheduler::filter This passes a hiera value for ram_allocation_ratio and enables a class via the include added in https://review.openstack.org/#/c/197908/ Note this also requires https://review.openstack.org/#/c/188772/ or 40-hiera-datafiles incorrectly quotes the list and the compute_classes part won't work. Change-Id: Ic33eed1b5e9c33c0d2f6075c65c8d9649b82c8b4
2015-07-16Merge "Provide manage_service to neutron::agents::ml2::ovs"Jenkins1-1/+1
2015-07-16Increase default max_connections for MySQL from 1024 to 4096Giulio Fidente3-3/+3
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 Hardy2-70/+12
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"Jenkins6-5/+133
2015-07-15Merge "Configure Heat's ec2 auth uri correctly"Jenkins1-0/+7
2015-07-15Merge "Allow a user to disable MongoDB journaling"Jenkins5-0/+24
2015-07-15Merge "Removes the NeutronScale resource from controller pcmk manifest"Jenkins1-22/+2
2015-07-14Merge "neutron-server: Remove start/sleep/stop pattern"Jenkins1-6/+1
2015-07-13neutron-server: Remove start/sleep/stop patternYanis Guenane1-6/+1
Currently the bootstrap of the neutron server happens with the use of a start/sleep/stop pattern. Since Pacemaker doesn't mind if the service is already started let simply start the neutron server on the $pacemaker_master node and wait for 5 sec. Change-Id: I894dc3305f7d6685ebcc6828e690c718a63f32bd Closes-Bug: #1473410
2015-07-13Provide manage_service to neutron::agents::ml2::ovsGiulio Fidente1-1/+1
Change-Id: Ib945b07dd93f9bdc613f464211745094c4c72836
2015-07-13Merge "Output internal API VIPs"Jenkins1-0/+27
2015-07-13Adds the NeutronTunnelIdRanges and NeutronVniRanges parametersmarios6-5/+133
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 Guenane5-0/+24
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 Fidente5-2/+17
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"Jenkins6-8/+16
2015-07-09Use parameter_defaults in env filesJames Slagle2-2/+10
Switch to using parameter_defaults in environment files instead of a parameters section. Using a parameters section to set top level parameters breaks Tuskar based deployments because Tuskar prefixes the name of the top level parameters with a role name and version, thus changing the name of the parameter. When the environment file is then used to set a top level parameter, Heat fails with an error during template validation: ERROR: The Parameter (NeutronExternalNetworkBridge) was not defined in template Change-Id: I605651a8ebdbd0b2baf7bcea198c2988efb55f31
2015-07-09Adds the NeutronDhcpAgentsPerNetwork parametermarios4-1/+17
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"Jenkins5-0/+27
2015-07-08Add services to ServiceNetMap to select hostnames resolution networkGiulio Fidente6-8/+16
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