7480 Commits

Author SHA1 Message Date
Jiri Stransky
e9e2b4d104 Don't delete br-ex on upgrade in multinode jobs
The hook for os-net-config in multinode NIC config templates contains
a call to `ovs-vsctl del-br br-ex` to remove the bridge we got from
nodepool and initialize network config. We need to avoid executing
that again on upgrade, or the Ansible process running the upgrade gets
stuck.

Change-Id: Ie36342402426d74fd528e320d60adc951bf8c9ac
Closes-Bug: #1772040
2018-05-21 17:03:43 +02:00
Zuul
51f9c5c52e Merge "Enable logging for tempest container" 2018-05-21 10:48:40 +00:00
Alex Schultz
1d9629ec0b Mount /var/run/redis for the redis socket
Under pacemaker, it manages this mount correctly. When not deploying
redis with pacemaker, the /var/run/redis folder is not properly mounted
so the container cannot start correctly after a reboot.

Change-Id: I1b86bc91e7ca95a1e70fecee1b6507787d98e9cd
Closes-Bug: #1771888
2018-05-20 19:02:02 +00:00
Emilien Macchi
00f5019ef2 Deploy Docker via Ansible and not Puppet
Deploy Docker with Ansible instead of Puppet so later we will be able
to prepare the registry before deploying any containerized service
and do tasks in the middle like updating containers.

Remove the Puppet run from update_tasks, we'll move these tasks later in
ansible-role-container-registry.

Change-Id: Iee0e08cd48f173a39a6f3a1ea54b29e370d4f334
2018-05-20 05:20:54 +00:00
Zuul
4815c8bd17 Merge "Remove undercloud specific service definitions" 2018-05-19 21:45:46 +00:00
Zuul
1dd654cda7 Merge "Correct log location in container environment for Fluentd" 2018-05-18 14:25:58 +00:00
Zuul
3ab23982a2 Merge "Use rabbitmq service principal in metadata settings" 2018-05-18 10:02:24 +00:00
Cédric Jeanneret
3848713182 Correct log location in container environment for Fluentd
Since we moved services in containers, their logs aren't in the old location, but
in /var/log/containers/<service>. This patch fixes the generated Hiera hash used
by Fluentd for its configuration

Regarding Designate config service: some of the yaml doesn't use at all the
`service_config_settings` parameter - they will need to be updated accordingly
once it's supported

Co-Authored-By: Thomas Herve <therve@redhat.com>, Steven Hardy <shardy@redhat.com>
Change-Id: I1bc0930de4053dc1c34b50477e82d9ccdab7ae2e
Closes-Bug: 1769051
Related-Bug: 1674715
2018-05-18 10:18:43 +02:00
Zuul
1b35f35954 Merge "Don't use crudini to get rhn server" 2018-05-17 21:59:39 +00:00
Zuul
a7857d6dfc Merge "Revert "Switch public endpoints to use FQDNs by default"" 2018-05-17 21:56:29 +00:00
Zuul
6b87d02df3 Merge "FFU Add cinder-backup missing fast_forward_upgrade_tasks" 2018-05-17 21:56:25 +00:00
Zuul
0afc161a2d Merge "undercloud: change upgrade steps" 2018-05-17 21:44:18 +00:00
Zuul
5805daedcf Merge "Fix cinder-backup image wrangling on update" 2018-05-17 14:39:05 +00:00
James Slagle
b4ff453f87 Don't use crudini to get rhn server
crudini is not installed by default on Red Hat derivitive OS's, so we
shouldn't rely on it. We probably can't just install it since this
script is the rhel-registration script, so there are likely no repos
enabled when we need it.

Instead just use grep/cut/sed to get the value we need.

Change-Id: I78fce8b6c7f1d3528f9d8c02772f95cb8ad3b3c8
Closes-Bug: #1771830
2018-05-17 10:35:56 -04:00
Zuul
73f6b083ff Merge "Allow configuration of NFS backend for Nova" 2018-05-17 13:55:38 +00:00
Chandan Kumar
f30a0578ba Enable logging for tempest container
* In order to make sure tempest container is available in CI,
  It adds the logging for the same in /var/log/containers/tempest.

Change-Id: I3d526b374b6233bad69f5c6be12036b3ede37028
2018-05-17 12:49:57 +05:30
Juan Antonio Osorio Robles
4b39b19d19 Use rabbitmq service principal in metadata settings
We don't request a certificate for oslo_messaging_rpc, so we use
rabbitmq (the one we used to use) instead.

Closes-Bug: #1771744
Change-Id: I05ef290215fa0303b3be6ddb4462e7ca02b2d71b
2018-05-17 09:39:14 +03:00
Emilien Macchi
e7a103c5a4 undercloud: change upgrade steps
1) Rename the neutron DB at step 2 so Neutron has time to stop (during
step 1) and right after we stop mariadb, so no chance for any app to
access to old db.

