aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2017-06-13Unblock CI by reverting to non-containerized HAProxyJiri Stransky1-1/+0
In change I90253412a5e2cd8e56e74cce3548064c06d022b1 we merged containerized HAProxy setup, but because of a typo in resource registry, CI kept using the non-containerized variant and it went unnoticed that the containerized HAProxy doesn't work yet. We merged a resource registry fix in Ibcbacff16c3561b75e29b48270d60b60c1eb1083 and it brought down the CI, which now used the non-working HAProxy. After putting in the missing haproxy container image to tripleo-common in I41c1064bbf5f26c8819de6d241dd0903add1bbaa we got further, but the CI still fails on HAProxy related problem, so we should revert back to using non-containerized HAProxy for the time being. Change-Id: If73bf28288de10812f430619115814494618860f Closes-Bug: #1697645
2017-06-13Modify PreNetworkConfig config inline with role-specific parametersSaravanan KR13-20/+159
Existing host_config_and_reboot.role.j2.yaml is done in ocata to configure kernel args. This can be enhanced with use of role-specific parameters, which is done in the current patch. The earlier method is deprecated and will be removed in Q releae. Implements: blueprint ovs-2-6-dpdk Change-Id: Ib864f065527167a49a0f60812d7ad4ad12c836d1
2017-06-12Add support to configure Num of Storage sacksPradeep Kilambi2-1/+12
Gnocchi 4 supports storage sacks during upgrade. lets make this configurable if we want to use more metricd workers. Change-Id: Ibb2ee885e59d43c1ae20887ec1026786d58c6b9e
2017-06-12Merge "Fix typo in haproxy docker mapping"Jenkins1-1/+1
2017-06-12Merge "Moving *postconfig where it was *postpuppet"Jenkins3-26/+36
2017-06-12Fix IronicInspectorAdmin to be httpsAlex Schultz1-2/+2
As noted in the original patch review I5e743f789ab7dd731bc7ad26226a92a4e71f95a1 the IronicInspectorAdmin should be https. Change-Id: I6e37427da679775f02ff0c5fe55cfee51c122e3d
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-12Moving *postconfig where it was *postpuppetCarlos Camacho3-26/+36
We need to ensure that the pacemaker cluster restarts in the end of the deployment. Due to the resources renaming we added the postconfig resource not in the end of the deployment as it was *postpuppet. Closes-bug: 1695904 Change-Id: Ic6978fcff591635223b354831cd6cbe0802316cf
2017-06-12Containerize Manila Scheduler serviceVictoria Martinez de la Cruz2-0/+106
Change-Id: Ifa8d023acdc42c9ae9a4b2f7652177e6ccb9f649 Depends-On: If44e958a9aa989e44c8c39e50715e92a4257bf1a Co-Authored-By: Martin André <m.andre@redhat.com> Co-Authored-By: Dan Prince <dprince@redhat.com> Partial-Bug: #1668922
2017-06-12Add support for Cinder "NAS secure" driver paramsAlan Bishop3-0/+29
Add new parameters that control the NAS security settings in Cinder's NFS and NetApp back end drivers. The settings are disabled by default. Partial-Bug: #1688332 Depends-On: I76e2ce10acf7b671be6a2785829ebb3012b79308 Change-Id: I306a8378dc1685132f7ea3ed91d345eaae70046f
2017-06-12Remove deprecated multinode-container-upgrade.yamlJiri Stransky1-70/+0
This has been renamed to multinode-containers.yaml to reflect that the scenario isn't upgrade-specific. Change-Id: I151792700475643a4088d98eb5e1bd7248e260cd Depends-On: Ib04e2ccb330d73df464ad97a20908f20426a4249
2017-06-12Containerize SaharaDan Prince3-0/+232
Depends-On: I9abe867dfbdc81d14a1b3b3f1529240b5e522be5 Co-Authored-By: Martin André <m.andre@redhat.com> Co-Authored-By: Ian Main <imain@redhat.com> Co-Authored-By: Luigi Toscano <ltoscano@redhat.com> Co-Authored-By: Telles Nobrega <tenobreg@redhat.com> Change-Id: Id8e3b7e86fa05e0e71cc33414ceae78bab4e29b2 Closes-bug: #1668927
2017-06-12Docker service for Cinder VolumeDan Prince2-0/+164
Adds docker service for Cinder Volume Co-Authored-By: Jon Bernard <jobernar@redhat.com> Depends-On: Ic1585bae27c318bd6bafc287e905f2ed250cce0f Partial-bug: #1668920 Change-Id: Ifadb007897f3455b90de6800751a0d08991ebca2
2017-06-12Docker services for Cinder BackupDan Prince2-0/+133
Adds docker services for Cinder Backup Co-Authored-By: Gorka Eguileor <geguileo@redhat.com> Co-Authored-By: Jon Bernard <jobernar@redhat.com> Co-Authored-By: Martin André <m.andre@redhat.com> Co-Authored-By: Alan Bishop <abishop@redhat.com> Partial-bug: #1668920 Change-Id: I26fc31e59b28da017f0b028b74bde40aaac53ad5
2017-06-12Docker services for Cinder Api and SchedulerDan Prince3-0/+278
Adds docker services for Cinder API and Scheduler. Co-Authored-By: Gorka Eguileor <geguileo@redhat.com> Co-Authored-By: Jon Bernard <jobernar@redhat.com> Co-Authored-By: Martin André <m.andre@redhat.com> Co-Authored-By: Alan Bishop <abishop@redhat.com> Depends-On: Ic1585bae27c318bd6bafc287e905f2ed250cce0f Change-Id: I5cff9587626a3b2a147e03146d5268242d1c9658 Partial-bug: #1668920
2017-06-12Containerize multipathdDan Prince2-0/+90
Co-Authored-By: Jon Bernard <jobernar@redhat.com> Depends-On: I486de8b6ab2f4235bb4a21c3650f6b9e52a83b80 Change-Id: I6cf70fa05ad1c8aa6d9f837ddcd370eb26e45f97
2017-06-12Move iscsid to a containerDan Prince10-0/+120
This configures iscsid so that it runs as a container on relevant roles (undercloud, controller, compute, and volume). When the iscsid docker service is provision it will also run an ansible snippet that disables the iscsid.socket on the host OS thus disabling the hosts systemd from auto-starting iscsid as it normally does. Co-Authored-By: Jon Bernard <jobernar@redhat.com> Change-Id: I2ea741ad978f166e199d47ed1b52369e9b031f1f
2017-06-12Merge "Add support for autofencing to Pacemaker Remote."Jenkins1-0/+38
2017-06-12Generate HAproxy iptables rules for containerized HA deploymentsDamien Ciabrini1-10/+13
The containerized HAproxy service can only specify steps to be run in containers, i.e. it cannot runs the regular puppet steps on bare metal at the same time. A side effect is that the dedicated HAproxy iptables rules are no longer generated. Update the docker_config step to fix the creation of iptables rules for HAproxy and persist them on-disk as before. Co-Authored-By: Michele Baldessari <michele@acksyn.org> Closes-Bug: 1697387 Change-Id: Ib5a083ba3299a82645f1a0f9da0d482c6b89ee23
2017-06-12Merge "Don't mount all of config-data /etc, /etc/httpd"Jenkins19-21/+46
2017-06-12Pacemaker HA suport for OVN DB serversNuman Siddique4-0/+89
This patch adds the templates required to enable the OVN DB servers to be started in master/slave mode in the pacemaker cluster. For the OVN DBs base profile, ::tripleo::haproxy expects the parameter 'ovn_dbs_manage_lb' set to true in order for it to configure OVN DBs for load balancing (please see this commit [1]). So this patch sets 'ovn_dbs_manage_lb' to true. [1] - I9dc366002ef5919339961e5deebbf8aa815c73db Co-authored-by: Babu Shanmugam (babu.shanmugam@gmail.com) Depends-on: I94d3960e6c5406e3af309cc8c787ac0a6c9b1756 Change-Id: I60c55abfc523973aa926d8a12ec77f198d885916 Closes-bug: #1670564
2017-06-12Execute Swift ring up-/download in containerized environmentsChristian Schwede1-2/+13
This patch ensures that Swift rings are downloaded from the undercloud before a rebalance and uploaded afterwards. Depends-On: I51c5795b9893d797bd73e059910f17a98f04cdbe Change-Id: Ief012fed628957e4da63ff3314c4cf01d58b6b16
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-09Remove duplicate docker/puppet services.yamlSteven Hardy7-115/+19
Move to one common services.yaml not only reduces the duplication, but it should improve performance for the docker/services.yaml case, because we were creating two ResourceChains with $many services which we know can be really slow (especially since we seem to be missing concurrent: true on one) Change-Id: I76f188438bfc6449b152c2861d99738e6eb3c61b
2017-06-09Configure credentials for ironic to access cinderDmitry Tantsur1-0/+6
Change-Id: Id896e01e24ecc2bfd7a983a3ff9756fefe4a4525 Depends-On: I097c494d3953b7d26d94aecc546ddef5225d1125
2017-06-09Add templates to configure Ironic inspectorDan Prince5-0/+160
Implements: blueprint ironic-inspector-composable-service Co-Authored-By: Dmitry Tantsur <dtantsur@redhat.com> Change-Id: I825516f9f5c2b0c03a3f497d6954022714aab988
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