aboutsummaryrefslogtreecommitdiffstats
path: root/environments
AgeCommit message (Collapse)AuthorFilesLines
2016-08-08Merge "Make deployed-server OS::Neutron::Port optional"Jenkins2-0/+5
2016-08-08Updates and fixes to NIC config template routesDan Sneddon1-12/+16
This change adds the ManagementInterfaceDefaultRoute parameter for setting the Management network as the default route in some deployments. Notes were added to indicate that if the Management network is used as the default gateway, then the default route on the control plane should be commented out. The sample network-environment.yaml was modified to include the ManagementInterfaceDefaultRoute, but this is commented out like the rest of the Management network parameters. This change also adds the ControlPlaneDefaultRoute and ExternalInterfaceDefaultRoute to all templates, so that if the networks are customized, the NIC configs can be modified without having to modify the parameters section of the template. The default for the ExternalInterfaceDefaultRoute is '10.0.0.1', and the default for ManagementInterfaceDefaultRoute is set to 'unset'. This change also converts the single-nic-linux-bridge-vlans from DHCP to static IPs on the Control Plane Interface, bringing these templates in line with the rest of the NIC config templates. The parameters needed to be updated in these templates as well. The controller-v6.yaml templates had a default value of "10.0.0.1" for the ExternalInterfaceDefaultRoute. This was confusing, and is now undefined. This change also sets a default gateway on the Control Plane in controller-no-external.yaml templates. Change-Id: I8ea6733fe46902e1baeff4ccfbcd42ecc5a1825f
2016-08-07Make deployed-server OS::Neutron::Port optionalDan Prince2-0/+5
This patch makes it possible to set OS::TripleO::DeployedServer::ControlPlanePort: OS::Heat::None in your resource_registry and thereby avoid the creation of a neutron port for the deployed server. This is useful if you are bootstrapping things in an environment without Neutron. Also, includes a new deployed-server-noop-ctlplane.yaml environment file. Change-Id: I2990dc816698e0f6e3193a8fc7c9c6767c6e50e5
2016-08-06Add Sahara services to ControllerServices listSteven Hardy1-0/+2
https://review.openstack.org/#/c/318840/ decomposed the Sahara services but they weren't added to the ControllerServices list, thus are now disabled. Since we shipped mitaka with sahara enabled by default, we should probably add them so the behavior is consistent when folks upgrade. This also fixes a couple of issues we missed when landing the initial service templates (partly because CI didn't test them). In order for each service to operate independently when used with Pacemaker, the roles needed to be separated. This commit also does this. Depends-On: Id61eb15b1e2366f5b73c6e7d47941651e40651b1 Change-Id: I0846b328e9d938275e373d58f0b99219b19b326c Closes-Bug: #1592284 Co-Authored-By: Brad P. Crochet <brad@redhat.com>
2016-08-06Disable mistral services by default.Carlos Camacho1-0/+4
Optional services should be disabled by default in the overcloud nodes. This submission makes mistral disabled by default and allows to enable it base on an environment file. Depends-On: I942d419be951651e305d01460f394870c30a9878 Change-Id: I0dd245b75142834f71f3bd591b43c3f69d63217b
2016-08-05Merge "Add environment file to enable DVR"Jenkins1-0/+24
2016-08-05Disable the Mon/OSD/Client resources in puppet-ceph-externalGiulio Fidente1-1/+7
Change-Id: Iaa9dbf3545d5d001ad1d86b33df797880d922878 Closes-Bug: 1610258
2016-08-04Add environment file to enable DVRBrent Eagles1-0/+24
This patch adds support for conditionally enabling DVR by deploying the L3 and metadata agents on the compute node and setting the proper configuration values throughout. Implements: blueprint neutron-dvr-support Change-Id: I24099795e76ecd520c990ba49d3511288dec7a12
2016-08-04Next generation HA architecture workMichele Baldessari1-37/+0
This is the THT part that brings us the next generation architecture as described in the following spec: https://review.openstack.org/#/c/299628/ Blueprint: https://blueprints.launchpad.net/tripleo/+spec/ha-lightweight-architecture So far we tested deployment + tripleo.sh --overcloud-pingtest and failover + tripleo.sh --overcloud-pingtest Note that many of the Pacemaker template files become redundant with this change, but to simplify the process of getting this change landed, those templates will not be removed until a future commit. Depends-On: I5e7585c08675d8a4bd071523b94210d325d79b59 Change-Id: I00bccb2563c006f80baed623b64f1e17af20dd4e Implements: blueprint ha-lightweight-architecture Co-Author: cmsj@tenshu.net
2016-08-02Enable Manila integration - as a composable controller serviceRyan Hefner3-0/+31
Allows the installation and configuration of Manila. Supports the generic driver only. This has a dependency on the puppet-tripleo classes for manila where the puppet specific config now lives. The review at https://review.openstack.org/#/c/315658/ has been merge into this one, as of v68, so manila lands as a composable service. This was brought up on the mailing list at [1] [1] http://lists.openstack.org/pipermail/openstack-dev/2016-May/096126.html Co-Authored-By: Marios Andreou <marios@redhat.com> Implements: blueprint composable-services-within-roles Depends-On: I444916d60a67bf730bf4089323dba1c1429e2e71 Depends-On: I9eda4b3364e5c59342761a1ec71b0eb567c69cf1 Depends-On: I571b65a5402c1028418476a573ebeb9450ed00c9 Change-Id: I7acebac4354fca1f8d7ff6c343c1346bf29b81c6
2016-07-28Merge "Allow to manually disable post-puppet restarts"Jenkins2-0/+4
2016-07-27Create role for the fake openstack-core resourceGiulio Fidente1-0/+1
Change-Id: Iacd94294b8a66bc082bb2b3e8d3364ec1bf053b8 Depends-On: I16a786ce167c57848551c7245f4344c382c55b3d
2016-07-21Deploy Horizon with composable apache serviceEmilien Macchi1-0/+1
Deploy Horizon with composable apache service and don't include: ::tripleo::profile::pacemaker::apache Because it's already included in the profiles in puppet-tripleo. Change-Id: I5382d5cc95ba10805019142a9a223dbd4a4b8074 Depends-On: Id28c618133e53e28dfac7e3e9cf9f5f5a6b2421a
2016-07-19Merge "Add MysqlNoBracketsInternal to enable-tls.yaml"Jenkins1-0/+1
2016-07-18Merge "Missing CephClientKey parameter in puppet-ceph-devel and ↵Jenkins2-0/+3
storage-environment"
2016-07-18Add MysqlNoBracketsInternal to enable-tls.yamlJuan Antonio Osorio Robles1-0/+1
Change-Id: Ife466e6a8b8112777d4c0e845e31fa633da5e53d
2016-07-14Move MySQL Galera within composable servicesEmilien Macchi1-0/+1
This patch just moves the Puppet code into puppet-tripleo. A future iteration will be to move parameters within the service template. Closes-Bug: #1601853 Depends-On: I7ddae28a6affd55c5bffc15d72226a18c708850e Change-Id: I51a05dbf53f516b200c146b35529ce563ce9ac7b
2016-07-13Composable Pacemaker serviceEmilien Macchi1-0/+1
Deploy Pacemaker using composable services. Change-Id: I038514812af5a9f30260a81ea3366d46bee4ee4e Depends-On: I46215f82480854b5e04aef1ac1609dd99455181b Closes-Bug: #1601970
2016-07-12Merge "Gnocchi composable roles"Jenkins1-0/+4
2016-07-12Merge "Fix network-isolation.yaml to stop clobbering Management net"Jenkins1-11/+10
2016-07-12Merge "Composable OpenContrail compute plugin"Jenkins1-1/+1
2016-07-12Merge "Composable Plumgrid compute plugin"Jenkins1-1/+1
2016-07-12Merge "Composable Midonet compute plugin"Jenkins1-1/+1
2016-07-12Merge "Composable Nuage Compute Plugin"Jenkins1-1/+1
2016-07-12Merge "Composable Neutron Core Compute Plugin"Jenkins4-0/+8
2016-07-12Merge "Use already Deployed/Installed servers"Jenkins1-0/+3
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 Prince1-1/+1
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 Prince1-1/+1
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 Prince1-1/+1
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 Prince1-1/+1
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 Prince4-0/+8
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-12Gnocchi composable rolesPradeep Kilambi1-0/+4
Implements: blueprint composable-services-within-roles Co-Authored-By: Juan Antonio Osorio Robles <jaosorior@redhat.com> Co-Authored-By: Carlos Camacho <ccamacho@redhat.com> Depends-On: Id728aae79442c45ab48fe0914c065f1807e8890d Closes-Bug: #1601846 Change-Id: I40a3815923099d00a0f3fc1d88a942784e7c6fb9
2016-07-11Merge "Combine parameter_default fields"Jenkins1-2/+0
2016-07-11Use already Deployed/Installed serversJames Slagle1-0/+3
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-11Missing CephClientKey parameter in puppet-ceph-devel and storage-environmentMarius Cornea2-0/+3
This change adds the CephClientKey parameter to puppet-ceph-devel.yaml and storage-environment.yaml environment files. This is needed when --ceph-storage is not passed to the openstack overcloud deploy command as the tripleo client doesn't generate the keys. Change-Id: Idfdce190c2ad4ae198fe17474aee19cb76dac5fb Closes-Bug: #1601864
2016-07-11Re-enable Ceilometer composable roles for controllerEmilien Macchi1-0/+4
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-08Composable Midonet for NeutronDan Prince2-0/+3
Depends-On: I2393fc3c360f5f5786411f64dbcd06f380376093 Change-Id: I606cb1f7ef7d651b5d145bfa10ef3aa1561b1590 Partially-implements: blueprint composable-services-within-roles
2016-07-04Switch Ceph Monitor/OSD/Client/External to composable rolesGiulio Fidente3-6/+11
Change-Id: I1921115cb6218c7554348636c404245c79937673 Depends-On: I7ac096feb9f5655003becd79d2eea355a047c90b Depends-On: I871ef420700e6d0ee5c1e444e019d58b3a9a45a6
2016-07-04Merge "Stop no-opping PackageUpdate on upgrade"Jenkins2-2/+0
2016-07-01Stop no-opping PackageUpdate on upgradeJiri Stransky2-2/+0
After we fixed bug #1567384 and bug #1567385, we no longer need to no-op the PakageUpdate resource on upgrades. I removed the no-op in change Ie14ddbff15e7ed21aaa3fcdacf36e0040f912382 from major-upgrade-pacemaker-converge.yaml but didn't recall we had the no-op in major-upgrade-pacemaker{,-init}.yaml too. Change-Id: I24b913c790eae79e3b207729e0b22378075fb282
2016-06-30Merge "Basic support for deploying Ironic in overcloud"Jenkins1-0/+3
2016-06-29Basic support for deploying Ironic in overcloudImre Farkas1-0/+3
Note that this change is not enough yet to deploy bare metal instances, it only deploys Ironic services themselves and makes sure they work. Also it does not support HA for now. Co-Authored-By: Dmitry Tantsur <dtansur@redhat.com> Partially-implements: blueprint ironic-integration Change-Id: I541be905022264e2d4828e7c46338f2e300df540
2016-06-29Add Management net to ips-from-pool-all exampleSteven Hardy1-0/+16
The recently added Management network is missing from this example Change-Id: Id2010e92b8c27188ed153243d0e54ec50bfdcffb
2016-06-23Revert "Ceilometer composable roles for controller"Dan Prince1-4/+0
This reverts commit c48410a05ec0ffd11c717bcf350badc9e5f0e910. We've discovered this patch never had passing CI due to a DLRN build failure. Change-Id: I546cb3e340d20701662affda7e28b586c58ba6de
2016-06-23Merge "Ceilometer composable roles for controller"Jenkins1-0/+4
2016-06-23Merge "Drop extraconfig for neutron-opencontrail.yaml"Jenkins1-1/+0
2016-06-23Merge "Composable opencontrail plugin"Jenkins2-0/+3
2016-06-23Merge "Drop extraconfig for neutron-nuage.yaml"Jenkins1-1/+0
2016-06-23Ceilometer composable roles for controllerPradeep Kilambi1-0/+4
Depends-On: I4b5e93a108e80e91af26ffee454130ee18c0042e Change-Id: I59c948ead475f449cb8d1b752f39b7eaaf056130