2) Upgrade all rpms at step 3 like we do for other services. Step 1 was
way too early.

Change-Id: I34bdc0a9d575e5d1b8f3ce1e09c145cc34563a85
2018-05-17 03:11:11 +00:00
James Slagle
f254a2169d Revert "Switch public endpoints to use FQDNs by default"
This reverts commit 8e104b3c549118727b53c9825a438e799715b7f9.

https://review.openstack.org/#/c/559926/ introduced requiring CloudName.
This broke the documented deployment process. I also don't see how
CloudName can be required, but CloudDomain can not.

I don't see a technical reason why we can't keep the default as
localdomain. If necessary, we can instead add a parameter
validation instead of requiring the parameter.

Closes-Bug: #1771627
Depends-On: Ia86842b0b1f42512f25390d6bdb695e0f8133c6d
Change-Id: I2c5b511df50f29c63aa613899c2bebb506360bf4
2018-05-16 21:45:42 +00:00
Emilien Macchi
8ef2e7ee19 Add missing UndercloudUpgrade to environment
UndercloudUpgrade needs to be set to True when upgrading a containerized
undercloud. It was missed in a previous patch.

Change-Id: I5f06052b1d5290f8193aea57bafc8ddf86d2d8cf
2018-05-16 11:58:28 -07:00
Zuul
f77be199d4 Merge "FFU Set NetworkDeploymentActions CREATE,UPDATE for ffwd-upgrade prepare" 2018-05-16 17:44:10 +00:00
Zuul
b7273d849b Merge "Add ability to control Glance's enabled_import_methods" 2018-05-16 15:26:55 +00:00
mandreou
30a95b797b FFU Add cinder-backup missing fast_forward_upgrade_tasks
Looks like the cinder-backup ffu tasks were missed as
discussed in [0]. Adding here and they are the same as the
other docker/services/pacemaker things e.g. rabbit @[1].
This also fixes the resource check in the bm->containers
upgrade_tasks so cinder-backup is also properly deleted.

[0] https://bugzilla.redhat.com/show_bug.cgi?id=1578158
[1] e37e0e6d47/docker/services/pacemaker/rabbitmq.yaml (L367-L397)

Change-Id: Idc1b8d444fb354450b8e584d199d1f22e0d92e5a
2018-05-16 11:42:52 +03:00
Rajesh Tailor
6b6ae966ba Allow configuration of NFS backend for Nova
Allow NFS configuration of storage backend for Nova.
This way the instances files will be stored on a shared
NFS storage.

Implements: bp tripleo-nova-nfs

Depends-On: Id15aec6324814a871e87f19f24999b0e3b8a8f05

Change-Id: Ie4fe217bd119b638f42c682d21572547f02f17b2
2018-05-16 11:18:48 +05:30
Zuul
784a41a86f Merge "update tht jobs to include network/endpoints" 2018-05-16 03:00:55 +00:00
Zuul
ac89df34c9 Merge "Revert "Change default endpoint map entries to use TLS"" 2018-05-16 02:54:03 +00:00
Zuul
f4986ff4ce Merge "deploy-steps: switch to tripleo_role_name" 2018-05-16 02:20:48 +00:00
Zuul
aed8a5e660 Merge "Deploy Designate in scenario003" 2018-05-16 02:06:12 +00:00
Wes Hayutin
392c3aea82 update tht jobs to include network/endpoints
Related-Bug: #1771435
Change-Id: I34208c23b747be413af7b20838c98daf8f4afad9
2018-05-15 17:28:17 -04:00
Alex Schultz
d5b34858de Revert "Change default endpoint map entries to use TLS"
This reverts commit 22ad1bc8c51dffb40e3ebaf5fef35de333adb53d.

Change-Id: I424d001a1aad78b6a756b10682b316b3f2a48fc5
Closes-Bug: #1771435
2018-05-15 21:27:19 +00:00
Zuul
b01bee5639 Merge "Add fast_forward_upgrade_tasks in ironic services." 2018-05-15 18:17:25 +00:00
Emilien Macchi
1bec01137e deploy-steps: switch to tripleo_role_name
"role_name" is internal to Ansible, we should not use it.
This patch uses the new variable set in the inventory to use a specific
TripleO var: tripleo_role_name which is the TripleO role name and not
the Ansible role names, both things are very different.

Depends-On: I57c4eac87e2f96dfe5490b111cd2508505715d56
Change-Id: Iecaf6f1b830e65be2f9e2e44431054fe46f9f565
Related-Bug: #1771171
2018-05-15 16:38:29 +00:00
Zuul
aec81d595e Merge "Change default endpoint map entries to use TLS" 2018-05-15 12:28:26 +00:00
Zuul
9d9bd244f7 Merge "Expose parameter MistralDockerGroup" 2018-05-15 12:07:10 +00:00
Zuul
e37e0e6d47 Merge "Enable default polling interval override" 2018-05-15 03:12:59 +00:00
Steve Baker
ab1cba9047 Expose parameter MistralDockerGroup
This will be set to true for undercloud deployments

