aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2017-06-12Add nested sample environments for inject-trust-anchorBen Nemec8-1/+159
Fix a bug that prevented these working. A unit test and documentation for the nested environment functionality is also included. Change-Id: I2d4aeb584eb624178d601cfd6bc0a6473cb5289f
2017-06-12Add storage sample environmentsBen Nemec13-16/+503
Starts converting storage-related sample environments to the tool, and adds a few new ones for demonstration purposes. This has required the addition of a new category of parameter overrides in the tool. There are some parameters that are part of the public API of roles that should not normally be included in a sample environment for that role. Examples are EndpointMap and ServiceNetMap. Those are both passed into most (all?) roles, but their template defaults are not useful (both default to {}). Unless we are explicitly creating a sample environment that overrides those defaults we don't want them included. Parameters such as RoleName and RoleParameters are similar. We can't change them because they are part of the composable roles interface and that would break any existing custom roles, but we don't really want them included normally either. It's possible these could be made completely private, but there have been some very preliminary discussions about generating role samples that might actually want to set them. In order to avoid issues with editing the unit test file in editors that strip trailing whitespace, the minor formatting bug where params like EndpointMap had a trailing space after the name has also been fixed. Change-Id: If11f30c734bfbc17d463a9890c736d7477186fb9
2017-06-12Add neutron-midonet sample environmentBen Nemec3-0/+102
Change-Id: I34d3a9356b119d549acd6fe4f0c8713b0bfa5957
2017-06-12Support config dir for env generator input filesBen Nemec13-14/+900
We're not going to want to list every single sample environment in a single file, so let's also take a directory and just read every yaml file in it. This commit adds support for that as well as some initial environments to demonstrate its use. Change-Id: If2c608f2a61fc5e16784ab594d23f1fa335e1d3c
2017-06-12Sample environment generatorBen Nemec11-0/+808
This is a tool to automate the generation of our sample environment files. It takes a yaml file as input, and based on the environments defined in that file generates a number of sample environment files from the parameters in the Heat templates. A tox genconfig target is added that mirrors how the other OpenStack services generate their sample config files. A description of the available options for the input file is provided in a README file in the sample-env-generator directory. In this commit only a single sample config is provided as a basic example of how the tool works, but subsequent commits will add more generated sample configs. Change-Id: I855f33a61bba5337d844555a7c41b633b3327f7a bp: environment-generator
2017-06-12Merge "Providing parameters specific to a workflow via plan-environment"Jenkins3-0/+61
2017-06-12Merge "Remove pip install paunch"Jenkins1-4/+0
2017-06-12Merge "Fix containerized SwiftRawDisks usage"Jenkins1-1/+22
2017-06-12Merge "Containerize Manila API service"Jenkins2-0/+114
2017-06-12Merge "Add support for autofencing to Pacemaker Remote."Jenkins1-0/+38
2017-06-12Merge "Don't mount all of config-data /etc, /etc/httpd"Jenkins19-21/+46
2017-06-12Add support for autofencing to Pacemaker Remote.Chris Jones1-0/+38
We now pass configuration for autofencing to Pacemaker Remote nodes. Change-Id: Ibb9c65a83cc909528024c538cf3bcc96390c555e Depends-On: I87c60bd56feac6dedc00a3c458b805aa9b71d9ce Closes-Bug: #1686115
2017-06-12Providing parameters specific to a workflow via plan-environmentSaravanan KR3-0/+61
Parameters which are not part of the heat environment template are required by the worflows like derive parameters. In order to seprate from the heat environment parameters, the workflow only parameters will be provided via plan-environement section, workflow_parameters. Implements: blueprint tripleo-derive-parameters Change-Id: I36d295223c28afff1e0996b4885b8a81c00842f0
2017-06-11Merge "Containerized collectd"Jenkins2-0/+96
2017-06-12Don't mount all of config-data /etc, /etc/httpdSteve Baker19-21/+46
This change modifies these mounts to be more specific mounts based on the files which puppet actually modifies. The result is something a bit more self-documenting, and allows for trying other techniques for populating /etc other than directly mounting config-data directories. Change-Id: Ied1eab99d43afcd34c00af25b7e36e7e55ff88e6
2017-06-11Remove pip install paunchMichele Baldessari1-4/+0
We now have python-paunch-1.1.1 [1] in the overcloud images so we do not need to pip install it any longer. [1] https://trunk.rdoproject.org/centos7-master-head/current/python-paunch-1.1.1-0.20170602043913.c8e22e5.el7.centos.noarch.rpm Change-Id: I1ede514a8aee7ac217fa75843e67fb6542e06f99
2017-06-09Merge "Revert "Add support to configure Num of Storage sacks""Jenkins2-12/+1
2017-06-09Revert "Add support to configure Num of Storage sacks"Pradeep Kilambi2-12/+1
This reverts commit a915b150018bf306a5942782bf93c5faadcd7cde. The argument is renamed and causing promotions to fail. Change-Id: I7e1674cff75b606c20956edddf70eee2990fca78
2017-06-09Merge "Write md5sum for service config directories"Jenkins2-3/+59
2017-06-09Merge "Make container names consistent"Jenkins18-41/+41
2017-06-09Merge "Configure crl file for HAProxy"Jenkins1-0/+6
2017-06-09Merge "Configure CRL URI if TLS in the internal network is enabled"Jenkins1-0/+17
2017-06-09Merge "Containerize Tacker Services"Jenkins2-0/+136
2017-06-09Merge "Containerize Congress API service"Jenkins2-0/+137
2017-06-09Merge "Role Specific parameter for nova-compute service"Jenkins1-3/+23
2017-06-09Make container names consistentMartin André18-41/+41
This commit change the container names to consistently use the `_` char as a word separator and make the kolla external config file match the container name to make operators' life easier. Change-Id: Ibac9d76dde474b94c3cb86031ead0fd0327e126f
2017-06-09Merge "Modify libvirtd container command line when TLS is enabled"Jenkins1-1/+25
2017-06-09Merge "Run the nova-compute container as the nova user"Jenkins1-1/+1
2017-06-08Merge "Containerize Horizon"Jenkins2-0/+129
2017-06-08Run the nova-compute container as the nova userOliver Walsh1-1/+1
Change-Id: Ie6469d2fd2119952669f5c9fdaa41fb273185973 Depends-On: I91be1f1eacf8eed9017bbfef393ee2d66771e8d6 Closes-bug: #1693844
2017-06-08Merge "Use Deployment actions for blacklist"Jenkins6-29/+121
2017-06-08Merge "Standardize example role definitions"Jenkins16-187/+898
2017-06-08Containerized collectdMatthias Runge2-0/+96
Change-Id: I05126a108f5ab790e729d1f98399dca5801ebd69
2017-06-08Write md5sum for service config directoriesSteven Hardy2-3/+59
The configuration generated by docker-puppet may change on update, so checksum the combined files from the config-data directories, to enable detecting those that have changed and restarting the appropriate containers - we need to merge this checksum into the environment passed to the containters, as this will cause paunch to correctly restart containers when the configuration generated changes, even if the rest of the json definition provided by heat does not. Change-Id: I40d9080cf3ad708ef4ed91e46d2b2ae1138bb9c3
2017-06-08Merge "Add support to configure Num of Storage sacks"Jenkins2-1/+12
2017-06-08Merge "Fix the disable expirer to remove crontab"Jenkins2-16/+9
2017-06-08Containerize Tacker ServicesPradeep Kilambi2-0/+136
Closes-bug: #1668935 Change-Id: I83a02735eb445e831bc74ec786f2bb42cd2f87d6
2017-06-08Containerize Congress API servicePradeep Kilambi2-0/+137
Closes-bug: #1668929 Change-Id: I051edcf2980bb9c2521e21c410055690c012a0d1
2017-06-08Fix containerized SwiftRawDisks usageChristian Schwede1-1/+22
This patch partitions the defined devices and mounts them on the hostnode. It also disables the mount_check inside Swift because it is currently not possible to detect wether a given directory is a mounted device or not. This is just a workaround until a better solution has been implemented in Swift itself. Change-Id: I6e8e1328d7ffb18bb96ed1a940013dbb8b6b433e
2017-06-08Role Specific parameter for nova-compute serviceSaravanan KR1-3/+23
The parameters NovaVcpuPinSet, NovaReservedHostMemory and NovaPCIPassthrough are modified to support role-specific parameter inputs. Change-Id: I7c11e8fc2c933f424318e457cb1e96acb8df2ec7
2017-06-08Configure crl file for HAProxyJuan Antonio Osorio Robles1-0/+6
This will enable HAProxy to use CRLs for the nodes it's proxying. bp tls-via-certmonger Depends-On: I4f1edc551488aa5bf6033442c4fa1fb0d3f735cd Change-Id: I2558113bf83674ce22d99364b63c0c5be446bf77
2017-06-08Configure CRL URI if TLS in the internal network is enabledJuan Antonio Osorio Robles1-0/+17
This uses by default the URL for the CRL provided by FreeIPA (the default CA in TripleO). bp tls-via-certmonger Depends-On: I38e163e8ebb80ea5f79cfb8df44a71fdcd284e04 Change-Id: I87001388f300f3decb3b74bc037fff9d3b3ccdc2
2017-06-08Merge "Mount /var/run/libvirt on ceilo agent compute"Jenkins1-0/+1
2017-06-08Merge "Add host logging for redis service template"Jenkins1-3/+14
2017-06-08Modify libvirtd container command line when TLS is enabledOliver Walsh1-1/+25
Libvirtd needs the --listen arg to enable the TLS socket. Change-Id: I535165f0a2634728045491b2a37a56b1891b13fe Resolves-Bug: #1694958
2017-06-07Merge "Don't create networks if neutron is not enabled"Jenkins1-45/+49
2017-06-07Standardize example role definitionsAlex Schultz16-187/+898
As we create new standard roles, we should include them from a single location for ease of use and to reduce the duplication of the role definitions elsewhere. This change adds a roles folder to the THT that can be used with the new roles commands in python-tripleoclient by the end user to generate a roles_data.yaml from a standard set of roles. Depends-On: I326bae5bdee088e03aa89128d253612ef89e5c0c Change-Id: Iad3e9b215c6f21ba761c8360bb7ed531e34520e6 Related-Blueprint: example-custom-role-environments
2017-06-07Mount /var/run/libvirt on ceilo agent computePradeep Kilambi1-0/+1
Without this evidently agent logs IO errors. Change-Id: I3031212c582381ae6b6147a48101bf83a05caa8a
2017-06-07Add host logging for redis service templateSteven Hardy1-3/+14
This got missed in the patch which added host logging for most other services. Change-Id: I0be8a5bce6558ebaf5b4830138d1f6c31aec6394
2017-06-07Containerize Manila API serviceVictoria Martinez de la Cruz2-0/+114
Co-Authored-By: Martin André <m.andre@redhat.com> Partial-Bug: #1668922 Change-Id: I0c98f26b19caf755bbc80bd6a75fc17b5d191ae4