Commit Graph

4180 Commits (258c6ce52d0c8467f34693722a883d96345802b2)

Author SHA1 Message Date
Carlos Camacho 258c6ce52d Merge pre|post puppet resources into pre|post config.
The [Pre|Post]Puppet resources were renamed in
This was intended for having a pre/post deployment
steps using an agnostic name instead of
being attached to a technology.

The renaming was unintentionally reverted in and

This submission merge both resources into one,
and remove the old pre|post hooks.

Closes-bug: #1669756
Change-Id: Ic9d97f172efd2db74255363679b60f1d2dc4e064
2017-04-24 12:56:49 +02:00
Jenkins 085d5009b6 Merge "Allow configuring enabled hardware types for Ironic" 2017-04-24 09:30:30 +00:00
Jenkins 04be992edc Merge "Containers: disable downloading rabbitmqadmin" 2017-04-24 09:30:23 +00:00
Jenkins 4bfd7b2327 Merge "Replace six.iteritems() with .items()" 2017-04-22 04:09:46 +00:00
Jenkins c1b8d488d5 Merge "Increase documentation about parameters" 2017-04-22 01:48:59 +00:00
Jenkins b24f6257f6 Merge "Add service config settings to agent services" 2017-04-21 19:52:52 +00:00
Jenkins 8514fb649a Merge "scenario001/pingtest: enable Gnocchi resource again" 2017-04-21 15:14:57 +00:00
Jenkins 85b2282336 Merge "Use -net=host for config gen" 2017-04-21 12:56:11 +00:00
Jenkins 2e15949d31 Merge "Add defaults for docker puppet tasks" 2017-04-21 12:20:34 +00:00
Jenkins 63bd748319 Merge "containers: TLS in the internal network for telemetry services" 2017-04-21 09:17:59 +00:00
Jenkins fc8c51d5d5 Merge "glance: deploy services with Keystone v3 endpoints" 2017-04-21 07:48:52 +00:00
Jenkins afe2740ccc Merge "SSHD Service extensions" 2017-04-21 06:42:55 +00:00
Jenkins 0991ed0dfb Merge "Use conditionals for neutron and glance worker defaults" 2017-04-21 03:16:30 +00:00
Jenkins 89927b6b4d Merge "Add network_data.yaml to encapsulate list of networks for j2" 2017-04-21 00:41:15 +00:00
Jenkins 9f05a77d67 Merge "Add environment to preselect only VIP IP addresses" 2017-04-21 00:41:10 +00:00
Jenkins c1d88987f3 Merge "Add NeutronDnsDomain heat option, undercloud fix" 2017-04-21 00:08:09 +00:00
Jenkins 4afd65f486 Merge "Add all hosts to HostsEntry output" 2017-04-20 23:55:19 +00:00
Jenkins 2a089e3be9 Merge "N->O Manual puppet commands have the right modulepath." 2017-04-20 15:46:28 +00:00
Steven Hardy 0a5d85ea32 Add defaults for docker puppet tasks
Currently we're referencing some steps that don't exist in the
output from the OS::Heat::Value resource, but as noted in the heat
bug #1681749 I think this isn't valid and probably should not be
allowed, so instead merge defaults with the non-empty step
tasks. To avoid further duplication of the loop variables, I
made the max step a variable.

Change-Id: Icf3d639b53c97006a0c370c12600449fba6f3323
Related-Bug: #1681749
2017-04-20 15:31:31 +00:00
Sofer Athlan-Guyot 79c2d0f3d4 N->O Manual puppet commands have the right modulepath.
In two places during upgrade we manually trigger puppet.

There can be a problem when new puppet modules are added, and their
corresponding symlinks in /etc/puppet/modules are not created during
the installation as their are installed in
/usr/share/openstack-puppet/modules.  To prevent the issue tripleo set
modulepath in the templates.

We must use the same modulepath to make sure that we don't fail
because of missing module in the manual puppet run.

This particulary happens when you upgrade from M->N->O, as the base
image in Mitaka doesn't have the proper symlinks and they are not
created during the installation of the package.

Closes-Bug: #1684587

