Damien Ciabrini [Thu, 8 Jun 2017 12:31:23 +0000 (08:31 -0400)]
Containerize Cinder-volume for HA
This service allows configuring and deploying cinder-volume
containers in a HA overcloud managed by pacemaker.
The containers are managed and run by pacemaker. Pacemaker runs the
standard Kolla image but overrides the initial command so that
it explicitely calls cinder-volume. This way, we shield ourselves
from any unexpected future change in Kolla.
This container needs to use the 'docker_config' section to invoke
puppet (as opposed to 'docker_puppet_tasks'), because due to the HA
composability each resource creation needs to happen on the bootstrap
node of that service and 'docker_puppet_tasks' will only run on the
controller/primary role.
Co-Authored-By: Michele Baldessari <michele@acksyn.org>
Partial-Bug: #
1668920
Depends-On: I95ad4dd89b47396bea672813d87de35e64c04b2d
Change-Id: Ib6396219c3d9484c533f6f9995d565091a197bbb
Jiri Stransky [Wed, 24 May 2017 10:21:47 +0000 (12:21 +0200)]
Fix race condition between docker-puppet and container steps
GenerateConfigDeployment wasn't anchored with dependencies anywhere. If
it took too long to complete and step 1 of containers creation already
started executing, problems happened. This is now fixed by adding the
required dependency relationship.
Change-Id: Ie7dfd2a965e704ba278d4c2fad67f14a3a62799e
Closes-Bug: #
1692503
Jenkins [Wed, 24 May 2017 09:33:17 +0000 (09:33 +0000)]
Merge "Role Specific paramaeter support for neutron-ovs-dpdk-agent service"
Jenkins [Tue, 23 May 2017 15:58:48 +0000 (15:58 +0000)]
Merge "Remove osd_pool_default_min_size to allow Ceph cluster to do the right thing by default"
Jenkins [Tue, 23 May 2017 14:31:09 +0000 (14:31 +0000)]
Merge "docker/TLS-everywhere: Add metadata_settings output to templates"
Jenkins [Tue, 23 May 2017 10:21:23 +0000 (10:21 +0000)]
Merge "Example environment file to use L2GW Neutron Driver with ODL"
Jenkins [Tue, 23 May 2017 10:01:47 +0000 (10:01 +0000)]
Merge "Disable mongodb by default"
Jenkins [Tue, 23 May 2017 00:09:56 +0000 (00:09 +0000)]
Merge "Updated from global requirements"
Jenkins [Tue, 23 May 2017 00:08:28 +0000 (00:08 +0000)]
Merge "Use disabled suffix for disabled service names"
Keith Schincke [Fri, 12 May 2017 12:12:56 +0000 (08:12 -0400)]
Remove osd_pool_default_min_size to allow Ceph cluster to do the right thing by default
The default value is 0 which has the minimum number be caluclated based on the replica count
from osd_pool_defaut_size. The default replica count is 3 and the calculated min_size is 2.
If the replica count is 1 then the min_size is 1. ie: min_size = replica - (replica/2)
Add CephPoolDefaultSize parameter to ceph-mon.yaml. This parameter defaults to 3 but can
be overriden. See puppet-ceph-devel.yaml for an example
Change-Id: Ie9bdd9b16bcb9f11107ece614b010e87d3ae98a9
OpenStack Proposal Bot [Mon, 22 May 2017 15:58:04 +0000 (15:58 +0000)]
Updated from global requirements
Change-Id: I468f654fa75b22aef398e2cba9c3625eb8f0767c
Juan Antonio Osorio Robles [Mon, 22 May 2017 14:35:56 +0000 (17:35 +0300)]
docker/TLS-everywhere: Add metadata_settings output to templates
This is needed since it's what writes the service metadata to the nova
server in order to create the kerberos principals. It worked in a base
controller since the keystone template does have this. But if we would
deploy these services on a separate role, it would break. So this output
is needed.
bp tls-via-certmonger-containers
Change-Id: I3ee8c65d356dcd092a3fbf79041e5c69ef23b721
Ricardo Noriega [Mon, 22 May 2017 14:38:09 +0000 (16:38 +0200)]
Example environment file to use L2GW Neutron Driver with ODL
Agent service is disabled and service_provider is configured
to point to networking-odl
Change-Id: I570d15a092cff66666a74e95dee69f6531a58b22
Signed-off-by: Ricardo Noriega <rnoriega@redhat.com>
Jenkins [Mon, 22 May 2017 13:22:05 +0000 (13:22 +0000)]
Merge "Re-Add ceilometer expirer to roles_data"
Jenkins [Mon, 22 May 2017 12:15:30 +0000 (12:15 +0000)]
Merge "Add Neutron L2 Gateway service to scenario 004"
Juan Antonio Osorio Robles [Fri, 19 May 2017 11:35:39 +0000 (14:35 +0300)]
Disable mongodb by default
It's not used by any service that we enable by default. So instead, I
added it to the environment that enables the services that use it.
Change-Id: Id2e6550fb7c319fc52469644ea022cf35757e0ce
Juan Antonio Osorio Robles [Mon, 22 May 2017 08:32:05 +0000 (11:32 +0300)]
Use disabled suffix for disabled service names
This changes both the service names and the file names for disabled
services, adding the 'disabled' suffix to them.
This comes with the reasoning that, if a service requires a disabled
service, and checks for the name in the "service_names" hiera entry, it
will appear as if the service was enabled, when it's actually not. So
changing the name and using this convention prevents that issue.
Change-Id: I308d6680a4d9b526f22ba0d7d20e5db638aadb9a
Jenkins [Mon, 22 May 2017 07:56:00 +0000 (07:56 +0000)]
Merge "TLS everywhere: configure mongodb's TLS settings"
Juan Antonio Osorio Robles [Mon, 22 May 2017 07:13:53 +0000 (10:13 +0300)]
Re-Add ceilometer expirer to roles_data
Even though this service was disabled by default in Pike[1], we still
want the entry in roles_data since it will actually disable the service
on upgrade.
A comment was added so we remember to remove it in Queens.
[1] Icffb7d1bb2cf7bd61026be7d2dcfbd70cd3bcbda
Change-Id: I2012d7494207bf3239f589bf80b8048abf72428f
Carlos Camacho [Fri, 12 May 2017 07:59:48 +0000 (09:59 +0200)]
Add Neutron L2 Gateway service to scenario 004
This submission installs the Neutron L2 Gateway service
in the scenario 004.
This is only to check that the service is installed correctly
no sanity check is running yet.
Change-Id: I421802e9aa1a9f192860a6d72b4bb7c729666c3a
Jenkins [Sat, 20 May 2017 02:57:49 +0000 (02:57 +0000)]
Merge "Open ports 443 and 80 on haproxy's firewall when horizon is standalone"
Jenkins [Sat, 20 May 2017 01:15:08 +0000 (01:15 +0000)]
Merge "Comment parameters for registry in docker.yaml"
Jenkins [Sat, 20 May 2017 00:20:29 +0000 (00:20 +0000)]
Merge "Support Redfish hardware in the overcloud Ironic"
Jenkins [Sat, 20 May 2017 00:18:51 +0000 (00:18 +0000)]
Merge "Add IronicInspector settings to the network map"
Jenkins [Sat, 20 May 2017 00:18:44 +0000 (00:18 +0000)]
Merge "Dell SC: Add secondary DSM support"
Jenkins [Sat, 20 May 2017 00:08:35 +0000 (00:08 +0000)]
Merge "Consolidate writing json configs with HostPrepTasks"
Jenkins [Sat, 20 May 2017 00:08:24 +0000 (00:08 +0000)]
Merge "Add missing release note for cadf environment"
Jenkins [Sat, 20 May 2017 00:07:38 +0000 (00:07 +0000)]
Merge "Update the template_version alias for all the templates to pike."
Jenkins [Fri, 19 May 2017 19:40:14 +0000 (19:40 +0000)]
Merge "Make sure that manila share is created after share type"
Jenkins [Fri, 19 May 2017 10:33:00 +0000 (10:33 +0000)]
Merge "Add containerized neutron-metadata agent"
Saravanan KR [Wed, 15 Mar 2017 17:59:41 +0000 (23:29 +0530)]
Role Specific paramaeter support for neutron-ovs-dpdk-agent service
Merge the role specific parmaeter with the default parameter with the
higher precendece given to role specific parameters. Use the merged
settings to the hiera config settings.
Change-Id: I500558dfbf4ac4ddcf850064e654c4fab03d141b
Carlos Camacho [Fri, 17 Feb 2017 10:12:36 +0000 (11:12 +0100)]
Update the template_version alias for all the templates to pike.
Master is now the development branch for pike
changing the release alias name.
Change-Id: I938e4a983e361aefcaa0bd9a4226c296c5823127
Jan Provaznik [Fri, 19 May 2017 07:28:00 +0000 (09:28 +0200)]
Make sure that manila share is created after share type
The pingtest template creates both default share type and
a share which should use this type. Explicit reference of
the share type should assure that the share is always created
when share type exists.
Change-Id: I756e6a8e477de8d0e46302dda26265ae482dd2e5
Closes-Bug: #
1691853
Jenkins [Fri, 19 May 2017 06:52:31 +0000 (06:52 +0000)]
Merge "Add l2gw neutron agent support"
Jenkins [Thu, 18 May 2017 23:14:45 +0000 (23:14 +0000)]
Merge "neutron: set enable_dvr = False if NeutronEnableDVR is false"
Jenkins [Thu, 18 May 2017 18:34:35 +0000 (18:34 +0000)]
Merge "Enable splay for os-collect-config"
Ihar Hrachyshka [Mon, 15 May 2017 20:20:25 +0000 (13:20 -0700)]
neutron: set enable_dvr = False if NeutronEnableDVR is false
This will make neutron-server stop advertising dvr extension if the
cloud is not configured to support this flavor of Neutron routers.
Change-Id: I38c8208edff07f7887887918729beb7710068078
Related-Bug: #
1450067
Brent Eagles [Tue, 16 May 2017 18:25:46 +0000 (15:55 -0230)]
Add containerized neutron-metadata agent
This patch adds support for running the neutron metadata agent in a
container.
Change-Id: I53c62516c95d62f5ced70818d4eb4c2c341df0d7
Partial-Bug: #
1668922
Jenkins [Thu, 18 May 2017 13:19:27 +0000 (13:19 +0000)]
Merge "TLS-everywhere: Configure CA for apache"
Jenkins [Thu, 18 May 2017 11:15:32 +0000 (11:15 +0000)]
Merge "Default snmp to less verbose logging"
Steven Hardy [Thu, 18 May 2017 09:53:10 +0000 (10:53 +0100)]
Comment parameters for registry in docker.yaml
These duplicate the defaults in puppet/services/docker.yaml and
break things if you include an environment file (e.g that generated
by quickstart containers-default-parameters.yaml) before the
docker.yaml.
Instead it's probably more helpful to include the commented lines
showing how to enable use of a local docker registry.
Change-Id: I3896fa2ea7caa603186f0af04f6d8382d50dd97a
Closes-Bug: #
1691524
Peng Liu [Tue, 14 Mar 2017 06:39:35 +0000 (14:39 +0800)]
Add l2gw neutron agent support
L2 Gateway (L2GW) is an API framework for OpenStack that offers bridging
two or more networks together to make them look at a single broadcast
domain. This patch implements the l2gw agent which is one of the backend
of the l2 gateway service plugin.
Change-Id: I1ae8132ceff9410be7bd82caddf0d14251e720bf
Depends-On: If1501c153b1b170b9550cb7e5a23be463fba1fe9
Partially-Implements: blueprint l2gw-service-integration
Signed-off-by: Peng Liu <pliu@redhat.com>
Jenkins [Thu, 18 May 2017 00:05:13 +0000 (00:05 +0000)]
Merge "Use upper-constraints for tox"
Jenkins [Wed, 17 May 2017 17:39:30 +0000 (17:39 +0000)]
Merge "docker/internal TLS: spawn extra container for neutron server's TLS proxy"
Jenkins [Wed, 17 May 2017 17:13:22 +0000 (17:13 +0000)]
Merge "Don't delete failed docker-puppet containers"
Alex Schultz [Wed, 17 May 2017 17:01:07 +0000 (11:01 -0600)]
Use upper-constraints for tox
Use the openstack upper-constraints when running tox.
Change-Id: I9eef36eec749beec0effdb2309fe2ceb9bc557f8
Related-Bug: #
1691511
Jenkins [Wed, 17 May 2017 15:37:49 +0000 (15:37 +0000)]
Merge "Only set apache certificates if TLS everywhere is enabled"
Steven Hardy [Mon, 10 Apr 2017 15:16:29 +0000 (16:16 +0100)]
Consolidate writing json configs with HostPrepTasks
We already have an ansible deployment that applies the per-service
host_prep_tasks, so we can simplify the dependencies here by just
doing the docker-steps host preparation at the same time.
The motivation behind this is to both simplify the depends_on web we
have here, reduce the number of discrete deployments, and also to
potentially make running ansible directly e.g for debugging easier.
In a future patch we'll convert the configuration steps to work in
a similar way, such that they can be more easily reapplied e.g for
rolling minor updates, possibly outside of heat.
Change-Id: I9a201fc5a9e82c7fba4c2de36eb5332e21a81d37
Jenkins [Wed, 17 May 2017 13:32:55 +0000 (13:32 +0000)]
Merge "Containerize Ceilometer Agents"
Jenkins [Wed, 17 May 2017 11:09:25 +0000 (11:09 +0000)]
Merge "Use neutron-server image for neutron services"
Juan Antonio Osorio Robles [Tue, 16 May 2017 13:38:35 +0000 (16:38 +0300)]
TLS-everywhere: Configure CA for apache
This tells apache which CA certificate was used to sign the certs it's
using. this setting is useful in case we want to enable OCSP stapling or
client authentication via TLS.
Change-Id: I97a7e5332aea8377c7662ca98beb71ed5e236640
Juan Antonio Osorio Robles [Wed, 17 May 2017 09:24:22 +0000 (12:24 +0300)]
Only set apache certificates if TLS everywhere is enabled
The Apache certs were were being set even if TLS everywhere isn't
enabled. This fixes that.
Change-Id: If143d1fdeb0102a1c13441f89acaa73af24bf48f
Juan Antonio Osorio Robles [Tue, 2 May 2017 13:17:16 +0000 (16:17 +0300)]
TLS everywhere: configure mongodb's TLS settings
This configures the mongodb server to use TLS in the internal network,
while also passing the necessary attributes to generate the needed cert
and key.
bp tls-via-certmonger
Depends-On: I85dda29bcad686372a74bd7f094bfd62777a3032
Change-Id: If6c603b074cfa7e122579cec29d034fd3312868d
Steve Baker [Tue, 16 May 2017 04:39:05 +0000 (04:39 +0000)]
Don't delete failed docker-puppet containers
This helps a bit with debugging issues, and the container will be
deleted on the next run when the same volume is configured.
Change-Id: I4f2f219bd7e40abafd0eb31c1275fdd8ed4db4da
Jenkins [Wed, 17 May 2017 01:34:55 +0000 (01:34 +0000)]
Merge "Add params to manage and configure pipeline publisher"
Jenkins [Tue, 16 May 2017 22:07:59 +0000 (22:07 +0000)]
Merge "Fix absolute paths in scenario001-multinode.yaml"
Jenkins [Tue, 16 May 2017 19:23:02 +0000 (19:23 +0000)]
Merge "Optimize kernel neighbour table for large scale environments"
Pradeep Kilambi [Thu, 6 Apr 2017 18:05:41 +0000 (14:05 -0400)]
Containerize Ceilometer Agents
Depends-on: I30ba93f76171e5993b5f0e1d7f1f5533acb25740
Closes-bug: #
1668925
Change-Id: I3cb61d2d8765f9c2601bb00c4bfa24162883b96a
Juan Antonio Osorio Robles [Fri, 12 May 2017 08:44:47 +0000 (08:44 +0000)]
docker/internal TLS: spawn extra container for neutron server's TLS proxy
This spawns an extra container that runs httpd to run the TLS proxy that
will go in front of neutron server.
bp tls-via-certmonger-containers
Change-Id: I2529d78e889835f48c51e12d28ecd7c48739b02b
Juan Antonio Osorio Robles [Fri, 12 May 2017 12:56:13 +0000 (12:56 +0000)]
Use neutron-server image for neutron services
For TLS everywhere, neutron-server needs httpd in the image, since
it'll use a separate container that runs a TLS proxy to terminate
the connection. This requires the image where the configuration is
ran to have httpd installed, since there are several directories
and the user/group that's needed.
So, we then switch the image to be used to be neutron-server instead
of the openvswitch-agent image.
Change-Id: Ie16de3004925b7624f106d6c015ec04ef6031a06
Depends-On: I82f10ac0e7e692e6ba4a06dc10da9eaf79c60e7e
Or Idgar [Thu, 11 May 2017 08:32:17 +0000 (08:32 +0000)]
Optimize kernel neighbour table for large scale environments
Changing the default values of neighbor table (also known as ARP table)
in the kernel to avoid neighbour table overflow and thus fix
communication errors between overcloud nodes.
default kernel values support L2 network up to 1024 hosts (/22).
The patch will allow up to 4096 hosts (/20).
Change-Id: I5fabc766dd75a38cd3d835deee7e168f04dd30ce
Closes-Bug: #
1690087
Christian Schwede [Tue, 16 May 2017 06:54:55 +0000 (08:54 +0200)]
Fix resource type in ObjectStorage role
The currently used resource type does not exist, therefore changing it.
Closes-Bug:
1691021
Change-Id: Iaf18af546817e0cf6cdfafcc5c54ab4d1a0f819d
Martin André [Mon, 15 May 2017 17:06:09 +0000 (19:06 +0200)]
Add missing type for RoleParameters parameter
This was forgotten in I72376a803ec6b2ed93903cc0c95a6ffce718b6dc and
broke containerized deployment.
Change-Id: I599a87bf06efbfefd3067c77ed6ca866505900f9
Closes-Bug: #
1690870
Jenkins [Mon, 15 May 2017 14:51:41 +0000 (14:51 +0000)]
Merge "Disable ComputeNeutron* for cisco-nexus-ucsm"
Steven Hardy [Mon, 15 May 2017 14:29:39 +0000 (10:29 -0400)]
Fix absolute paths in scenario001-multinode.yaml
All paths should be relative as we should not rely on the package
location - this can easily be overridden via --templates, and this
is exactly what we do for the upgrades job, where this will break
because we'll include the wrong (newer) version of these services
when deploying the older pre-upgrade overcloud.
Change-Id: Id8aea09305c0857253c44477945e34377cca64ca
Jenkins [Mon, 15 May 2017 13:44:39 +0000 (13:44 +0000)]
Merge "Update the services README documentation"
Michele Baldessari [Mon, 15 May 2017 09:03:53 +0000 (11:03 +0200)]
Default snmp to less verbose logging
Currently we just use what puppet-snmp provides in terms of defaults.
This means that currently every single snmp query gets logged with
the following:
May 15 10:51:30 centos.localdomain snmpd[5159]: Connection from UDP: [127.0.0.1]:57799->[127.0.0.1]:161
May 15 10:51:30 centos.localdomain snmpd[5159]: Connection from UDP: [127.0.0.1]:57799->[127.0.0.1]:161
May 15 10:51:32 centos.localdomain snmpd[5159]: Connection from UDP: [127.0.0.1]:50566->[127.0.0.1]:161
The reason is that we use '-LS0-6d' as the default content for
/etc/sysconfig/snmpd:
https://github.com/razorsedge/puppet-snmp/blob/master/manifests/params.pp#L322
This default means that we are logging from 0 (LOG_EMERG) to 6
(LOG_INFO). The above messages bring nothing in a default installation
and only spam the log files, so let's lower the upper log level to 5
(LOG_NOTICE) by default, so we properly do not see every single query in
the logs. We add an option so the operator can still configure the
desired log level via a Heat parameter.
Change-Id: I8d3dfdb4d549cd27131346fc477755ad72313449
Jenkins [Mon, 15 May 2017 12:59:05 +0000 (12:59 +0000)]
Merge "Change neutron-metadata number of workers determination method"
Saravanan KR [Mon, 15 May 2017 12:22:18 +0000 (17:52 +0530)]
Update the services README documentation
Service template's parameter documentation has been update by
correcting few of the wrong informations and added more
information with examples.
Change-Id: I2d92fd01cbeb6fdc6f030255dc4b71166509b4f6
Jenkins [Mon, 15 May 2017 11:28:51 +0000 (11:28 +0000)]
Merge "Add role specific information to the service template"
Jenkins [Mon, 15 May 2017 10:28:52 +0000 (10:28 +0000)]
Merge "multinode-container-upgrade.yaml usable for mixed upgrade"
Saravanan KR [Fri, 24 Feb 2017 11:27:58 +0000 (06:27 -0500)]
Add role specific information to the service template
When a service is enabled on multiple roles, the parameters for the
service will be global. This change enables an option to provide
role specific parameter to services and other templates.
Two new parameters - RoleName and RoleParameters, are added to the
service template. RoleName provides the role name of on which the
current instance of the service is being applied on. RoleParameters
provides the list of parameters which are configured specific to the
role in the environment file, like below:
parameters_default:
# Default value for applied to all roles
NovaReservedHostMemory: 2048
ComputeDpdkParameters:
# Applied only to ComputeDpdk role
NovaReservedHostMemory: 4096
In above sample, the cluster contains 2 roles - Compute, ComputeDpdk.
The values of ComputeDpdkParameters will be passed on to the templates
as RoleParameters while creating the stack for ComputeDpdk role. The
parameter which supports role specific configuration, should find the
parameter first in in the RoleParameters list, if not found, then the
default (for all roles) should be used.
Implements: blueprint tripleo-derive-parameters
Change-Id: I72376a803ec6b2ed93903cc0c95a6ffce718b6dc
Jenkins [Fri, 12 May 2017 18:55:34 +0000 (18:55 +0000)]
Merge "docker/internal TLS: spawn extra container for glance API's TLS proxy"
Jenkins [Fri, 12 May 2017 18:53:31 +0000 (18:53 +0000)]
Merge "Deprecate Ceilometer Expirer"
Jenkins [Fri, 12 May 2017 14:07:35 +0000 (14:07 +0000)]
Merge "docker/internal TLS: spawn extra container for swift's TLS proxy"
Juan Antonio Osorio Robles [Fri, 12 May 2017 06:17:04 +0000 (09:17 +0300)]
docker/internal TLS: spawn extra container for glance API's TLS proxy
This spawns an extra container that runs httpd to run the TLS proxy that
will go in front of glance-api.
bp tls-via-certmonger-containers
Change-Id: If902ac732479832b9aa3e4a8d063b5be68a42a9b
Juan Antonio Osorio Robles [Wed, 26 Apr 2017 13:23:25 +0000 (16:23 +0300)]
docker/internal TLS: spawn extra container for swift's TLS proxy
This spawns an extra container that runs httpd to run the TLS proxy that
will go in front of swift.
bp tls-via-certmonger-containers
Depends-On: Ib01137cd0d98e6f5a3e49579c080ab18d8905b0d
Change-Id: I9639af8b46b8e865cc1fa7249bf1d8b1b978adfe
Jenkins [Thu, 11 May 2017 18:41:08 +0000 (18:41 +0000)]
Merge "Disabling replacing fernet keys from puppet"
Jenkins [Thu, 11 May 2017 18:41:01 +0000 (18:41 +0000)]
Merge "Make docker-puppet.sh a static file."
Pradeep Kilambi [Wed, 10 May 2017 15:42:24 +0000 (11:42 -0400)]
Add params to manage and configure pipeline publisher
Change-Id: Ifaa3bb0400ee22601fd8f3e1f2f16192b5f8766b
Pradeep Kilambi [Wed, 10 May 2017 17:09:12 +0000 (13:09 -0400)]
Deprecate Ceilometer Expirer
We dont need expirer unless we have collector and standard
storage enabled. Lets turn it off by default and make it
an optional service. In upgrade scenario, we will kill the
process and stop the expirer, unless explicitly enabled.
Change-Id: Icffb7d1bb2cf7bd61026be7d2dcfbd70cd3bcbda
Jenkins [Thu, 11 May 2017 15:39:42 +0000 (15:39 +0000)]
Merge "Fix paths for optional docker services"
Jenkins [Thu, 11 May 2017 10:50:02 +0000 (10:50 +0000)]
Merge "Make upgrade steps unconditional to fix broken dependencies"
Juan Antonio Osorio Robles [Thu, 11 May 2017 07:45:45 +0000 (10:45 +0300)]
Disabling replacing fernet keys from puppet
Once puppet has written the initial fernet keys, if a deployer wants to
rotate them, the keys will be overwritten when another overcloud deploy
is executed (for instance, for updates or upgrades). This disables
replacing this keys via puppet, so now the operator can rotate the keys
out of band.
Change-Id: I01fd46ba7c5e0db12524095dc9fe29e90cb0de57
Jenkins [Wed, 10 May 2017 23:46:09 +0000 (23:46 +0000)]
Merge "Add networking-vpp ML2 mechanism driver support"
Pradeep Kilambi [Wed, 10 May 2017 21:25:49 +0000 (17:25 -0400)]
Fix paths for optional docker services
Change-Id: I3583a9a3bb04df2aebf06a566a2bdc4afdbfc9f3
Jenkins [Wed, 10 May 2017 17:32:22 +0000 (17:32 +0000)]
Merge "Use httpd in Zaqar docker service"
Yolanda Robla [Tue, 7 Mar 2017 14:59:30 +0000 (15:59 +0100)]
Add missing release note for cadf environment
A previous change was enabling cadf environment on TripleO,
but missed release notes. Adding that as a follow up.
Change-Id: I5e5a5267707537ae7c78685dc3d371ae5f80f4aa
Or Idgar [Wed, 10 May 2017 09:50:51 +0000 (09:50 +0000)]
Change neutron-metadata number of workers determination method
neutron-metadata number of workers will be taken from NeutronWorkers parameter
if not empty. when empty, all keys related to NeutronWorkers value will be
set with empty dictionary instead empty string ({}).
Change-Id: I18347639c188bbf085e2f3c739465e52c94b9d77
Closes-bug: #
1689571
Jiri Stransky [Thu, 4 May 2017 16:26:18 +0000 (18:26 +0200)]
multinode-container-upgrade.yaml usable for mixed upgrade
We need Docker service mapping defined and set to OS::Heat::None so that
we can reuse multinode-container-upgrade.yaml service list both for
initial deployment and for the upgrade. The upgrade will not be broken
by this as its env files are being passed later on the command line, and
they'll take priority and effectively enable the Docker service on
upgrade.
Another change we need for mixed upgrade is to add the TripleoPackages
service, which will take care of updating RPMs on the bare metal and
prevent docker installation from failing with outdated
puppet-tripleo ("Could not find class ::tripleo::profile::base::docker").
Related-Bug: #
1685795
Closes-Bug: #
1689772
Change-Id: Idb6917f22d0e9f74f8853972c6a08bffb01be410
Jenkins [Wed, 10 May 2017 08:19:23 +0000 (08:19 +0000)]
Merge "Containers: Bind mount directories with the key/certs for heat"
Steve Baker [Fri, 5 May 2017 00:25:32 +0000 (12:25 +1200)]
Make docker-puppet.sh a static file.
Variables are now passed in with --env in the docker run call.
This will allow docker-puppet.sh to be baked into the image instead of
having it as a custom entrypoint.
Change-Id: Icbaefe033becc6b2226535f28ee202917bdc1074
Dan Prince [Wed, 3 May 2017 12:29:49 +0000 (08:29 -0400)]
Use httpd in Zaqar docker service
Move the Zaqar WSGI service to use httpd in docker deployment.
Depends-On: I35cfd1c2320eb972890b44668c8f9f0a047a65dc
Change-Id: I56a6469a9179b5c023738f447e7665d0d3c73d0b
Co-Authored-By: Martin André <m.andre@redhat.com>
Co-Authored-By: Thomas Herve <therve@redhat.com>
Jiri Stransky [Tue, 9 May 2017 13:48:54 +0000 (15:48 +0200)]
Make upgrade steps unconditional to fix broken dependencies
Change I5c8b0c4abfc0607f42fd3f2da9f5ef2702b1bbe1 introduced conditions
to optimize upgrade times and fix related bugs. Unfortunately the
conditional inclusion would have to be paired with support in depends_on
to work as we need. Currently we can hit this bug if the batch upgrade
steps are undefined for some role, but upgrade steps are definied:
The specified reference "ControllerUpgradeBatch_Step2" (in
ControllerUpgradeConfig_Step0) is incorrect.
To fix this we have to make the steps unconditional. This isn't fully
reverting the original change because that change also addressed
ordering issues.
Change-Id: I369591f4757c10142f5b455e64aa778e1a9a5611
Closes-Bug: #
1689553
Juan Antonio Osorio Robles [Mon, 8 May 2017 09:38:16 +0000 (09:38 +0000)]
Containers: Bind mount directories with the key/certs for heat
This is only done when TLS-everywhere is enabled, and depends on those
directories being exclusive for services that run over httpd.
bp tls-via-certmonger-containers
Change-Id: I194c33992c7f3628f7858ecf5e472ecfdee969ed
Bogdan Dobrelya [Mon, 8 May 2017 08:27:50 +0000 (10:27 +0200)]
Add syslog socket to common containers volumes
Partial blueprint containerized-services-logs
Change-Id: Idbf1884226503aca9072b12d050500af407973cf
Signed-off-by: Bogdan Dobrelya <bdobreli@redhat.com>
Jenkins [Sun, 7 May 2017 21:04:14 +0000 (21:04 +0000)]
Merge "Set puppet-redis managed_by_cluster_manager to true"
Jenkins [Sat, 6 May 2017 19:51:02 +0000 (19:51 +0000)]
Merge "Use the make_url function to build URLs"
Michele Baldessari [Fri, 5 May 2017 10:37:01 +0000 (12:37 +0200)]
Set puppet-redis managed_by_cluster_manager to true
Via https://github.com/arioch/puppet-redis/pull/192 puppet-redis grew
ulimit support also for pacemaker managed redis instances. To be able to
use that we need to set redis::managed_by_cluster_manager to true.
We also allow redis::ulimit to be configurable and we set a default of
10420 which was the default value before the above change.
Change-Id: I06129870665d7d3bfa09057fd9f0a33a99f98397
Depends-On: I4ffccfe3e3ba862d445476c14c8f2cb267fa108d
Closes-Bug: #
1688464
Jenkins [Fri, 5 May 2017 20:16:19 +0000 (20:16 +0000)]
Merge "Fix up pacemaker_status test in yum_update.sh"