aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2016-09-16Merge "Fix _from_pool_v6.yaml str_split"Jenkins6-6/+6
2016-09-16Move rabbit's clustering port away from the ephemeral port rangeMichele Baldessari1-3/+3
Currently RabbitMQ cluster uses a predefined port 35672 for clustering. This port belongs to so-called ephemeral ports range. Ephemeral ports are the ports kernel assings to application if it doesn't specify which port to open. So there is a small chance that this application being started before RabbitMQ itself could grab this port. While rather unlikely we did see this happen. Selinux change should already be in place. On my Centos 7 we have: rabbitmq_port_t tcp 25672 corenet_tcp_bind_rabbitmq_port(rabbitmq_t) corenet_tcp_connect_rabbitmq_port(rabbitmq_t) First noted via: https://bugzilla.redhat.com/show_bug.cgi?id=1357522 Closes-Bug: #1623818 Depends-On: I0bcd0d063a7a766483426fdd5ea81cbe1dfaa348 Change-Id: I995bd96c2a17614e954ea5bbae4d58998ef420dc
2016-09-16Add mongo config settings in collector service templatesPradeep Kilambi1-1/+10
In scenario where mongo and collector are on separate nodes like as indicated in the bug, collector should be able to access mongo replset and other hiera data. Closes-bug: #1620468 Depends-On: I0bcd0d063a7a766483426fdd5ea81cbe1dfaa348 Change-Id: Iadf4c78fb03da183d19e93c30f78817a3cfed425
2016-09-16Merge "Convert deploy steps to jinja2 loop"Jenkins3-654/+145
2016-09-16Fix _from_pool_v6.yaml str_splitGiulio Fidente6-6/+6
Previously [1] we updated from_pool_v6 to use str_split but mistakenly copy/pasting lines referencing an attribute which isn't created in these templates. 1. I282dbc025500b1628d4f08a49b54a2adefd38b5f Closes-Bug: 1624412 Change-Id: I409ff5b36eab2a791db4d352dea5b68096c2dc21
2016-09-16Merge "Fixes the Ceph upgrade scripts"Jenkins2-5/+5
2016-09-16Merge "Set client protocol for glance registry client"Jenkins1-0/+1
2016-09-16Fix use of batch_create in CephMon major upgrade templateMathieu Bultel1-1/+2
The batch_create and rolling_update keys were incorrectly defined as properties of the resource instead of update policies. Change-Id: I19261adc78e4cdc3616f16221e85490a6b48d47b Closes-Bug: 1623506
2016-09-16Add CephRgw to roles_data.yamlGiulio Fidente1-0/+1
CephRgw defaults to None in the registry, seems like we missed it in roles_data after a rebase. Change-Id: I4ce8b160edfb193f5f6226f8295861e6625ef37b
2016-09-16Fixes the Ceph upgrade scriptsGiulio Fidente2-5/+5
The Ceph upgrade scripts was failing on the following: 1. a syntax error in an if condition 2. an attempt to read a possibly unbound variable 3. an attempt to chown a directory which might not exist this change aims at fixing all of the above. Closes-Bug: 1623942 Change-Id: I9e9d63d4ab7626893aaf2a25dccfcafbb97ccbdf
2016-09-16Merge "Unset Keystone public_endpoint"Jenkins1-1/+0
2016-09-16Merge "Populate vnc_api_lib.ini on compute nodes with OpenContrail"Jenkins1-0/+12
2016-09-16Convert AllNodesExtraConfig to support composable rolesSteven Hardy9-284/+130
This adjusts the interface to OS::TripleO::AllNodesExtraConfig so it supports custom/composable/optional roles. Note this does break backwards compatibility, and I can't see any way to avoid that. I've converted the in-tree templates, and we'll have to document carefully and or provide a script (or automated conversion via mistral perhaps?) to allow folks to easily adjust any out of tree templates to the new format. Basically you just have to: 1. Remove all the *_servers parameters, replace with one "servers" json parameter 2. Replace references to e.g "controller_servers" with "servers, Controller" which does a path-based lookup into the json map provided by overcloud.yaml Change-Id: I5eebf853646b2f6300d6b542fcd4f43e82d3b413 Partially-Implements: blueprint custom-roles
2016-09-16Convert UpdateWorkflow to support composable rolesSteven Hardy4-89/+28
We need to remove the hard-coded roles from overcloud.j2.yaml as now it's valid to e.g remove BlockStorage completely. The previous behavior for the per-role upgrade scripts is maintained but we'll need to rework this for newton->ocata upgrades where we can no longer be sure the servers mapping will contain all roles. Change-Id: I25e6c84757e3c00fba2aae834cd8206c62e44acf Partially-Implements: blueprint custom-roles
2016-09-16Convert deploy steps to jinja2 loopSteven Hardy3-654/+145
Refactor so the post-deploy steps recently moved into puppet/post.yaml are generated by jinja2 instead of hard-coded Change-Id: I488e46aaa449c95571bd3d1de9513c3d0730baf3 Partially-Implements: blueprint custom-roles
2016-09-14Set client protocol for glance registry clientJuan Antonio Osorio Robles1-0/+1
To communicate to glance registry, glance API has several parameters that it uses to form the URI. Right now we are defaulting to http, when we enable TLS everywhere, this will break. So setting the value from the endpoint map should fix it. Closes-Bug: #1623477 Change-Id: Id86787cbaa6f87fdcf9c26111c228fd59fbba012
2016-09-14Expose parameter to enable combination alarmsPradeep Kilambi1-0/+6
The puppet-tripleo change for the same is merged I9220b7d020dc8ed45dd6ca83ea9647efd67ea648 Change-Id: Ic5309ada98c78a15aa3a47dd94acb9e68eb25295
2016-09-14Merge "Convert allNodesConfig properties to composable jinja2"Jenkins1-28/+12
2016-09-14Merge "Add support for deploying Ceph RGW role"Jenkins9-0/+357
2016-09-13Convert allNodesConfig properties to composable jinja2Steven Hardy1-28/+12
To support custom roles we need to generate these lists of role specific data. Change-Id: Ide97cd57d1c07f7f7ff260ff7a6bbe2b71753bd0 Partially-Implements: blueprint custom-roles
2016-09-13Move role ResourceGroups inside the jinja2 loopSteven Hardy5-218/+61
This moves the now nearly identical group resources inside the loop there's a FIXME related to some deprecated compute parameters we'll need to work around. Change-Id: Iddd63c42754867125e65e7721ab9d9f46f4d6afb Partially-Implements: blueprint custom-roles
2016-09-13Merge "Enable proxy header parsing for Manila"Jenkins1-0/+1
2016-09-13Add NetApp Manila driver integration and tidy up genericmarios7-73/+245
Enables configuring a NetApp backend for the Manila service This was created based on the review at https://review.openstack.org/#/c/188138/ This makes the netapp and generic backends disabled by default in the services/manila-backend-*.yaml. A backend is then enabled via backend-specific environment files, which will set any config parameters and enable that backend. It is expected that multiple manila backend specific environment files might be specified simultaneously. Finally generic and manila config is split into separate service files rather than using manila-base for all the things. Co-Authored-By: Ryan Hefner <rhefner@redhat.com> Co-Authored-By: Ben Swartzlander <ben@swartzlander.org> Closes-Bug: 1618479 Depends-On: Ic6f8e8d27ca20b9badddea5d16550aa18bff8418 Change-Id: I35fce32d0f6a5cc1c3382c2d0e0d6028928fd943
2016-09-12Merge "De-bracket vncproxy_host in compute profile"Jenkins2-9/+2
2016-09-12Merge "Configure Keystone credentials"Jenkins1-0/+12
2016-09-12Merge "Add trunking plugin to list of default ML2 service plugins"Jenkins1-1/+1
2016-09-12Unset Keystone public_endpointAdam Young1-1/+0
The keystone public_endpoint value should be deduced from the calling request and not hardcoded, or it makes network isolation impossible. Change-Id: Ide6a65aa9393cb84591b0015ec5966cc01ffbcf8 Closes-Bug: 1381961
2016-09-12De-bracket vncproxy_host in compute profileBen Nemec2-9/+2
This is done in the vncproxy profile, but for some reason is not in the compute one. It causes hiera to explode when the brackets are left, so we need to do the bracket stripping here too. Also switches both places to just use the host_nobrackets version of the endpoint instead of stripping them with str_replace. Change-Id: I7ccd84b575fd652f6412fdb1869c31c79a7bf53b Closes-Bug: 1618623
2016-09-12Configure Keystone credentialsEmilien Macchi1-0/+12
Configure Keystone credentials by installing 2 keys with dynamic content generated by python-tripleoclient. Note: this is a first iteration of managing Keystone credentials. It has a few limitations: - keys are not exported to external storage. - keys are not rotated automatically. Change-Id: I45cf8821eadf528dfcdc8d74e6e0484597b0d2c0
2016-09-12Add explicit entry for ctlplane IP in /etc/hostsJuan Antonio Osorio Robles5-0/+35
There was currently no way of getting it and we can't asure that the primary IP will use it. So it's explicitly needed there. Change-Id: Idb3ca22ac136691b0bff6f94524d133a4fa10617
2016-09-12Refactor upgrade checks.Sofer Athlan-Guyot3-62/+111
We make it clear that recoverable checks happen before starting the upgrade to be able to run the upgrade after the offending error has been manually corrected. Add new check for the pcsd cluster status. Add new check for galera password file: BZ 1357112 Closes-Bug: 1614907 Change-Id: If736c79121e1ffe0eaeb814bdb73ccbc0b64edcd
2016-09-12Merge "Fix service config files having wrong map_merge format"Jenkins3-3/+3
2016-09-12Merge "Make Nova VNC Proxy service name match service net map"Jenkins4-5/+5
2016-09-12Merge "Add Heat's Cfn and Cloudwatch networks to ServiceNetMap"Jenkins1-0/+2
2016-09-12Enable proxy header parsing for ManilaJuan Antonio Osorio Robles1-0/+1
This is necessary for when HAProxy is terminating TLS for manila, else we will have keystone discovery errors. This is the same we do for several other services, as manila uses the same middleware. Change-Id: Ice78b0abceb6a956bb8c1dc6212ee1b56b62b43f
2016-09-11Move per-role NetIpListMap's into jinja template loopSteven Hardy1-70/+14
Change-Id: I8fc855833e8c602e94d0e8b330a713de1c98f901
2016-09-10Merge "Adjust MTU to compensate for VLAN tag issue"Jenkins1-2/+5
2016-09-10Add support for deploying Ceph RGW roleKeith Schincke9-0/+357
This patch add support for deploying Ceph RGW. Co-Authored-By: Giulio Fidente <gfidente@redhat.com> Change-Id: I88c8659a36c2435834e8646c75880b0adc52e964
2016-09-10Add Heat's Cfn and Cloudwatch networks to ServiceNetMapJuan Antonio Osorio Robles1-0/+2
these are needed if we want to be able to generate which nodes the service and which VIP are they binding to. Change-Id: I9d40459406f15db3ad9229c75392c4d959d44b3b Closes-Bug: #1621371
2016-09-10Make Nova VNC Proxy service name match service net mapJuan Antonio Osorio Robles4-5/+5
If these names don't match then we cannot set the service's nodes, VIP and network. Change-Id: I8f1c0eaf62eee2704a5f2556a553032106db606b Closes-Bug: #1621368
2016-09-10Merge "Move AllNodesValidationDeployments into jinja template loop"Jenkins1-40/+9
2016-09-10Merge "Move AllNodesDeployments into jinja template loop"Jenkins1-51/+11
2016-09-10Merge "Convert overcloud.yaml to support jinja2 templating"Jenkins3-191/+158
2016-09-10Merge "Add support for configuring the OVS firewall driver"Jenkins1-0/+9
2016-09-09Merge "add composable services for Contrail"Jenkins6-0/+436
2016-09-09Adjust MTU to compensate for VLAN tag issueBrent Eagles1-2/+5
Some network configurations uncovered what appears to be an issue where a spurious 802.1q header is injected into tunnelled traffic. Adjusting the default value to accomodate the extra overhead should avoid this problem. Partial-Bug: #1621533 Change-Id: I9ebad2d6ad34d90fcb998497873059995cdef276
2016-09-09Move AllNodesValidationDeployments into jinja template loopSteven Hardy1-40/+9
These are identical for all roles, so move them into the per-role loop Partially-Implements: blueprint custom-roles Change-Id: Id85b830a0e225912a3ea8c8b17a11fc424f68bb0
2016-09-09Move AllNodesDeployments into jinja template loopSteven Hardy1-51/+11
These are identical for all roles, so move them into the per-role loop Partially-Implements: blueprint custom-roles Change-Id: I0a9918d5a2e9a73fe3ac68a96bdee02e95799bc1
2016-09-09Convert overcloud.yaml to support jinja2 templatingSteven Hardy3-191/+158
The first step of generating the Service chain resources via j2, we'll then incrementally convert other resources to be created in a similar way. Partially-Implements: blueprint custom-roles Depends-On: I81239991f36ed5f6453184bf9cffe930832cb68b Change-Id: Iafa9b2afddf18a5a9833ec472a552fb256338b38
2016-09-09Merge "Generate VIP info for ctlplane VIP, not management"Jenkins3-9/+9