Change-Id: I4e34a930d384ae4220070e3b613477b9ff89314c
Blueprint: container-prepare-workflow
2018-05-15 00:22:39 +00:00
Zuul
2e1e3fcd7f Merge "Make the KeystoneURL stack output versionless" 2018-05-14 23:37:13 +00:00
Zuul
9fa87488dc Merge "Add compute node L3 agent container for DVR" 2018-05-14 23:37:11 +00:00
Zuul
f5152da976 Merge "Switch public endpoints to use FQDNs by default" 2018-05-14 23:27:04 +00:00
Zuul
b005e2284c Merge "Default Octavia SSH pub key to UC default keypair" 2018-05-14 23:16:59 +00:00
Zuul
a189f37216 Merge "yaml-validate: sets isn't python3" 2018-05-14 23:16:57 +00:00
Zuul
02efe58a62 Merge "Clean up Cinder backends in capabilities map" 2018-05-14 23:10:52 +00:00
Alan Bishop
3147583950 Add ability to control Glance's enabled_import_methods
Add GlanceEnabledImportMethods parameter, and set the default value to
restrict Glance from using its 'glance-direct' import method. The
glance-direct method requires a special configuration when deployed in
an HA environment, and that capability will be added in a later release.

Closes-Bug: #1765439
Depends-On: https://review.openstack.org/568366
Change-Id: I7038601d7505a60df2a1fb7fd8db818efa105341
2018-05-14 20:30:12 +00:00
Martin Mágr
6c5b96c192 Enable default polling interval override
By default collectd polling interval is set to 10 seconds for all plugins,
which is bringing down the entire cloud if the default Gnocchi deployment
(Swift on controllers) is used. We have to override the default higher value.

Closes-Bug: #1771083
Change-Id: I210c72028da35068ed8469b2d2deb75797a2b08f
2018-05-14 18:30:16 +02:00
Jose Luis Franco Arza
6403c9b9bc Add fast_forward_upgrade_tasks in ironic services.
Ironic services already present in Newton release,
ironic-api and ironic-conductor, are missing their
fast_forward_upgrade_tasks section.

Change-Id: Ic6e8c1515bb16d29a285b5a5bdbd4971adf3e2c2
Closes-Bug: #1770634
2018-05-14 14:29:38 +02:00
mandreou
d7ce2c8bb7 FFU Set NetworkDeploymentActions CREATE,UPDATE for ffwd-upgrade prepare
And unset back to CREATE on ffwd-upgrade converge. See [0] for more
discussion. This is to allow operators to update to the new script
based os-net-config network templates during the ffwd-upgrade.

[0] https://bugzilla.redhat.com/show_bug.cgi?id=1568561#c3
Change-Id: Ib5be49579545ad0ec7bf95e96fbe1f62ec4d3ac0
2018-05-12 12:19:58 +00:00
Carlos Goncalves
0e87e640c8 Default Octavia SSH pub key to UC default keypair
The Octavia public key configuration is run by Mistral meaning under the
'mistral' user. The previously default /home/stack/.ssh/id_rsa.pub file
may not be readable or not accessible because the of lack of permissions
from its parent directory leading to permission denied and hence failure
to deploy overcloud. It is safer to not default to a file path but to
use the existing 'default' keypair from the undercloud which anyway is
the public key of the 'stack' user. Users can still specify a file path
but will need to ensure it is readable.

Related-Bug: #1770641
Change-Id: I1dea4a8d5bb3c5a64ee7fb8995b837909bc1cafe
2018-05-11 15:33:18 +02:00
Jiri Stransky
b0322730a7 Fix cinder-backup image wrangling on update
The minor update tasks for cinder-backup first pull the new image and
then delete the old one. If the image hasn't changed, deleting the old
one means deleting the new one too, and then trying to tag it as
pcmklatest will fail. The other services under
services/docker/pacemaker seem to have the order correct.

All services here could use a performance optimization for cases when
the image hasn't changed (don't reshuffle images if the hash hasn't
changed) but let's fix the breakage first and address performance
later.

Change-Id: I5e0fcb7467fcff7e549e04789ceeb8eb49ee265a
Closes-Bug: #1770598
Related-Bug: #1770599
2018-05-11 11:13:22 +02:00
Zuul
7f23133651 Merge "Mark Designate as experimental" 2018-05-09 23:09:14 +00:00
Alex Schultz
64bc4a7683 Remove undercloud specific service definitions
Since we're aligning the overcloud/undercloud and we've switched to
containerization it, we should reuse the same heat services rather than
duplicating the services with the Undercloud definition.

Depends-On: Ic7dba7e548f85574cce2db23e3fec5c8ea761bb7
Change-Id: I497597a47533375f34a22a56e2e9a145d9393358
Related-Blueprint: containerized-undercloud
2018-05-09 21:33:20 +00:00