aboutsummaryrefslogtreecommitdiffstats
path: root/puppet
AgeCommit message (Collapse)AuthorFilesLines
2015-06-03Remove NO_SIGNAL from ControllerBootstrapNodeDeploymentSteven Hardy1-0/+1
We need to be sure the boostrap node data has been propagated to the cluster before proceeding with configuration, because ControllerNodesPostDeployment consumes the data put in place by this and depends_on for serialization, which is essentially meaningless when combined with NO_SIGNAL. Change-Id: I73a1e5a2cda4c79f457bfbd9ce2836dc5c1902cc
2015-06-03Make CephStorageDeployment depend on NetworkDeploymentGiulio Fidente1-0/+1
Change-Id: I5b6454d0e09eba79fc0376e963fd0e4c64105081
2015-06-03Remove NO_SIGNAL from puppet role templatesSteven Hardy4-6/+4
Currently we use NO_SIGNAL on both the NetworkConfig and subsequent config deploying the data associated with the role. This means there is a risk that should the NetworkConfig do anything interruptive (os-net-config can do interface renaming based on discovery data for example) the role configuration config could fail, and we'd never know until some later error occurs. Additionally, we need to be sure that the heiradata deployed by each of the role specicific configs is actually in-place before proceeding with any of the cluster configuration - atm this works due to the inherent delays involved deploying to bare-metal, but there's still a theoretical race if very fast deployment backends (I'm thinking containers, e.g lxc backend to nova or something) were used instead. Essentially, we should never be using NO_SIGNAL unless we want to ignore failure, which AFAICT is not the case in this instance. Change-Id: I0dbbcc87fb8df8e6bc4775c39fa616b0d0713464
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"Jenkins3-6/+6
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 Prince3-6/+6
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"Jenkins1-4/+4
2015-05-27Merge "Map Swift services to isolated networks"Jenkins1-2/+2
2015-05-27Merge "Map Nova services to isolated networks"Jenkins1-2/+2
2015-05-27Merge "Map Heat services to isolated networks"Jenkins1-3/+3
2015-05-27Merge "Map Neutron services to isolated networks"Jenkins1-1/+1
2015-05-27Merge "Map Keystone services to isolated networks"Jenkins1-2/+2
2015-05-27Merge "Map Glance services to isolated networks"Jenkins1-3/+3
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."Jenkins2-14/+31
2015-05-27Merge "Map Cinder services to isolated networks"Jenkins1-2/+2
2015-05-27Map Horizon, Redis, Rabbit, memcached to isolated netsDan Sneddon1-4/+4
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"Jenkins1-2/+2
2015-05-27Map Swift services to isolated networksDan Sneddon1-2/+2
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 Sneddon1-2/+2
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 Sneddon1-3/+3
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 Sneddon1-1/+1
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
2015-05-26Map Keystone services to isolated networksDan Sneddon1-2/+2
This change adds parameters to specify which networks the Keystone API services will use. If the external network exists, Keystone will bind to the IP on that network for the public API, otherwise it will default to the IP on the Undercloud 'ctlplane' network. If the internal_api network exists it will be used for the Keystone Admin API, otherwise it will default to the 'ctlplane' IP. The networks these APIs are bound to can be overridden in an environment file. Change-Id: I6694ef6ca3b9b7afbde5d4f9d173723b9ce71b20
2015-05-26Map Glance services to isolated networksDan Sneddon1-3/+3
This change adds parameters to specify which networks the Glance services will use. If the internal_api network exists, Glance Registry will bind to the IP on that network, otherwise it will default to the Undercloud 'ctlplane' network. If the storage network exists, Glance API will bind to the IP on that network, otherwise it will default to 'ctlplane'. The networks that these services use can be overridden with an environment file. Change-Id: I6114b2d898c5a0ba4cdb26a3da2dbf669666ba99
2015-05-26Merge "Define Glance Pacemaker resources on $pacemaker_master node only"Jenkins1-24/+23
2015-05-26Map Cinder services to isolated networksDan Sneddon1-2/+2
This change adds parameters to specify which networks the Cinder API and Cinder iSCSI services will listen on. If the internal_api network exists, Cinder API will be bound to the IP on that network, otherwise it will default to the Undercloud 'ctlplane' network. The Cinder iSCSI service will bind to the storage network if it exists, otherwise will also default to using the Undercloud 'ctlplane' network. Change-Id: I98149f108baf28d46eb199b69a72d0f6914486fd
2015-05-26Merge "Ensures mongodb configuration only happens if mongodb is needed"Jenkins1-8/+8
2015-05-26Merge "We don't need to create the clustercheck user anymore"Jenkins1-4/+0
2015-05-26Map Ceilometer services to isolated networksDan Sneddon1-2/+2
This change adds the parameters to specify which networks the Ceilometer and MongoDB servers listen on. It is set to the internal_api network if present, and reverts to the default Undercloud 'ctlplane' network if not. Change-Id: Ib646e4a34496966f9b1d454f04d07bf95543517f
2015-05-26Switch net-config templates to use OS::stack_idDan Prince5-5/+5
This patch removes the custom config_id outputs and replaces it with OS::stack_id which allows us to just call get_resource in the parent stack. The motivation for this change is we'll be adding more os-net-config templates and it would be nice to take advantage of this newer template feature. Change-Id: I6fcb26024b94420779b86766e16d8a24210c4f8e
2015-05-26Update neutron local_ip to use the tenant networkDan Prince2-2/+29
This patch uses the new NetIpMap and ServiceMap abstractions to assign the Neutron tenant tunneling network addresses. By default this is associated with the tenant network. If no tenant network is activated this will still default to the control plane IP address. Change-Id: I9db7dd0c282af4e5f24947f31da2b89f231e6ae4