aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2015-09-07Don't add 'host' parameter to cinder.confDerek Higgins2-8/+0
As of I54a75652efd5e91464b84adf84004400b343c3a5 for rdb this is being done by the cinder puppet module. Change-Id: I109e139fcbb859a0d9ed99054656be94975d33b5
2015-09-05Set default KeystoneAdminApiNetwork to ctlplaneDan Prince1-1/+1
Moves the default KeystoneAdminApiNetwork setting to the ctlplane so that the undercloud will always have easy access to be able to configure endpoints. Change-Id: I1f6aba62b98820b678cce1ca16e72a0c3d045720
2015-09-05Keystone network isolation fixesDan Prince5-8/+25
This patch adds explicit nested stack parameters to help manage use of the Keystone Admin API vs. the Keystone Public API. We also add a new output parameter specifically for the Keystone admin API VIP. This can be useful when configuring keystone endpoints with network isolation. Change-Id: I2bd3e61570151e2faeee14ee09b03ad0b3208cc1
2015-09-05Merge "Support for using external Ceph clusters"Jenkins7-10/+143
2015-09-05Allow 'ctlplane' to be used within Net IP MapsDan Prince11-13/+75
When using network isolation you might want to selective move one of the services back to the default ctlplane network by simply using the ServiceNetMap parameter. This patch adds ctlplane to the output parameters for both the net_ip_map and net_ip_list_map nested stacks so that this is possible. As part of this patch we also split out the NetIpSubnetMap into its own unique nested stack so that the Heat input parameters for this stack are more clearly named. Change-Id: Iaa2dcaebeac896404e87ec0c635688b2a59a9e0f
2015-08-31Merge "Enable Keystone notifications"Jenkins5-0/+42
2015-08-18Merge "Wire in Compute pre-deployment extraconfig"Jenkins2-1/+13
2015-08-18Enable Keystone notificationsGiulio Fidente5-0/+42
This change enables Keystone notifications and adds two parameters to control the notification driver and format. Change-Id: I23ac3c46ee9eb49523d3b8dab027ef21fc6e42df
2015-08-17Remove hardcoded bridge name in bonded compute NIC configDan Sneddon1-1/+1
This change removes a hardcoded value for the bond name in the NIC config for the compute node in the bond-with-vlan NIC config templates. When this hardcoded value of "br-bond" is used, then the Neutron bridge mappings must be set to set to datacentre:br-bond in order for VLAN mode networking to recognize the bridge. By using the input value for bridge_name we will ensure that the controller and compute nodes have the same bridge name (defaults to "br-ex"), and that the defaults will work with VLAN mode. Change-Id: I28654ab93e3c10a8597c8b877f3f2f6b3eca887c
2015-08-13Support for using external Ceph clustersDan Prince7-10/+143
This patch adds support for using an externally managed Ceph cluster with the TripleO Heat templates. For an externally managed Ceph cluster we initially only deploy the Ceph client tools, install the 'openstack' user keyring, and generate the ceph.conf. This matches what we do for managed Ceph installations and is a good first start. No other Ceph related services are installed or managed. To enable use of a Ceph external cluster simply add the custom Heat environment file environments/puppet-ceph-external.yaml to your heat stack create/update command and make sure to set the required CephClientKey, CephExternalMonHost, and CephClusterFSID variables. Change-Id: I0a8b213ce9dfa2fc4e62ae1e7631466e5179fc2b
2015-08-06Merge "Drive DB initialization via Hiera"Jenkins4-102/+75
2015-08-06Merge "Add a default setting for BondInterfaceOvsOptions"Jenkins1-1/+2
2015-08-03Wire in Compute pre-deployment extraconfigShiva Prasad Rao2-1/+13
This commit provides a way to configure some additional hieradata for compute nodes. This is similar to the earlier added infra for supporting Controller pre-deployment extraconfig. Change-Id: I02dda0685c7df9013693db5eeacb2f47745d05b5
2015-07-30Provide a sample storage environment fileJiri Stransky1-0/+57
Meant to help users configure their storage parameters by copying this file out, amending it and passing it to `heat stack-create` or `openstack overcloud deploy`. Defaults to using Ceph as a backend for Cinder, Glance and also Nova ephemeral storage. Change-Id: Ia8f5ef175439394aacdea98cfd66416bcb9bfe3a
2015-07-29Merge "RHEL registration shouldn't use attach with activation key"Jenkins1-1/+1
2015-07-28Merge "Keystone token flushing"Jenkins3-0/+9
2015-07-24Merge "Set rabbitmq heatbeat timeout threshold to 60"Jenkins1-0/+6
2015-07-24Add a default setting for BondInterfaceOvsOptionsDan Sneddon1-1/+2
This change adds a default setting for the OVS bond options to the bond-with-vlans controller.yaml. This default will attempt to bring up LACP bonding, but should that fail it will bring up the bond in active/backup mode. This is a safe configuration if the switch is not configured for bonding. Change-Id: I91aad1e061ed1ecf26636e60da7a9a6e9cde50a5
2015-07-24Merge "Ensure SELinux is permissive on Ceph OSDs"Jenkins4-2/+46
2015-07-24Merge "Set heat::instance_user to empty string"Jenkins2-1/+1
2015-07-24Keystone token flushingJiri Stransky3-0/+9
Set up a cron job to flush keystone tokens periodically. The job runs once a day near midnight per puppet-keystone defaults, and we pass maxdelay 3600 which means each controller will wait a random delay of up to 1 hour before running the task. Change-Id: I351f0273c61106c182aa3945b7ad1ce8f5c7d12b
2015-07-24Merge "NFS backend for Cinder"Jenkins8-2/+124
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-21Drive DB initialization via HieraDan Prince4-102/+75
This patch moves most of the ::db::mysql parameter initialization into a new database.yaml Hiera file. This cleans up the controller manifests and allows us to define things in a single location across the two implementations (HA and nonHA). Change-Id: I895b753b329097a96a6c6f3a03a5fcebefe32dd4
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-18Set rabbitmq heatbeat timeout threshold to 60Dan Prince1-0/+6
Updates the default settings for Nova, Neutron, Cinder, Ceilometer, and Heat services so we set the default rabbitmq threshold to 60 seconds. Change-Id: If537ae16968eb6b264b2ab071144f1eecab18b64
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