summaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2015-06-04Merge "Wire ServiceNetMap as a top level parameter"Jenkins4-26/+39
2015-06-04Merge "Pass NeutronEnableTunnelling to controllers"Jenkins1-0/+1
2015-06-04Merge "Set VXLAN tunnels range to match GRE range"Jenkins3-4/+5
2015-06-04Merge "Wire Neutron allow_automatic_l3agent_failover param to module"Jenkins1-2/+2
2015-06-03Pass NeutronEnableTunnelling to controllersGiulio Fidente1-0/+1
We forgot to pass NeutronEnableTunnelling param to controllers (passed only to computes), making it unusable. Change-Id: I74756732deabd1c7ba9039832ea169fd322a569f
2015-06-03Set VXLAN tunnels range to match GRE rangeGiulio Fidente3-4/+5
Change-Id: I16d259055fe4cd22541cd7abd7a26c71bbbaf292
2015-06-03Merge "os-net-config templates to configure vlans"Jenkins7-0/+396
2015-06-03Merge "Reuse the undercloud service passwords as db passwords."Jenkins4-11/+11
2015-06-03Wire ServiceNetMap as a top level parameterDan Prince4-26/+39
This patch makes ServiceNetMap a top level parameter. This is helpful to tools like Tuskar which don't support Heat environments that contain both a resource_registry and default_parameters. ServiceNetMap will in fact be utilized at the top level in some of the VIP related patches that follow. Change-Id: I375063dacf5f3fc68e6df93e11c3e88f48aa3c3a
2015-06-02Wire Neutron allow_automatic_l3agent_failover param to moduleGiulio Fidente1-2/+2
Change-Id: Ibd1581ebb87ed02f3840000e90025a2a371019aa
2015-06-01os-net-config templates to configure vlansDan Prince7-0/+396
This patch adds 5 new role templates to help configure a vlans on top for each of the overcloud roles. This patch adds vlans on top of a single NIC attached to the control plane network (already used for provisioning). The patch also includes an environment file to enable configuration of vlans by simply sourcing this file. Change-Id: Ibc40e452dec9b372ff10442aab2bddaf382b0a2f
2015-06-01Merge "post-deploy hook for rhel registration"Jenkins5-0/+276
2015-06-01Merge "Neutron: Remove hiera lookup to controller_host"Jenkins1-1/+0
2015-06-01Merge "Add Heat as a Pacemaker resource"Jenkins1-8/+79
2015-06-01Merge "Add Ceilometer as a Pacemaker resource"Jenkins1-12/+149
2015-05-31Neutron: Remove hiera lookup to controller_hostYanis Guenane1-1/+0
With current effort of creating isolated networks, the controller_host hiera variable does not exist anymore. Hence we remove it else the lookup will fail. The hiera binding neutron::agents::ml2::ovs::local_ip has been written in another review[1] [1] I1dc11987b4ea3c37775b14fbdddb75588499e9bb Change-Id: I12777c512d379210e5cddb5e683be4d79808fa2c
2015-05-29Merge "Map Mysql to isolated networks"Jenkins4-6/+7
2015-05-29Merge "Use heat inputs for network port settings"Jenkins2-23/+44
2015-05-29Add Heat as a Pacemaker resourceYanis Guenane1-8/+79
Change-Id: I1c8fc6beacc8352ad2aabe44ff20614ac52c1795
2015-05-29Add Ceilometer as a Pacemaker resourceYanis Guenane1-12/+149
Change-Id: I1243b68506f37d6b78807c03948874ae100fef65
2015-05-29Add Nova as Pacemaker resourceGiulio Fidente1-12/+112
Constraints based on vncproxy are commented due to it not starting with websockify < 0.6, see [1] 1. http://lists.openstack.org/pipermail/openstack-dev/2014-October/048535.html Co-Authored-By: Jiri Stransky <jistr@redhat.com> Change-Id: Ie51014bf563920d2e75c5e38942bc42ddc2a3939
2015-05-29Adds neutron-server and agents as pacemaker resourcesmarios2-33/+171
Adds neutron-server, neutron-l3-agent, neutron-dhcp-agent, neutron-openvswitch-agent and neutron-metadata-agent as pacemaker resources. Change-Id: I4dcc6f56db4c27a2a4f627fa8303cbeb2bd563d4
2015-05-28Map Mysql to isolated networksDan Prince4-6/+7
This change adds parameters to specify which networks the MySQL service will use. If the internal_api network exists the MySQL service will bind to the IP address on that network, otherwise the services will default to the IP on the Undercloud 'ctlplane' network. This patch also drop the old 'controller_host' variable from the puppet controller template since it is no longer in use. Change-Id: I4fba2c957f7db47e916bc269fb4bd32ccc99bd4c
2015-05-28Use heat inputs for network port settingsDan Prince2-23/+44
This patch updates the controller and compute roles so that we use get_input in the software configuration instead of calling get_attr/get_param there. Change-Id: I1dc11987b4ea3c37775b14fbdddb75588499e9bb
2015-05-28Merge "Fix colocation order to match ref-arch"Jenkins1-3/+3
2015-05-28Merge "Add Memcache as a Pacemaker resource"Jenkins1-2/+9
2015-05-28Merge "Add a keystone-cinder-api constraint"Jenkins1-0/+10
2015-05-28Merge "Add keystone-glance-registry constraint"Jenkins1-0/+10
2015-05-28Merge "Use the proper parameter to set --master"Jenkins1-1/+2
2015-05-27Merge "Map Horizon, Redis, Rabbit, memcached to isolated nets"Jenkins2-4/+8
2015-05-27Merge "Map Swift services to isolated networks"Jenkins2-2/+4
2015-05-27Merge "Map Nova services to isolated networks"Jenkins2-2/+4
2015-05-27Merge "Map Heat services to isolated networks"Jenkins2-3/+6
2015-05-27Merge "Map Neutron services to isolated networks"Jenkins2-1/+2
2015-05-27Merge "Map Keystone services to isolated networks"Jenkins2-2/+4
2015-05-27Merge "Map Glance services to isolated networks"Jenkins2-3/+5
2015-05-27Fix colocation order to match ref-archYanis Guenane1-3/+3
Fixes the colocation order between glance-api and glance-registry to match the ref-arch[1] [1] https://github.com/beekhof/osp-ha-deploy/blob/master/pcmk/glance.scenario#L108 Change-Id: I40f35afedb3333d97c8b689538bb80a90a66afe8
2015-05-27Add keystone-glance-registry constraintYanis Guenane1-0/+10
Make sure the keystone service starts before the glance-registry one. Change-Id: Ia81df13682bf556a39cc36520def48105ee3e27d
2015-05-27Add a keystone-cinder-api constraintYanis Guenane1-0/+10
Make sure the keystone service starts before the cinder-api one. Change-Id: I21549c066afcf051e52fc4bba4fae2f34ad2ba4b
2015-05-27Use the proper parameter to set --masterYanis Guenane1-1/+2
The interface for pcmk_resource offers the parameter master_params to set --master during the resource creation. Change-Id: I6fa769f14a6248b371810af3ba6819a1f9ed9442
2015-05-27Add Memcache as a Pacemaker resourceYanis Guenane1-2/+9
Depends-On: I7b992450176595a89dba9fe2eccf619af2645d6b Change-Id: I30cebb6d3a8670f49587bedaf51af18a87a8d24c
2015-05-27Merge "Reuse the various service passwords as db passwords."Jenkins5-29/+66
2015-05-27Merge "Map Cinder services to isolated networks"Jenkins2-2/+4
2015-05-27Map Horizon, Redis, Rabbit, memcached to isolated netsDan Sneddon2-4/+8
This change adds parameters to select the networks for Horizon, Redis, Rabbit MQ, and memcached services. Horizon is often used for administration from outside the cloud, so if the external network exists, Horizon will bind to that IP, otherwise it will default to the Undercloud 'ctlplane' network. Redis, Rabbit MQ, and memcached will bind to IPs on the internal_api network if it exists, else they will default to the 'ctlplane' network as well. Any of these network assignments can be overridden with an environment file. Change-Id: Ie0aa46b4a3c00d3826866796b4ec3b14f71f987c
2015-05-27Merge "Map Ceilometer services to isolated networks"Jenkins2-2/+4
2015-05-27Map Swift services to isolated networksDan Sneddon2-2/+4
This change adds paramters to specify which networks the Swift API services will use. If the storage network exists, it will be used for the Swift API, otherwise the Undercloud 'ctlplane' network will be used. If the storage_mgmt network exists, it will be used for the back-end storage services, otherwise the 'ctlplane' will be used by default. Change-Id: I1d5e966a16416c52935c22efe2d4783cd2192c32
2015-05-27Map Nova services to isolated networksDan Sneddon2-2/+4
This change adds parameters to specify which networks the Nova API and metadata services will use. If the internal_api network exists, it will be used for the bind IP for Nova API and metadata servers, otherwise the Undercloud 'ctlplane' IP will be used by default. Change-Id: Ie420274c7fba80abf9cf2b599431acc47e28fc7a
2015-05-27Map Heat services to isolated networksDan Sneddon2-3/+6
This change adds parameters to specify which networks the Heat services will use. If the internal_api network exists, the Heat API, Heat Cloud Formations, and Heat Cloudwatch services will bind to the IP address on that network, otherwise the services will default to the IP on the Undercloud 'ctlplane' network. Change-Id: I5febe1b9071600b43fa76c6cf415db83cad472ab
2015-05-27Merge "Add Keystone as Pacemaker resource"Jenkins1-2/+7
2015-05-26Map Neutron services to isolated networksDan Sneddon2-1/+2
This change adds parameters to specify which network the Neutron API should use. If the internal_api network exists, Neutron will bind to the IP on that network, otherwise the Undercloud 'ctlplane' network will be used. The network that the Neutron API is bound to can be overridden in an environment file. Change-Id: I11bcebba3a22e8850095250a2ddfaf972339476b