Steven Hardy [Wed, 31 May 2017 10:22:49 +0000 (11:22 +0100)]
Convert role templates to consume roles_data map
Currently we only consume the name with a special-case
for the disable constraints boolean, but it will be more
flexible if we consume the whole roles_data mapping for
each role, so that e.g composable networks and other
per-role customizations can be expressed in these
templates
Partially-Implements: blueprint composable-networks
Depends-On: Id1249b78b3dd87e91d572ffa31b7a541f3cde2c7
Change-Id: I355534ec456479944f66106e957404a660d8f2d2
Jenkins [Tue, 4 Jul 2017 04:35:00 +0000 (04:35 +0000)]
Merge "Make ceilometer crontab removal idempotent"
Jenkins [Mon, 3 Jul 2017 12:16:29 +0000 (12:16 +0000)]
Merge "Add ServerIdMap output"
Jenkins [Mon, 3 Jul 2017 09:47:32 +0000 (09:47 +0000)]
Merge "adding --config-dir parameters to neutron containers"
Jenkins [Sun, 2 Jul 2017 15:16:58 +0000 (15:16 +0000)]
Merge "Move glance::api::show_multiple_locations within GlanceApi"
Or Idgar [Thu, 22 Jun 2017 14:57:03 +0000 (14:57 +0000)]
adding --config-dir parameters to neutron containers
Change-Id: I521e89994e9be6efd335c5809810d9188dc1742f
Closes-Bug: #
1684908
Jenkins [Fri, 30 Jun 2017 21:48:12 +0000 (21:48 +0000)]
Merge "Re-enable default for RoleParameters"
Jenkins [Fri, 30 Jun 2017 21:40:38 +0000 (21:40 +0000)]
Merge "Fix typo in config_volume"
Jenkins [Fri, 30 Jun 2017 19:52:41 +0000 (19:52 +0000)]
Merge "Make NovaWorkers descriptions consistent"
Jenkins [Fri, 30 Jun 2017 14:04:31 +0000 (14:04 +0000)]
Merge "cisco nexus: keep OVS on the Compute"
Jenkins [Fri, 30 Jun 2017 13:44:59 +0000 (13:44 +0000)]
Merge "Ensure boostrap_host_exec runs as root"
Jenkins [Fri, 30 Jun 2017 13:43:35 +0000 (13:43 +0000)]
Merge "scenario001: containerize services for CI"
Jenkins [Fri, 30 Jun 2017 11:18:43 +0000 (11:18 +0000)]
Merge "Add a docker-ha.yaml environment file for containerized HA deployments"
Jenkins [Fri, 30 Jun 2017 08:36:53 +0000 (08:36 +0000)]
Merge "Force mtime for tar used in container config md5sums"
Jenkins [Fri, 30 Jun 2017 08:35:46 +0000 (08:35 +0000)]
Merge "Add stack_name/ctlplane_service_ips into post-upgrade.j2.yaml"
Martin André [Wed, 28 Jun 2017 15:10:27 +0000 (17:10 +0200)]
Ensure boostrap_host_exec runs as root
This is necessary for accessing the bind mounted hieradata in the
container in order to determine if the node is the primary node.
With the new validation added to yaml-validate.py, we could spot
potential issues in sahara-api and keystone bootstrap tasks.
The keystone one is a false positive, as the image defaults to the root
user in order to be able to run apache. Still, it is better to be
consistent here and specify the root user nonetheless.
Change-Id: Ib0ff9748d5406f507261e506c19b96750b10e846
Closes-Bug: #
1697917
Sven Anderson [Tue, 20 Jun 2017 12:53:34 +0000 (14:53 +0200)]
Fix typo in config_volume
Change-Id: I6a53a56c534f24cb514d8aeb8cec3d7865b93448
Jenkins [Fri, 30 Jun 2017 04:12:32 +0000 (04:12 +0000)]
Merge "Add missing xinetd/rsync container for Swift"
Jenkins [Fri, 30 Jun 2017 03:52:38 +0000 (03:52 +0000)]
Merge "Add detach to docker-toool"
Jenkins [Fri, 30 Jun 2017 03:00:31 +0000 (03:00 +0000)]
Merge "Add README to ci/environments directory"
Jenkins [Fri, 30 Jun 2017 01:08:40 +0000 (01:08 +0000)]
Merge "Add release note for generated sample environments"
Jenkins [Fri, 30 Jun 2017 01:08:33 +0000 (01:08 +0000)]
Merge "Remove ceilometer upgrade from other ceilometer containers"
Jenkins [Thu, 29 Jun 2017 20:12:59 +0000 (20:12 +0000)]
Merge "Add heat parameter for all of config_volume images"
Gonéri Le Bouder [Wed, 21 Jun 2017 19:00:27 +0000 (15:00 -0400)]
cisco nexus: keep OVS on the Compute
The Cisco Nexus-UCSM environment relies on OVS for the communication
with compute nodes. This is a partial revert of
I4c98008107568b3b65decd7640e25c7d2b1ea9ff.
Change-Id: I453d4bc83314a76fd779884fb2f8cd1731d2bcaa
Related-Bug: #
1687597
Steven Hardy [Thu, 29 Jun 2017 16:48:46 +0000 (17:48 +0100)]
Add stack_name/ctlplane_service_ips into post-upgrade.j2.yaml
Upgrades are broken because this was missed from
I36a642fbc2076ad9e4a10ffc56d6d16f3ed6f27a and
Ia619ab935c66081769e69c53d1ca41925d86abbb
Change-Id: I96590e2219df64b94dfecd91d5e25231fc7e514b
Related-Bug: #
1700755
Steven Hardy [Thu, 29 Jun 2017 16:05:31 +0000 (17:05 +0100)]
Force mtime for tar used in container config md5sums
The checksum is changing each run because the mtime is different, so force
a specific date such that we only compare the directory contents.
Change-Id: I5ed2b50176f902d7af12b96e650b67b736d59a4a
Jiri Stransky [Thu, 29 Jun 2017 12:25:21 +0000 (14:25 +0200)]
Make ceilometer crontab removal idempotent
When we re-execute an upgrade and the crontab has already been
removed, the crontab removal returns 1, saying "no crontab for
ceilometer", and the upgrade fails. This change makes the removal
idempotent.
Change-Id: Ic955fb67bb2f7afde44291f7db3293c88f167566
Closes-Bug: #
1701250
Emilien Macchi [Thu, 22 Jun 2017 20:24:27 +0000 (16:24 -0400)]
scenario001: containerize services for CI
Change-Id: I4308032891f0f9f5e93159f4a7ca29dada5850be
Jenkins [Thu, 29 Jun 2017 11:30:40 +0000 (11:30 +0000)]
Merge "Enable nova-api to run over httpd again"
Steven Hardy [Wed, 28 Jun 2017 20:41:29 +0000 (21:41 +0100)]
Add ServerIdMap output
This exposes the nova server IDs for each role, and the bootstrap node
so that we can add this data to the tripleo dynamic ansible inventory
Change-Id: I2fc48eec77210805c0139fa4abcbf4dd721e7c37
Jenkins [Thu, 29 Jun 2017 05:09:41 +0000 (05:09 +0000)]
Merge "Default docker-puppet.py logging to INFO"
Jenkins [Wed, 28 Jun 2017 18:11:34 +0000 (18:11 +0000)]
Merge "Disable swift middleware ceilometer pipeline by default"
Pradeep Kilambi [Wed, 28 Jun 2017 16:22:37 +0000 (12:22 -0400)]
Remove ceilometer upgrade from other ceilometer containers
Lets just run the ceilometer upgrade once in central agent container
Change-Id: If5e5ca6122f8583c6221bc6b343e483e41f04d29
Closes-bug: #
1700056
Juan Antonio Osorio Robles [Wed, 14 Jun 2017 09:22:50 +0000 (12:22 +0300)]
Enable nova-api to run over httpd again
This is needed for TLS everywhere.
Change-Id: Iac35b7ddcd8a800901548c75ca8d5083ad17e4d3
Depends-On: I426bfdb9e6c852eb32d10a12e521bb8b47701c41
Dan Prince [Mon, 26 Jun 2017 13:53:31 +0000 (09:53 -0400)]
Default docker-puppet.py logging to INFO
If you want debug logging you can set the new DockerPuppetDebug
heat parameter to 'True'.
Change-Id: Iae7bb67379351ea15d61c331867d7005f07ba98e
Closes-bug:
1700570
Pradeep Kilambi [Fri, 23 Jun 2017 14:37:24 +0000 (10:37 -0400)]
Disable swift middleware ceilometer pipeline by default
This generates tons of unnecessary events when gnocchi uses swift backend.
We end up filtering most of these anyway. So lets disable this so it
doesn't put useless load. Also changing the default project to service as
thats what gnocchi uses to authenticate with swift.
Closes-bug: #
1693339
Change-Id: I40f47d46fdb06f31a739b590bf653bca71e33f61
Christian Schwede [Tue, 6 Jun 2017 14:12:09 +0000 (16:12 +0200)]
Add missing xinetd/rsync container for Swift
Swift object replication relies on the rsync server, which is run by
xinetd. This patch adds the missing container and configuration. Note
that xinetd needs bind to a privileged port (873) and has to be started
as root therefore.
Change-Id: I7655c9dd116c0130035d8a2fae81148171ae6448
Martin André [Fri, 23 Jun 2017 16:21:43 +0000 (18:21 +0200)]
Add heat parameter for all of config_volume images
This commit consistently defines a heat template parameter in the form
of DockerXXXConfigImage where XXX represents the name of the
config_volume that is used by docker-puppet.
The goal is to mitigate hard to debug errors where the templates would
set different defaults for the image docker-puppet.py uses to run, for
the same config_volume name.
This fixes a couple of inconsistencies on the way.
Change-Id: I212020a76622a03521385a6cae4ce73e51ce5b6b
Closes-Bug: #
1699791
Jiri Stransky [Wed, 28 Jun 2017 08:44:01 +0000 (10:44 +0200)]
Add ctlplane_service_ips param to upgrade steps
Upgrades were broken because of this missing parameter.
Change-Id: Ia88a9833ab8aa26ccc40ee235b8554c9a7fbd22d
Closes-Bug: #
1700923
Jenkins [Tue, 27 Jun 2017 23:20:55 +0000 (23:20 +0000)]
Merge "Add docker templates for octavia services"
Jenkins [Tue, 27 Jun 2017 23:00:30 +0000 (23:00 +0000)]
Merge "Add Ceph configuration with PoolDefaultSize 1"
Jenkins [Tue, 27 Jun 2017 22:58:00 +0000 (22:58 +0000)]
Merge "Allow stack_name into major_upgrade_steps.yaml"
Jenkins [Tue, 27 Jun 2017 22:29:20 +0000 (22:29 +0000)]
Merge "Add validation check for divergent parameter definitions"
Ben Nemec [Tue, 27 Jun 2017 19:47:55 +0000 (14:47 -0500)]
Add README to ci/environments directory
Let's be clear that the contents of this directory are for ci use
only and should not be used in production.
Change-Id: I3b448b9922c207b29cbdae36ee876368bda23dac
Sagi Shnaidman [Tue, 27 Jun 2017 18:54:20 +0000 (21:54 +0300)]
Add Ceph configuration with PoolDefaultSize 1
Add Ceph pool size configuration for CI where PoolDefaultSize is 1
Change-Id: I626d1398e31c3fcb9f100a8b185d71ba5909034a
Jenkins [Tue, 27 Jun 2017 18:09:44 +0000 (18:09 +0000)]
Merge "Add non-ha env file."
Jenkins [Tue, 27 Jun 2017 18:09:24 +0000 (18:09 +0000)]
Merge "Adds service for OVS and enables ODL DPDK deployments"
Ben Nemec [Tue, 27 Jun 2017 16:38:26 +0000 (11:38 -0500)]
Re-enable default for RoleParameters
I471037de35e7f349d900462ec3ffb16fe2d6ebd9 accidentally removed the
default from the RoleParameters parameter. This change just puts
it back.
Change-Id: I29b472897e07229715fc2fea3b55e90473eb0069
Ben Nemec [Mon, 26 Jun 2017 22:09:24 +0000 (17:09 -0500)]
Make NovaWorkers descriptions consistent
Partial-Bug:
1700664
Change-Id: I12ee7ab825069c1741438499f8df835014afc37f
Ben Nemec [Mon, 26 Jun 2017 21:58:13 +0000 (16:58 -0500)]
Add validation check for divergent parameter definitions
Many of our parameters are defined in multiple templates, but
currently there is no easy way of checking that all of those
definitions match. It can be confusing when a parameter is defined
one way in one file and another way in a different file. For example,
the NovaWorkers description is:
Number of workers for Nova API service.
and
Number of workers for Nova Placement API service.
and
Number of workers for Nova Conductor service.
Which is it actually? All of them. That one parameter controls
the workers for all of the nova services, and its description should
reflect that, no matter which template you happen to look at.
This change adds a check to yaml-validate.py to catch these sorts of
inconsistencies and allow us to eventually prevent new ones from
getting into the templates.
An exclusion mechanism is included because there are some parameter
definitions we probably can't/shouldn't change. In particular, this
includes the network cidrs which are defaulted to ipv4 addresses in
the ipv4 net-iso templates and ipv6 in the ipv6 templates. It's
possible a user would be relying on one of those defaults in their
configuration, so if we change it they might break.
To get around that, the tool explicitly ignores the default field of
those parameters, while still checking the description and type fields
so we maintain some sanity. There may be other parameters where this
is an issue, but those can be added later as they are found.
For the moment any inconsistencies are soft-fails. A failure message
will be printed, but the return value will not be affected so we can
add the tool without first having to fix every divergent parameter
definition in tripleo-heat-templates (and there appear to be plenty).
This will allow us to gradually fix the parameters over time, and
once that is done we can make this a hard-fail.
Change-Id: Ib8b2cb5e610022d2bbcec9f2e2d30d9a7c2be511
Partial-Bug:
1700664
Giulio Fidente [Tue, 27 Jun 2017 15:30:24 +0000 (17:30 +0200)]
Allow stack_name into major_upgrade_steps.yaml
On upgrade we map PostDeploySteps to a different implementation
which we missed to update in I36a642fbc2076ad9e4a10ffc56d6d16f3ed6f27a
Change-Id: Ia619ab935c66081769e69c53d1ca41925d86abbb
Closes-Bug: #
1700755
Jenkins [Tue, 27 Jun 2017 10:04:14 +0000 (10:04 +0000)]
Merge "Provides a list of per-service ctlplane IPs to the workflows env"
Jenkins [Tue, 27 Jun 2017 06:01:25 +0000 (06:01 +0000)]
Merge "Add flag to enable/disable the HAProxy stats interface"
Jenkins [Tue, 27 Jun 2017 02:30:00 +0000 (02:30 +0000)]
Merge "Allows use of Mistral workflows during deployment steps"
Jenkins [Tue, 27 Jun 2017 02:25:22 +0000 (02:25 +0000)]
Merge "Enable DPDK on boot using PreNetworkConfig"
Jenkins [Mon, 26 Jun 2017 23:59:14 +0000 (23:59 +0000)]
Merge "Add VipMap output"
Jenkins [Mon, 26 Jun 2017 23:59:05 +0000 (23:59 +0000)]
Merge "Add split-stack environments"
Jenkins [Mon, 26 Jun 2017 23:58:58 +0000 (23:58 +0000)]
Merge "Add DeploymentSwiftDataMap parameter"
Jenkins [Mon, 26 Jun 2017 23:58:51 +0000 (23:58 +0000)]
Merge "Add os-collect-config data as an output"
Jenkins [Mon, 26 Jun 2017 18:25:35 +0000 (18:25 +0000)]
Merge "Fix descriptions on bonding templates"
Giulio Fidente [Wed, 24 May 2017 16:45:59 +0000 (18:45 +0200)]
Provides a list of per-service ctlplane IPs to the workflows env
Adds in the execution environment of the workflow steps a list of
per-service network IPs. This can be used by the workflows to
execute actions against the nodes hosting a given service.
Change-Id: Id7c735d53f04f6ad848b2f9f1adaa3c84ecd2fcd
Implements: blueprint tripleo-ceph-ansible
Giulio Fidente [Sat, 6 May 2017 00:19:47 +0000 (02:19 +0200)]
Allows use of Mistral workflows during deployment steps
Introduces a general mechanism meant to allow for the execution
of workflows during the deployment steps.
Services can define workflow actions to be triggered during a step
in the newly added service_workflow_tasks section. The syntax is:
service_workflow_tasks:
step2:
- name: my_action_name
action: std.echo
input:
output: 'hello world'
Implements: blueprint tripleo-ceph-ansible
Depends-On: If02799e7457ca017cc119317dfb2db7198a3559f
Depends-On: Ibc5707f9f06266fe84ad1dd91dcb984157871d30
Change-Id: I36a642fbc2076ad9e4a10ffc56d6d16f3ed6f27a
Carlos Camacho [Mon, 26 Jun 2017 14:18:55 +0000 (16:18 +0200)]
Add non-ha env file.
This environment file will be used to
deploy an Overcloud without the use
of pacemaker.
Change-Id: I3a486d22b30ffdb6053b3d917dea373c1361df81
Jenkins [Mon, 26 Jun 2017 13:18:36 +0000 (13:18 +0000)]
Merge "Make sensu-client log to file"
Steven Hardy [Tue, 23 May 2017 14:19:36 +0000 (15:19 +0100)]
Add docker templates for octavia services
Depends-On: I270f3f6879737fc29370165e4a8fa8c9c19fffb3
Depends-On: I3a169e3321a26ee373ab873426a2d58acbcfe1bd
Closes-Bug: #
1668932
Co-Authored-By: Or Idgar <oidgar@redhat.com>
Co-Authored-By: Brent Eagles <beagles@redhat.com>
Co-Authored-By: Martin André <m.andre@redhat.com>
Change-Id: I211707072bb0e4ac4aa48e9bbaccb7530f3de0ca
Juan Antonio Osorio Robles [Mon, 26 Jun 2017 11:13:36 +0000 (14:13 +0300)]
Add flag to enable/disable the HAProxy stats interface
This was made configurable in a recent commit [1] So this flag makes it
easier for deployers to use that functionality.
[1] Ic68266eaf39d6803f7c3e299095578bbcfd63b88
Change-Id: Iffff20dcda53bc7237586dd240e581bcb0282844
Jenkins [Mon, 26 Jun 2017 00:02:05 +0000 (00:02 +0000)]
Merge "Containerize Cinder-backup for HA"
Martin André [Sun, 25 Jun 2017 16:54:55 +0000 (18:54 +0200)]
Temporarily disable containerized cinder
The containerized cinder service was merged a bit too soon and it
caused several issues in CI. Disable it temporarily to unblock CI until
it matures.
Change-Id: I8c6c0ce0011fddfec1e2de798d4fc6f34ae78de2
Related-Bug: #
1700333
Jenkins [Sat, 24 Jun 2017 00:36:01 +0000 (00:36 +0000)]
Merge "Replace hardcoded 'br-ex' with NeutronPhysicalBridge parameter."
Jenkins [Fri, 23 Jun 2017 22:28:04 +0000 (22:28 +0000)]
Merge "scenario004: containerize services for CI"
Jenkins [Fri, 23 Jun 2017 21:57:37 +0000 (21:57 +0000)]
Merge "Fix manila-api volumes list"
Jenkins [Fri, 23 Jun 2017 21:52:40 +0000 (21:52 +0000)]
Merge "Enable periodic task to discover cell hosts when ironic is used"
Dan Sneddon [Wed, 1 Mar 2017 21:51:08 +0000 (13:51 -0800)]
Replace hardcoded 'br-ex' with NeutronPhysicalBridge parameter.
This change uses the NeutronPhysicalBridge parameter on all roles,
rather than hard-coding the "br-ex" name. Previously, there were
different parameters for controller and compute roles, but since
we use a unified bridge name with OVS, this is unnecessary.
Change-Id: I6d9189404fae67bcc33ddc2ba3ce1b0385dd989d
Closes-bug:
1669130
Jenkins [Fri, 23 Jun 2017 17:31:29 +0000 (17:31 +0000)]
Merge "scenario002: containerize services for CI"
Jenkins [Fri, 23 Jun 2017 17:05:14 +0000 (17:05 +0000)]
Merge "Fix rpms being installed via DeployArtifactURLs"
Jenkins [Fri, 23 Jun 2017 16:33:24 +0000 (16:33 +0000)]
Merge "Fix roles dict object' has no attribute 'lower' error"
Dmitry Tantsur [Tue, 13 Jun 2017 16:05:33 +0000 (18:05 +0200)]
Enable periodic task to discover cell hosts when ironic is used
Starting with the Ocata release, bare metal nodes are no longer get recognized
by nova automatically. To avoid forcing users into running nova manage command
each time they enroll a node, we will have to allow enable the periodic task
to do so.
Change-Id: I8b0afac54dc9bd51dbe2ae4f237e4de50459be0f
Closes-Bug: #
1697724
Emilien Macchi [Thu, 22 Jun 2017 20:41:25 +0000 (16:41 -0400)]
scenario004: containerize services for CI
Change-Id: I025ed07ce97132bce3fa7a15d170fc62e17e07a4
Jiri Stransky [Fri, 23 Jun 2017 13:54:01 +0000 (15:54 +0200)]
Fix manila-api volumes list
Change-Id: Idbbff1047fbc3f664e44131770ba2849ea9d51bc
Closes-Bug: #
1700082
Jenkins [Fri, 23 Jun 2017 13:47:06 +0000 (13:47 +0000)]
Merge "Configuration for containerized MySQL clients"
Tim Rozet [Thu, 12 Jan 2017 21:07:02 +0000 (16:07 -0500)]
Adds service for OVS and enables ODL DPDK deployments
In order to deploy OpenDaylight with DPDK we need to copy the DPDK
config for OVS done in the neutron-ovs-dpdk service template, without
enabling OVS agent for compute nodes. To do this correctly, we should
inherit and openvswitch service which is a common place to set OVS
configuration and parameters. Note: vswitch::dpdk config will be called
in prenetwork setup with ovs_dpdk_config.yaml so there is no need to
include that in the step config for neutron-ovs-dpdk-agent service or
opendaylight-ovs-dpdk.
Changes Include:
- Creates a common openvswitch service template, which in the future
will migrate to be its own service.
- Renames and fixes OVS DPDK configuration heat parameters in the
openvswitch template.
- neutron-ovs-dpdk-agent now inherits the common openvswitch template.
- Adds opendaylight-ovs-dpdk template which also inherits common ovs
template.
- Uses OVS DPDK config script to allow configuring OVS DPDK in
prenetwork config (before os-net-config runs). This has an issue
where hieradata is not present yet, so we have to redefine the heat
parameters and pass them via bash. In the future this should be
corrected.
- Adds opendaylight-dpdk environment file used to deploy an ODL + DPDK
deployment.
- Updates neutron-ovs-dpdk environment file.
Closes-Bug:
1656097
Partial-Bug:
1656096
Depends-On: I3227189691df85f265cf84bd4115d8d4c9f979f3
Change-Id: Ie80e38c2a9605d85cdf867a31b6888bfcae69e29
Signed-off-by: Tim Rozet <trozet@redhat.com>
Jenkins [Fri, 23 Jun 2017 10:37:48 +0000 (10:37 +0000)]
Merge "Make collectd log to file"
Emilien Macchi [Thu, 22 Jun 2017 19:59:52 +0000 (15:59 -0400)]
scenario002: containerize services for CI
Change-Id: I9f9a9dcf1666b5b0475bc8fae5b785747480b7d6
Saravanan KR [Wed, 24 May 2017 05:58:37 +0000 (11:28 +0530)]
Enable DPDK on boot using PreNetworkConfig
DPDK has to be enabled on openvswitch on the boot before
configuring the network as when the network uses DPDK ports
OvS should be ready to handle DPDK. Enabled DPDK via
PreNetworkConfig by checking if ServiceNames contains
DPDK service.
Implements: blueprint ovs-2-6-dpdk
Closes-Bug: #
1654975
Depends-On: I83a540336c01a696780621fb2b39486a6abf0917
Change-Id: I7af4534d91e67c94ba559b78b9ac6a001e639db3
Jenkins [Thu, 22 Jun 2017 21:22:02 +0000 (21:22 +0000)]
Merge "Revert "Blacklist support for ExtraConfig""
Jenkins [Thu, 22 Jun 2017 21:21:55 +0000 (21:21 +0000)]
Merge "scenario003: containerize services for CI"
Jenkins [Thu, 22 Jun 2017 20:19:29 +0000 (20:19 +0000)]
Merge "Specify file url when deploy-artifacts fails"
Jenkins [Thu, 22 Jun 2017 16:29:14 +0000 (16:29 +0000)]
Merge "Fixes incorrect glance api network"
Emilien Macchi [Thu, 22 Jun 2017 15:52:00 +0000 (11:52 -0400)]
scenario003: containerize services for CI
Change-Id: I152f5c97d2545aa595e193218653a4b7e56c0cb6
Jenkins [Thu, 22 Jun 2017 15:48:04 +0000 (15:48 +0000)]
Merge "Fix fallback logic in run-os-net-config.sh"
Jenkins [Thu, 22 Jun 2017 15:26:03 +0000 (15:26 +0000)]
Merge "Remove add_listen: false from Horizon hieradata"
Jenkins [Thu, 22 Jun 2017 15:25:56 +0000 (15:25 +0000)]
Merge "Test Horizon by default in multinode jobs"
Martin Mágr [Tue, 20 Jun 2017 14:02:27 +0000 (16:02 +0200)]
Make collectd log to file
- sets collectd service in container to log to file
consistently with other docker services.
- corrects configuration mounts
Depends-On: I50289ad6657852d37abbf12938128ff9ab9e3bac
Change-Id: Ibf9efbe249d67d0fa1e50fbd7dd9902a64d5a273
Jenkins [Thu, 22 Jun 2017 14:22:17 +0000 (14:22 +0000)]
Merge "Deploy ironic-api with WSGI"
Alex Schultz [Thu, 22 Jun 2017 13:35:19 +0000 (13:35 +0000)]
Revert "Blacklist support for ExtraConfig"
This reverts commit
d6c0979eb3de79b8c3a79ea5798498f0241eb32d.
This seems to be causing issues in Heat in upgrades.
Change-Id: I379fb2133358ba9c3c989c98a2dd399ad064f706
Related-Bug: #
1699463
Jenkins [Thu, 22 Jun 2017 10:24:50 +0000 (10:24 +0000)]
Merge "Remove trailing whitespace"
Dan Sneddon [Fri, 3 Feb 2017 09:57:41 +0000 (01:57 -0800)]
Fix descriptions on bonding templates
This change updates the descriptions of bond paramters in the bonded network
interface templates. Previously, only OVS bond settings were mentioned,
and the description for the bond options constraints had extra whitespace.
This change mentions settings for Linux bonds, and removes extra spaces.
Change-Id: Id50c042ae4a3b9298e8de0364e315b9f8777b79f
Ben Nemec [Wed, 21 Jun 2017 22:08:20 +0000 (17:08 -0500)]
Fix fallback logic in run-os-net-config.sh
The expression "${variable:-''}" with $variable unset results in a
value that looks like "''", which will not pass a -z test, as I
believe is intended in this code. Making the default value blank
yields the correct behavior.
Change-Id: I9fe98f3c69c797feb9c37da1ad8c7912a15bcecb
Closes-Bug:
1699614
Tim Rozet [Wed, 21 Jun 2017 15:40:21 +0000 (11:40 -0400)]
Fixes incorrect glance api network
The glance API network was being set to storage and it should be
internal_api.
Closes-Bug:
1699535
Change-Id: I75bc05aeab999f0e3eb3f4ebaceb276e888addc9
Signed-off-by: Tim Rozet <trozet@redhat.com>
Jenkins [Wed, 21 Jun 2017 15:06:38 +0000 (15:06 +0000)]
Merge "Add node's FQDN to mysql certificate request and CA file"