summaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2016-05-31Fix inconsistency with ringbuilder/storage stepsSteven Hardy5-58/+65
Currently when deploying swift on the Controller nodes, we do the ringbuilder config during step3 and the swift-storage config during step 4, but this order is reversed on the ObjectStorage nodes. Also, we include the base swift class inconsistently during step2 on controller nodes, and via the overcloud-object manifest on ObjectStorage nodes. So fix this inconsistency as a precursor to conversion to composable services interfaces for the ObjectStorage role, we rework the post config so we apply the ObjectStorage config in steps 2, 3 and 4, which should hopefully get us much closer to the process used on the controller role, thus be easier to decompose in a compatible way. Partially-Implements: blueprint composable-services-within-roles Change-Id: Ic9d0ed8584a12d681a8f4d4742d39b96c15e531a
2016-05-31Convert Swift proxy to composable services formatSteven Hardy6-63/+52
Switch the swift proxy service to use the new composable services format. Change-Id: Idc9ac64818882e73836ac99bbad56eec184c9a5d Partially-Implements: blueprint composable-services-within-roles Depends-On: I6bd72284911f3f449157a6fc00b76682dd53bd8c
2016-05-30Merge "Pass enabled and manage_service to Neutron/L3 when Pacemaker"Jenkins1-0/+2
2016-05-30Pass MysqlVirtualIP via EndpointMapGiulio Fidente33-140/+90
By passing the MysqlVirtualIP via the EndpointMap we won't need it to be provided as a parameter to the services. This follows what is already happening for the glance registry service with I9186e56cd4746a60e65dc5ac12e6595ac56505f0. Change-Id: Iad2ab389bf64d0fc8b06eb0e7d29b5370ff27dff Co-Authored-By: Juan Antonio Osorio Robles <jaosorior@redhat.com>
2016-05-27Merge "Enable proxy header handling for cinder"Jenkins1-0/+4
2016-05-27Merge "Configure ComputeServices via resource chains"Jenkins4-177/+237
2016-05-27Merge "Fix ceph keyring setting for gnocchi"Jenkins2-2/+6
2016-05-27Merge "Use docker-cmd hook."Jenkins2-4/+4
2016-05-27Configure ComputeServices via resource chainsCarlos Camacho4-177/+237
This patch wires a Heat feature to configure services via a Heat resource chain. Additional patches will be able to configure compute services using composable services. Change-Id: Ib4fd8bffde51902aa19f9673a389600fc467fc45
2016-05-27Remove custom SSL-related resource for cinderJuan Antonio Osorio Robles2-2/+0
Now that cinder includes http_proxy_to_wsgi by default[1] our puppet resource that included it in cinder's api-paste config is not longer needed. [1] If5aab9cc25a2e7c66a0bb13b5f7488a667b30309 Change-Id: I6141b6caf9b04ee73fae3ae2b94b3001b21b9999
2016-05-27Enable proxy header handling for cinderJuan Antonio Osorio Robles1-0/+4
Cinder is using http_proxy_to_wsgi middleware. This parses the headers provided by the proxy, and helps us properly use TLS for keystone discovery. There was an option introduced in this middleware to have it disabled by default, and this change enables it. Change-Id: Ia33b3fa04d71eab10effd0b33eb2c194282cd15b
2016-05-27Merge "Enable proxy header parsing for heat"Jenkins1-0/+1
2016-05-27Merge "Configure CephStorage services via resource chains"Jenkins4-37/+84
2016-05-27Enable proxy header parsing for heatJuan Antonio Osorio Robles1-0/+1
For handling the X-Forwarded-Proto, heat uses the http_proxy_to_wsgi middleware from oslo.middleware. It used to work by default, but now configuration is required to enable that. We require it since we are effectively behind a proxy (HAProxy). Change-Id: I256f27ec6a3f66316ff6aa3f78b2f1ec1472f097
2016-05-26Remove the delay resource and its constraintsMichele Baldessari1-37/+0
With change 648099e1925e7d0d3f6906e5e8d15f3871e88460 and the replacement of ceilometer-alarm with aodh, the delay resource became a leaf in the ordering graph and serves no real purpose any longer. It can now be removed without affecting anything else. Change-Id: Ib86e609821b9f0b7b0d99c49aead20f9a177f63d
2016-05-26Configure CephStorage services via resource chainsGiulio Fidente4-37/+84
Also wires in the steps into the CephStorage role. Change-Id: Ib472f1279478ad7792349cc32bb3c5f510ba69fe
2016-05-26Merge "composable heat services"Jenkins15-220/+378
2016-05-26Fix ceph keyring setting for gnocchiPradeep Kilambi2-2/+6
The ceph_keyring value is expected to be a full path to the keyring. But we currently only pass in client.<cephuser>. This patch fixes the value to be full path. Closes-Bug: #1586010 Change-Id: I5666c44bb35b6ae109c68506704eff776f5dceda
2016-05-25Merge "Optimize Nova disk_cachemodes and hw_disk_discard options for RBD"Jenkins1-2/+11
2016-05-24Merge "Dump IPs configuration as hieradata"Jenkins8-76/+105
2016-05-23Update management_from_pool template version to 2015-10-15Giulio Fidente1-1/+1
The str_split function was added after the 2015-04-30 release so it wasn't working as intended. Change-Id: Ib8827879182e6ea3bd2227b0cfa77f70aabb0ac6 Closes-Bug: 1575622
2016-05-20Merge "Adds memcached as a composable service"Jenkins7-20/+57
2016-05-20Merge "Add ExtraConfig example that always runs on update"Jenkins1-0/+39
2016-05-20Merge "Tighten the access rules for galera"Jenkins3-11/+68
2016-05-20Adds memcached as a composable servicemarios7-20/+57
Implements: blueprint composable-services-within-roles Depends-On: Icd504aef7dda144582c286c56c925a78566af72c Change-Id: I8802c2a0cf1e5fa1a6d1fab5e87f6014bea2f517
2016-05-19Merge "Deploy Loadbalancer as a composable role"Jenkins7-78/+63
2016-05-19composable heat servicesBrad P. Crochet15-220/+378
Adds new puppet and puppet pacemaker specific services for Heat API, Heat API CFN, Heat API Cloudwatch, and Heat Engine. The Pacemaker templates extend the default heat services and swap in the pacemaker specific puppet-tripleo profile instead. Change-Id: I387b6bfd763d2d86cad68a3119b0edd0caa237b0 Partially-implements: blueprint composable-services-within-roles Depends-On: I194cbb6aa307c2331597147545cf10299cab132f Depends-On: I14dc923ac8ee8d5d538e7f4cf8138ccee8805b53
2016-05-19Deploy Loadbalancer as a composable roleEmilien Macchi7-78/+63
Deploy loadbalancer service using puppet-tripleo, and drop puppet code. Implements: blueprint refactor-puppet-manifests Depends-On: I9b106dcc1a4d446ab5dea8430ed295e6ec209cbd Change-Id: I9ca50a4bc822ec17d89988894af9bdf07e4bd1a9
2016-05-19Merge "Add net-config-static.yaml"Jenkins1-0/+82
2016-05-19Merge "Remove ControllerClusterConfig from overcloud.yaml"Jenkins2-30/+0
2016-05-19Merge "add heat-api-cfn to endpoint map"Jenkins3-0/+138
2016-05-19Merge "Add missing ManagementIpSubnet"Jenkins1-0/+4
2016-05-19Merge "Change ping wait flag"Jenkins1-1/+1
2016-05-19Tighten the access rules for galeraMichele Baldessari3-11/+68
Set a password for the 'root' db user and add an additional 'clustercheck' user to be used only by the resource agent. The password for this 'clustercheck' user is randomly generated via a heat parameter. Before this change the workflow to set up the database in the manifest is the following: - Step 1 -> Install all the basic galera packages and basic configuration - Step 2.a -> Create /etc/sysconfig/clustercheck with root and empty password - Step 2.b -> Start up galera-monitor xinetd service - Step 2.c -> Start pacemaker ocf resource (no root user has been created so there will be an empty password per default) - Step 2.d -> Wait for /bin/clustercheck to return success and then proceed with the other steps After this change the workflow is slightly more complex because there is a bit of a chicken and egg problem: - Step 1 -> Install all the basic galera packages and basic configuration - Step 2.a -> Create /etc/sysconfig/clustercheck with root and empty password unless the file does exists already and has a clustercheck user configured - Step 2.b -> Start up galera-monitor xinetd service - Step 2.c -> Start pacemaker ocf resource (no root user has been created yet, so there will be an empty password per default) - Step 2.d -> Wait for /bin/clustercheck to return success and then proceed with the other steps - Step 2.e -> Create clustercheck db user - Step 3/4 -> Create /etc/sysconfig/clustercheck with clustercheck user credentials - Step 5.a -> Update the sql root password on the each node (at this stage - Step 5.b -> Create /root/.my.cnf with proper credentials on all nodes Note that we cannot really create the root/clustercheck users right at step 1 because the db is not running yet (an approach that spawned mysqld on each node, created the users and shut it down, was tried but was much more complex and cannot work on updating existing setups) Given the new way of solving the root password issue, we also need to make sure that Step1 and Step2 are running on updates. Closes-bug: #1581677 Depends-On: I83eed8885503043e881db34411616f9726e00352 Change-Id: If3d6e7253af6195b96129be7ea3348d697e4bae1
2016-05-18Deploy RabbitMQ as a composable roleEmilien Macchi8-94/+78
Change the way to implement RabbitMQ, as a composable role. Implements: blueprint refactor-puppet-manifests Change-Id: I5fed5c437ad492af75791a9163f99ae292f58895
2016-05-18Merge "Add step to ObjectStorage RingBuilder deployment"Jenkins1-0/+5
2016-05-18Dump IPs configuration as hieradataGiulio Fidente8-76/+105
This might be useful if we switch to %{hiera()} calls to lookup the bind address from within a service. Also gets rid of NetIpSubnetMap and provides same output from NetIpMap instead. Change-Id: I328a417d1f1fff9c31e9ad7b2b5083ac19bc7329
2016-05-18Pass enabled and manage_service to Neutron/L3 when PacemakerGiulio Fidente1-0/+2
We can drive enabled and manage_service from the Pacemaker specific templates so change I8ef7bb94e048b998712b3534ceb51a7d10d016e9 removed that logic from the TripleO specific manifests. This change adds them into the Pacemaker template for the Neutron/L3 agent. Change-Id: I1146a8bae4938577e9927d1ce74009e066cb58dd
2016-05-18Add step to ObjectStorage RingBuilder deploymentSteven Hardy1-0/+5
https://review.openstack.org/#/c/236243 added a new conditional for the controller steps, but we don't pass any step for the ObjectStorage nodes, so the deployment fails. This passes a step that enables the ringbuilder again, although it does end up inconsistent with the deployment Step name. Change-Id: I506961f4a22dba9960d819d7376a39e7ccbcdece Closes-Bug: #1583225
2016-05-18composable neutron metadata serviceDan Prince11-27/+86
Adds new puppet and puppet pacemaker specific services for the Neutron Metadata agent. Partially-implements: blueprint composable-services-within-roles Change-Id: I25f026507e78f18594599b3621613a54f246545d
2016-05-18composable neutron l3 serviceDan Prince12-43/+79
Adds new puppet and puppet pacemaker specific services for the Neutron L3 agent. Partially-implements: blueprint composable-services-within-roles Change-Id: I0316043efe357a41ef3b4088a55d98dbb6d25963
2016-05-18Merge "Ensure manage_service and enabled are false for Pacemaker"Jenkins4-3/+10
2016-05-17Move dhcp agent maps to OS::Heat::None to resource_registryJames Slagle2-3/+4
Change Id Ia61295943e67efe354a51a26fe4540f288ff6ede added support for composable Neutron dhcp agent services. However in the sample environments for OpenContrail and Plumgrid where dhcp agent is disabled, the mapping for OS::Heat::None was under parameter_defaults instead of resource_registry. Change-Id: I0aedbbc3720783d4208d524cd28c7eed4fc5d1d7
2016-05-17Remove ControllerClusterConfig from overcloud.yamlSteven Hardy2-30/+0
AFAICS this isn't actually used anywhere, I assume it's left over from the older element based implementation. Change-Id: Ie95628bd7af1bcd50a6e331531b2987e434c7136
2016-05-16Merge "Remove Nova EC2 deployment"Jenkins5-147/+0
2016-05-16Remove Nova EC2 deploymentEmilien Macchi5-147/+0
Nova EC2 does not exist anymore since Mitaka, parameters are already deprecated in Mitaka and send warnings to the Puppet catalog. The service has been replaced by ec2api project, where Puppet OpenStack team is currently writting a module. In the meantime we add support in TripleO, this patch removes all occurences of Nova EC2 configuration, which are useless and send warnings for nothing. Change-Id: Ief2d0e5c77b5ac58560606fee930fbd66c40ffc3
2016-05-16Merge "Add database directory mount for openvswitchdb"Jenkins1-0/+1
2016-05-13Ensure manage_service and enabled are false for PacemakerGiulio Fidente4-3/+10
We can control the two manage_service and enabled boolean from the Pacemaker specific template now. Change-Id: I91a4267f0fc230f63df3333747d28463c7ae55fe
2016-05-12add heat-api-cfn to endpoint mapSteven Hardy3-0/+138
Change-Id: I8f98ce92fc387d2263fda738c1c8a209e3cbbb85
2016-05-11Merge "composable neutron dhcp service"Jenkins12-194/+139