aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2016-07-12Merge "Fix network-isolation.yaml to stop clobbering Management net"Jenkins1-11/+10
2016-07-12Merge "Combine BootstrapNodeDeployment with AllNodesDeployment"Jenkins7-43/+38
2016-07-12Merge "compute: moving out iscsi bits, now in puppet-tripleo"Jenkins1-10/+0
2016-07-12Merge "Composable OpenContrail compute plugin"Jenkins3-11/+20
2016-07-12Merge "Composable Plumgrid compute plugin"Jenkins3-15/+20
2016-07-12Merge "Composable Midonet compute plugin"Jenkins3-23/+21
2016-07-12Merge "Composable Nuage Compute Plugin"Jenkins3-15/+28
2016-07-12Merge "Composable Neutron Core Compute Plugin"Jenkins8-302/+14
2016-07-12Merge "Use already Deployed/Installed servers"Jenkins11-4/+495
2016-07-12Merge "Add a second proxy-logging middleware entry to swift-proxy"Jenkins1-0/+1
2016-07-12Fix network-isolation.yaml to stop clobbering Management netDan Sneddon1-11/+10
The network-isolation.yaml file explicitly set the Management network to None and the ports to noop.yaml. This resulted in the Management network being disabled if network-management.yaml was included before network-isolation.yaml. These changes comment out the Management declarations to show the default, and mention that network-management.yaml may be included. Since the Management network is disabled by default, it isn't necessary to noop it here. This change also places the Redis VIP in a more logical place next to the controller ports. Change-Id: I50a71b3ddf77bda2d213821da5e4260b503a6cb7 Fixes-bug: 1602283
2016-07-12Composable OpenContrail compute pluginDan Prince3-11/+20
Adds a new neutron compute plugin used to help configure opencontrail for use on compute nodes. Change-Id: I67a649445d5f1cb21ab9483bae7f5f4c2c657142
2016-07-12Composable Plumgrid compute pluginDan Prince3-15/+20
Adds a new neutron compute plugin used to help configure plumgrid for use on compute nodes. Change-Id: Ied6493aba826a602b2ce73359d1acf26ebe89869
2016-07-12Composable Midonet compute pluginDan Prince3-23/+21
Adds a new neutron compute plugin used to help configure midonet for use on compute nodes. Change-Id: I3a6996d3d9557ecad5ccd26a3901caccbf111468
2016-07-12Composable Nuage Compute PluginDan Prince3-15/+28
Adds a new neutron compute plugin used to help configure nuage for use on compute nodes. Change-Id: I732ec85d1f0605e562dacb02624a355e425d911a Depends-On: Ic842ebdc183918ec9a24f83ae39adfba27bc799c
2016-07-12Composable Neutron Core Compute PluginDan Prince8-302/+14
Create a new resource registry entry for a Neutron "compute plugin". For ML2 this may be the same os the NeutronComputePlugin but patches for other vendors will follow that require extra bits on nodes where VMs will be created. This patch removes the ML2 code from the compute role and instead uses the existing composable services. NOTE: we are able to remove the puppet resource chain to force OVS to get restarted due to puppet-neutron commit: Idb1332dd498bb3065720f2ccaf68e6b0e9fa80c3 which should resolve that issue. Co-Authored-By: Emilien Macchi <emilien@redhat.com> Depends-On: I95b9188607ab6c599ad4cde6faa1deb081618f3e Change-Id: I2496372ca6e6ba9f52e9a8bb6e8dc731c125af13
2016-07-12compute: moving out iscsi bits, now in puppet-tripleoEmilien Macchi1-10/+0
Move bits from THT to puppet-tripleo. Implements: blueprint composable-services-within-roles Change-Id: I9866506b120afdf35891a396ea1bbe1c0f592b3f Depends-On: I495a7af4220f0b35e9fd0a6cfc146610d8f46d10
2016-07-11Composable Horizon service - tripleo-heat-templatesCarlos Camacho6-59/+37
Add horizon as a composable service Depends-on: Iff6508972edfd5f330b239719bc5eb14d3f71944 Change-Id: I734c3e0784c25f30adff2e13faf1155a3e45cefd Partially-implements: blueprint composable-services-within-roles
2016-07-11Merge "Combine parameter_default fields"Jenkins1-2/+0
2016-07-11Merge "Re-enable Ceilometer composable roles for controller"Jenkins16-286/+385
2016-07-11Use already Deployed/Installed serversJames Slagle11-4/+495
This patch provides a set of templates that enables tripleo-heat-templates to be used with a set of already deployed, installed, and running servers. In this method, Nova and Ironic are not used to deploy any servers. This approach is attractive for POC deployments where dedicated provisioning networks are not available, or other server install methods are dictated for various reasons. There are also assumptions that currently have to be made about the software installed on the already deployed servers. Effectively, they must match the standard TripleO overcloud-full image. Co-Authored-By: Steve Hardy <shardy@redhat.com> Change-Id: I4ab1531f69c73457653f1cca3fe30cc32a04c129
2016-07-11Merge "neutron: remove tenant MTU configuration options"Jenkins4-58/+1
2016-07-11Merge "Move ironic::db data within service template"Jenkins4-13/+8
2016-07-11Re-enable Ceilometer composable roles for controllerEmilien Macchi16-286/+385
This patch brings back Ceilometer composable roles for controller, module some adjustments to make it work. Fixes 3 issues in Ceilometer composable services 1) This patch fixes the hiera maps in the pacemaker ceilometer* templates. These were lists and should be a map. 2) fixes a critical issue in ceilometer-base.yaml where the password was incorrectly coded in the YAML using get_param on a string which wasn't actually a parameter. 3) Fixes the ceilometer_coordination_url so that it uses a YAML anchor as was implied instead of get_param on a string which wasn't a parameter. 4) Fixes the default database connection to use mongodb and configured in puppet-tripleo profile appropriately. Co-Authored-By: Dan Prince <dprince@redhat.com> Co-Authored-By: Pradeep Kilambi <pkilambi@redhat.com> Closes-Bug: #1601844 Change-Id: Ia0a59121b9ffd5e07647f66137ce53870bc6b5d6
2016-07-11Add a second proxy-logging middleware entry to swift-proxyDerek Higgins1-0/+1
Its absence results in swift using up all the memory available to it when certain objects are requested, we are not sure exactly what triggers the problem but we know this fixes it. Change-Id: Iaf00a8a2a947e0683cc60fef2e75fd7c444d07a8 Closes-Bug: #1595916
2016-07-11Merge "Include bulk in swift proxy pipeline"Jenkins1-0/+1
2016-07-11Move ironic::db data within service templateGiulio Fidente4-13/+8
Change-Id: If0b8fbc783e694f4f744ad848103d40df985fc04
2016-07-11Merge "Move neutron::db data within service template"Jenkins2-10/+7
2016-07-11Merge "Move sahara::db data within service template"Jenkins2-8/+6
2016-07-11Merge "Move heat::db data within service template"Jenkins2-8/+6
2016-07-11Merge "Move cinder::db data within service template"Jenkins2-8/+6
2016-07-11Merge "Move glance::db data within service template"Jenkins2-8/+7
2016-07-11Merge "Move keystone::db data within service template"Jenkins2-8/+7
2016-07-11Merge "Pass MysqlVirtualIP without brackets to EndpointMap"Jenkins3-0/+48
2016-07-11Merge "Set os-refresh-config timeout to 4 hours"Jenkins5-5/+5
2016-07-11Merge "Template param for what command occ runs"Jenkins5-0/+35
2016-07-09Move neutron::db data within service templateGiulio Fidente2-10/+7
Change-Id: I07a81a2e1cc29df007bba11da82cf6661a55aadf
2016-07-09Move sahara::db data within service templateGiulio Fidente2-8/+6
Change-Id: Ifb87f79e8cd692e6553d03df8394c74f51821e11
2016-07-09Move heat::db data within service templateGiulio Fidente2-8/+6
Change-Id: I3fada6c5b0265bc6536c89da0ef4b709ead13b7d
2016-07-09Move cinder::db data within service templateGiulio Fidente2-8/+6
Change-Id: I2aaf30289cc792e8860ca9c962d80baf7e804cbf
2016-07-09Move glance::db data within service templateGiulio Fidente2-8/+7
Change-Id: I405bc9895160cc867f933e6b0d56546d460d2e3a
2016-07-08Composable Midonet for NeutronDan Prince7-160/+80
Depends-On: I2393fc3c360f5f5786411f64dbcd06f380376093 Change-Id: I606cb1f7ef7d651b5d145bfa10ef3aa1561b1590 Partially-implements: blueprint composable-services-within-roles
2016-07-08Include bulk in swift proxy pipelinePradeep Kilambi1-0/+1
With bulk delete enabled for gnocchi, this option should be included in pipeline as well. Change-Id: I5786c6f14e3aab9e167c22d8f72c5c1688440e95
2016-07-08Move keystone::db data within service templateGiulio Fidente2-8/+7
Change-Id: I934aff4960588a3957b7a7bcc90385ae48d34d1e
2016-07-08Pass MysqlVirtualIP without brackets to EndpointMapGiulio Fidente3-0/+48
While the endpoints do need brackets around IPv6 addresses these are not wanted by some of the puppet classes so we must pass the non bracketed version as well. It will allow us to remove the need for the MysqlVirtualIP param passed to the controller role thouh when hieradata/database.yaml is emptied. Change-Id: If264b02a134b96368035f032e05d02e84f6499ed
2016-07-08Add StepConfig to docker compute-post.yamlFlavio Percoco1-1/+10
Change I84c97a76159704c2d6c963bc4b26e365764b1366 missed `docker/compute-post.yaml`. Change-Id: I680eabf2f316c7fccc9d53d75dc16139c9959c64
2016-07-08Merge "Parametrize and increase default of swift-proxy node_timeout"Jenkins1-0/+5
2016-07-07Merge pacemaker_master/sync_db conditionalsGiulio Fidente1-40/+38
By condensing the pacemaker_master and sync_db conditions we ensure there won't be unrelevant (clustercheck) execs deployed on non-bootstrap nodes. Closes-Bug: 1598907 Change-Id: Iae6aa13682d63096265f4751b2f71019a49f6fa6
2016-07-07Merge "Convert AllNodesExtraConfig to OS::Heat::None"Jenkins2-26/+2
2016-07-07Merge "Remove config_identifier from all_nodes extraconfig examples"Jenkins7-42/+3