aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2015-08-06Support network isolation without external netsDan Prince6-0/+288
This patch adds extra heat environments that can be used to enable network isolation without using the external network. Instead of a separate external network the ctlplane will be used for all of the external/public traffic. Change-Id: Ia542cee02121771d7d57ac701b62d7608e8d1855
2015-07-06Add NeutronExternalNetworkBridge parameterDan Prince5-0/+27
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-01Merge "Add a default route to the external isolated network"Jenkins2-4/+20
2015-07-01Merge "Remove bridge from nic1 in network bond templates"Jenkins5-51/+1
2015-07-01Merge "Add special handling of neutron-server service startup to fix race"Jenkins1-0/+10
2015-07-01Merge "Include Redis VIP in example environment"Jenkins1-0/+3
2015-06-29Add a default route to the external isolated networkDan Sneddon2-4/+20
This change adds a parameter for ExternalInterfaceDefaultRoute and uses that parameter to set the default route on the controller nodes. This allows Horizon and the public APIs to be reachable from routed networks outside the overcloud. Co-Authored-By: Dan Prince <dprince@redhat.com> Change-Id: I67a72767342237049f53f5085a6faf891fbf0c30
2015-06-29Merge "Drop swift ceilometer middleware."Jenkins2-2/+0
2015-06-27Remove bridge from nic1 in network bond templatesDan Sneddon5-51/+1
The bridge that is built on the bonds in the bond-with-vlans example has an extraneous bridge on the storage and compute templates, and an incorrect bridge on the controller template. There is no reason to do anything on nic1, which is assumed to be the provisioning interface, because it will be configured by DHCP. Also, on the controller template we actually want br-ex to contain the VLAN with the external network, rather than be configured on the provisioning interface. Change-Id: Ibe2343d5281f7b63a7b63b17d96d8442d0b96105
2015-06-26Merge "Add missing Pacemaker constraint against Keystone"Jenkins1-9/+18
2015-06-26Merge "Set MariaDB package name in RedHat.yaml"Jenkins3-1/+9
2015-06-26Merge "Enable mysql_clustercheck for Pacemaker scenario"Jenkins1-0/+1
2015-06-26Merge "Increase mongodb_conn_validator timeout to 600"Jenkins1-0/+1
2015-06-25Include Redis VIP in example environmentDan Sneddon1-0/+3
The network isolation code in the TripleO Heat templates has files in the environment folder that can be included to enable network isolation. This updates the environment file to include the VIP for Redis. Change-Id: Ic05720c565d9ecf76bf7485b969cb2d9ead9fd6f
2015-06-25Add missing Pacemaker constraint against KeystoneGiulio Fidente1-9/+18
The Heat contraints group was missing the initial dependency on Keystone, causing Pacemaker to Heat before or in parallel to Keystone. Given Systemd can define dependencies in the unit files, this was additionally causing an unmanaged start of Keystone making cluster initialization to fail (with Keystone start timeout blocking all the depending resources). Also moves Keystone -> Ceilomter constraint on top of Ceilometer constraints group for clarity. Logs and more infos at [1] 1. https://bugzilla.redhat.com/show_bug.cgi?id=1235703 Change-Id: I9505fd46c5bf278afc8ff919c7e768e2de194cb8
2015-06-25Merge "Ensure mysql/mariadb service is not enabled on boot"Jenkins1-0/+1
2015-06-25Merge "Do not set explicitly galera_master to any of the nodes"Jenkins1-4/+1
2015-06-25Enable mysql_clustercheck for Pacemaker scenarioGiulio Fidente1-0/+1
Change-Id: I154c90e6d019807758332e3aefe5dde9d79db6ac Related-Bug: 1456701 Depends-On: I7199c7e5d759a76f58c0f48b40e9d460a3163886
2015-06-25Ensure mysql/mariadb service is not enabled on bootGiulio Fidente1-0/+1
Change-Id: I42462a6de2bf70ef71899833c3f27633f0f59493 Closes-Bug: 1468549 Closes-Bug: https://bugzilla.redhat.com/show_bug.cgi?id=1235454
2015-06-24Set MariaDB package name in RedHat.yamlDan Prince3-1/+9
This moves the hard coded package name for mariadb into the RedHat specific hieradata file. This was recently added to controller.yaml in a1b3fa3e84185b6969a8acfda475fe7fc48bd5a1. Also, resolves an issue where RedHat.yaml wasn't actually getting deployed. This is something that should have happened in 5009cc64322e9fb5723799eb9fbd79076a2dc5da. Change-Id: Iaa30be3c53a7c54d31d47b997966b0106a202ea4
2015-06-24Merge "Make puppet-applying *Post resources depend on hieradata"Jenkins21-0/+87
2015-06-24Increase mongodb_conn_validator timeout to 600Giulio Fidente1-0/+1
This will increase the mongodb_conn_validator timeout from 60 secs (the default) to 600 secs; it should take much less in normal circumstances to start mongod but nodes might not be starting it all at the same time so we use a larger timeframe for the availablity checks. Change-Id: I0ee210be94b33d1c08d67f287aa745743a6649d3
2015-06-24Do not set explicitly galera_master to any of the nodesGiulio Fidente1-4/+1
We will manage nodes membership using the clustercheck script and marking all backends as backup, see change: I7199c7e5d759a76f58c0f48b40e9d460a3163886 Related-Bug: 1467918 Change-Id: I56ebd2d8405ac35c707666d993b396f04aeb683e
2015-06-23Add special handling of neutron-server service startup to fix raceGiulio Fidente1-0/+10
Neutron will populate the database with some data as soon as the neutron-server service is started; we want this to happen from a single node before normal Pacemaker initialization. Change-Id: I422972502fbb10ddae3201464bbd6885749de31e Closes-Bug: 1467904 Closes-Bug: https://bugzilla.redhat.com/show_bug.cgi?id=1233061
2015-06-23Merge "Specify mariadb package name to meet puppetlabs-mysql requirement"Jenkins1-0/+1
2015-06-23Merge "Leave control of Redis balancing in static hieradata"Jenkins1-1/+0
2015-06-23Merge "Add support for isolating block storage nets"Jenkins4-5/+57
2015-06-22Merge "Fix MongoDB connection url configuration in Ceilometer"Jenkins1-6/+7
2015-06-22Merge "Use SoftwareDeployments for consistency in extraconfig"Jenkins2-3/+3
2015-06-22Fix MongoDB connection url configuration in CeilometerGiulio Fidente1-6/+7
Change-Id: I8a56e7b067044bace5def63ea6170ed817f48acd Closes-Bug: 1467437 Closes-Bug: https://bugzilla.redhat.com/show_bug.cgi?id=1233283
2015-06-22Merge "Enable httpd balancing for Horizon"Jenkins3-3/+8
2015-06-21Add support for isolating block storage netsDan Prince4-5/+57
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-21Drop swift ceilometer middleware.Dan Prince2-2/+0
Per Ceilometer commit 191f7bf9ccee33d8444f7dac5c09ceccce72ca29 (change ID: Ifd1861e3df46fad0e44ff9b5cbd58711bbc87c97) the Swift Ceilometer middleware no longer exists so we need to drop it in order to work with the latest upstream package. Change-Id: Iebaad0ba477001d663c6875b32d691bbfcda3d8d
2015-06-19Leave control of Redis balancing in static hieradataGiulio Fidente1-1/+0
Redis balancing is controlled by static hieradata [1] we don't need to override it into manifest. 1. https://github.com/openstack/tripleo-heat-templates/blob/master/puppet/hieradata/controller.yaml#L111 Change-Id: Ie2a5a4cbee0a55f2572f182b18c036efc299dbef
2015-06-18Merge "Enable loadbalancing of the Redis VIP, defaults to False"Jenkins4-6/+8
2015-06-18Merge "Fix grammar nits in bond-with-vlans templates"Jenkins5-5/+5
2015-06-18Merge "Rename ServiceNetMap: NeutronLocalIp"Jenkins3-3/+3
2015-06-18Enable httpd balancing for HorizonGiulio Fidente3-3/+8
We need to customize the default apache::ip param or the default vhost configured will listen on ::80 Change-Id: I195a083f727da940841beb3a0c37dade02c6d1ca
2015-06-18Use SoftwareDeployments for consistency in extraconfigSteven Hardy2-3/+3
Currently we've got a mix of SoftwareConfig resource with StructuredDeployments resources - while this will work it's inconsistent and normally using the corresponding SoftwareDeployments resouce is encourgaged instead. Change-Id: I308d62d4ff491c073e3e8650fd4c2c65bf96d14a
2015-06-18Enable loadbalancing of the Redis VIP, defaults to Falsemarios4-6/+8
We have to set it to true as the default is false which means the redis vip can't be reached. This was manifested as a problem with ceilometer agent reaching the coordination url like [1]. Co-Authored-By: Giulio Fidente <gfidente@redhat.com> [1] https://bugzilla.redhat.com/attachment.cgi?id=1040023 Closes-Bug: https://bugzilla.redhat.com/show_bug.cgi?id=1232797 Change-Id: I1cd63308d0ac1d17542e1a2a909ee1a9680ed4b3
2015-06-18Bind novncproxy to its own networkBen Nemec1-0/+1
By default the nova vncproxy binds to 0.0.0.0, which will fail in a loadbalanced environment. This makes it bind to its network. Change-Id: I08776a8f6c72b63d73433b147c130fbc9a7110b0
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"Jenkins3-1/+2
2015-06-17Merge "Remove Redis VirtualIP from params and build it from Neutron::Port"Jenkins7-7/+116
2015-06-17Merge "Fix allocation pool in external.yaml"Jenkins1-1/+1
2015-06-17Merge "Make CephStorageDeployment depend on NetworkDeployment"Jenkins1-0/+1
2015-06-17Merge "Remove NO_SIGNAL from puppet role templates"Jenkins4-6/+4
2015-06-17Merge "Adds horizon to pacemaker when puppet-pacemaker is enabled"Jenkins2-1/+13