Change-Id: I79df6ea33f1c58e13309176a6de41b7572541fd6
2017-04-20 13:20:41 +02:00
Jenkins b5675f3b7f Merge "TLS-everywhere: Enable for TLS libvirt live migration" 2017-04-20 11:20:14 +00:00
Jenkins af1f3b3b74 Merge "N->O upgrade, fix wrong parameters to nova placement." 2017-04-20 09:34:46 +00:00
Jenkins ef82c3a010 Merge "Pluggable server type per Role" 2017-04-20 09:26:59 +00:00
Emilien Macchi a05712381f glance: deploy services with Keystone v3 endpoints
* Switch auth_uri to point to Keystone versionless endpoint.
* Switch Swift auth url to use Keystone versionless endpoint and
  Keystone v3 API.

Co-Authored-By: Juan Antonio Osorio Robles <>
Change-Id: I78cdd2286b5a5094f36d4f3c7c58340745664449
Partial-blueprint: keystone-v3
2017-04-20 07:15:21 +00:00
Jenkins 8eaecb6489 Merge "Remove root_template and root_environment from capabilities-map.yaml" 2017-04-19 18:38:18 +00:00
Luke Hinds 5e14f95a4a SSHD Service extensions
This change implements a MOTD message and provides a hash of
sshd config options which are sourced to the puppet-ssh module
as a hash.

The SSHD puppet service is enabled by default, as it is
required for Idb56acd1e1ecb5a5fd4d942969be428cc9cbe293.
Also added the service to the CI roles.

Change-Id: Ie2e01d93082509b8ede37297067eab03bb1ab06e
Depends-On: I1d09530d69e42c0c36311789166554a889e46556
Closes-Bug: #1668543
Co-Authored-By: Oliver Walsh <>
2017-04-19 18:03:02 +01:00
Jiri Stransky 73651aa9bb Containers: disable downloading rabbitmqadmin
There's no need for puppet to download rabbitmqadmin script from
rabbitmq, as the script would be immediately deleted together with the
ephemeral puppet container. Also, since rabbitmq isn't running at the
time we run the puppet container (rabbitmq doesn't have config files
generated at that point), puppet couldn't connect to rabbitmq anyway.

Change-Id: Ia59e1013c24ab02037246135024418cc9b674606
Closes-Bug: #1684104
2017-04-19 17:05:45 +02:00
Sofer Athlan-Guyot 88a3168b30 N->O upgrade, fix wrong parameters to nova placement.
According to [1] we need os_region_name, not region_name.  Furthermore
the os_interface is configured as well.  The hard check on this
parameter was introduced in ocata[2], explaining why the newton version
did not chock on it.


Closes-Bug: #1684058
Change-Id: If6118bf03e832fe3fa5ea4fcb1b436afd2adf80a
2017-04-19 14:30:43 +02:00
Juan Antonio Osorio Robles 2fda963fc7 containers: TLS in the internal network for telemetry services
This covers aodh, gnocchi and panko.

cp tls-via-certmonger-containers

Change-Id: I6dabb0d82755c28b8940c0baab0e23cfcc587c42
2017-04-19 11:04:31 +00:00
Jenkins 56c8f12077 Merge "Introduce common CAs to be mounted to the containers" 2017-04-19 10:54:44 +00:00
Jenkins 431bc8109a Merge "Introduce common resources for docker templates" 2017-04-19 10:54:36 +00:00
Jenkins 1ecf50207b Merge "Rework DOCKER_PUPPET_CONFIG validate tool" 2017-04-19 10:05:38 +00:00
Juan Antonio Osorio Robles fa740c5e49 TLS-everywhere: Enable for TLS libvirt live migration
This relies on using the default paths for certs/keys used by libvirt
and is only enabled if TLS-everywhere is enabled.

bp tls-via-certmonger
Depends-On: If18206d89460f6660a81aabc4ff8b97f1f99bba7
Depends-On: I0a1684397ebefaa8dc00237e0b7952e9296381fa
Change-Id: I0538bbdd54fd0b82518585f4f270b4be684f0ec4
2017-04-19 09:20:00 +00:00
Jenkins 8137335445 Merge "Use underscore for Aodh and Gnocchi's container names" 2017-04-19 05:26:58 +00:00
Jenkins 7d24cb66d8 Merge "Use tripleo profile for bigswitch agent" 2017-04-19 03:11:23 +00:00
Jenkins cac8a68460 Merge "Add migration SSH tunneling support" 2017-04-19 01:39:27 +00:00
Jenkins ff2ca16ba4 Merge "SSH known_hosts config" 2017-04-18 22:53:25 +00:00
Jenkins d79d1ef7ac Merge "Run token flush cron job hourly by default" 2017-04-18 20:55:04 +00:00
Jenkins a5737beba4 Merge "Support for external swift proxy" 2017-04-18 14:22:59 +00:00
Emilien Macchi 152df0164f scenario001/pingtest: enable Gnocchi resource again
We disabled it because it stopped working. Let's see how it works now.

Change-Id: If1efb86cb1d6ada357d4562408a566ac702fb6be
Closes-Bug: #1646506
2017-04-18 13:36:24 +00:00
Jenkins 487dbe3107 Merge "Fix nova-compute service name in upgrade steps" 2017-04-18 12:58:04 +00:00
Jenkins b66c7bde4b Merge "Non-ha multinode environment for container upgrade job" 2017-04-18 12:25:50 +00:00
Jenkins 6226e53227 Merge "Add RoleNetIpMap output to overcloud.j2.yaml" 2017-04-18 11:51:41 +00:00
Juan Antonio Osorio Robles 65e643aca2 Run token flush cron job hourly by default
Running this job once a day has proven problematic for large
deployments as seen in the bug report. Setting it to run hourly
would be an improvement to the current situation, as the flushes
wouldn't need to process as much data.

Note that this only affects people using UUID as the token provider.

Change-Id: I462e4da2bfdbcba0403ecde5d613386938e2283a
Related-Bug: #1649616
2017-04-18 10:30:07 +00:00
Juan Antonio Osorio Robles f8f295be3e Introduce common CAs to be mounted to the containers
When TLS is enabled, the containers need to trust the CAs that the
host trusts.

Change-Id: I0434b0ac10290970857cad3d1a89d00f5b054196
2017-04-18 11:20:06 +03:00
Juan Antonio Osorio Robles e81ddeb685 Introduce common resources for docker templates
This enables common resources that the docker templates might need.
The initial resource only is common volumes, and two volumes are
introduced (localtime and hosts).

Change-Id: Ic55af32803f9493a61f9b57aff849bfc6187d992
2017-04-18 11:20:06 +03:00
Luca Lorenzetto 0d8f11ffca Support for external swift proxy
Users may have an external swift proxy already available (i.e. radosgw
from already existing ceph, or hardware appliance implementing swift
proxy). With this change user may specify an environment file that
registers the specified urls as endpoint for the object-store service.
The internal swift proxy is left as unconfigured.

Change-Id: I5e6f0a50f26d4296565f0433f720bfb40c5d2109
Depends-On: Ia568c3a5723d8bd8c2c37dbba094fc8a83b9d67e
2017-04-18 09:13:19 +02:00
James Slagle ee9d6339cc Add all hosts to HostsEntry output
Previously only the VIPs and their associated hostnames were present in
the HostsEntry output, due to the hosts_entries output on the
hosts-config.yaml nested stack being empty. It was referencing an
invalid attribute.

Change-Id: Iec41926e27bdbf86eb30f230f904df1b7dbfa9c2
Closes-Bug: #1683517
2017-04-17 17:52:52 -04:00
Dan Prince 29545646fe Revert "Use httpd in Zaqar docker service"
This reverts commit 57a2648612.

Change-Id: I1bbe16a1a7a382ae0c898bd19cd64d3d49aa84c7
Closes-bug: #1683210
2017-04-16 21:39:02 -04:00
Oliver Walsh 0271a63e52 Add migration SSH tunneling support
This enables nova cold migration.

This also switches to SSH as the default transport for live-migration.
The tripleo-common mistral action that generates passwords supplies the
MigrationSshKey parameter that enables this.
The TCP transport is no longer used for live-migration and the firewall
port has been closed.

Change-Id: I4e55a987c93673796525988a2e4cc264a6b5c24f
Depends-On: I367757cbe8757d11943af7e41af620f9ce919a06
Depends-On: I9e7a1862911312ad942233ac8fc828f4e1be1dcf
Depends-On: Iac1763761c652bed637cb7cf85bc12347b5fe7ec
2017-04-15 16:53:40 +01:00