7671 Commits

Author SHA1 Message Date
Zuul
5764909dfd Merge "Enable octavia-api health check" 2018-06-16 00:29:25 +00:00
Wes Hayutin
441303792a scen007 is failing in the gate
Moving to non-voting until the gate is green
RDO-Cloud is down and we can not fix the
dist-git.

Related-Bug: #1777168
Change-Id: Ia2c18ff554dc8b980528f1905bbad98dced2c336
2018-06-15 13:17:11 -04:00
Zuul
b7dcbd8da7 Merge "Set Ceph pools rule_name to replicated_rule" 2018-06-15 12:03:25 +00:00
Zuul
6c15840e57 Merge "Rename Dell EMC XTREMIO iSCSI environment file" 2018-06-15 12:03:19 +00:00
Zuul
42c552e4ab Merge "undercloud: add missing services for upgrade cleanup" 2018-06-15 12:03:17 +00:00
Zuul
029f500fee Merge "Upgrades: Refactor package removal to step3" 2018-06-15 12:03:14 +00:00
Zuul
2075455dde Merge "Do not fail on non existent ansible group" 2018-06-15 11:36:21 +00:00
Zuul
d0f4e4879e Merge "Map OpenShift resources to services" 2018-06-15 11:36:19 +00:00
Zuul
0407f87331 Merge "Add environments/net-noop.yaml" 2018-06-15 10:23:44 +00:00
Zuul
fe2b2b4e5f Merge "Disable memcached's cachedump" 2018-06-15 10:13:55 +00:00
Zuul
a3a3180f94 Merge "Uses new format for CephX keys caps" 2018-06-15 06:43:35 +00:00
Zuul
4fb30dd5ec Merge "Add BlacklistedHostnames stack output" 2018-06-14 19:04:30 +00:00
Zuul
62ecb6e959 Merge "snmp: listen on ctrlplane" 2018-06-14 18:46:52 +00:00
Zuul
305d83ec7c Merge "Upload validations to swift on undercloud install" 2018-06-14 17:32:45 +00:00
Zuul
76c8fe9d0a Merge "Enable secure TUNNELLED mode for NFS" 2018-06-14 11:32:06 +00:00
Zuul
80a68af78b Merge "Fix error in the role-specific parameter merging in rhsm service" 2018-06-14 11:32:02 +00:00
Zuul
1a868a84c3 Merge "Updates: run host_prep_tasks between update tasks and deployment tasks" 2018-06-14 11:31:59 +00:00
Zuul
4dfb598bcc Merge "Upgrades: Refactor playbooks to set facts" 2018-06-14 11:31:56 +00:00
Zuul
27d11e133b Merge "Use UpgradeInitCommonCommand with deployed-server too" 2018-06-14 11:05:03 +00:00
Zuul
7028d4fbe8 Merge "Use user specified private key when deleting temp keys" 2018-06-13 08:48:47 +00:00
Zuul
99a1bfc39b Merge "Fix typo" 2018-06-13 08:43:15 +00:00
Saravanan KR
46a5b2a497 Fix error in the role-specific parameter merging in rhsm service
RhsmVars should be used as the value to be replaced for the global
values, instead of using 'vars'.
Closes-Bug: #1776597

Change-Id: I480b3c51787547b9dd4e1401363a5da7c40798a8
2018-06-13 11:19:00 +05:30
Zuul
adcf0d7fe8 Merge "Match only haproxy for docker ps and skipp all *-haproxy occurences" 2018-06-12 22:36:42 +00:00
Dan Prince
170c311670 Add environments/net-noop.yaml
This can be used to activate net-config-noop.yaml and
disable os-net-config on all roles. Useful if you are using
deployed servers and want to pre-configure your networks.

Change-Id: I80e5fb586f6de0bccd6245237d23712310c78588
2018-06-12 21:52:39 +00:00
Emilien Macchi
fcc225159a undercloud: add missing services for upgrade cleanup
Add cleanup tasks for Ironic, Keystone Mistral and Zaqar, so when
upgrading an undercloud to be containerized, an operator can also
cleanup these services rpms.

Depends-On: I2af99d8bad58f12bd895b473ecb84e4f2091f738
Change-Id: I7e257cece9fa3bdd9f2d1be08ccdf5c681213149
2018-06-12 13:25:19 -07:00
Zuul
6fe012cdd0 Merge "Use wait_for_connection module instead of local action for reboot wait" 2018-06-12 16:29:16 +00:00
Jiri Stransky
e8532bea1e Use UpgradeInitCommonCommand with deployed-server too
We've hit an issue in multinode CI that Ansible wasn't getting updated
during `upgrade prepare`. UpgradeInitCommonCommand wasn't being
executed because it was left out from deployed-server.yaml.

Change-Id: I940c3e05944829a6a4155722181e5fa85a963660
Closes-Bug: #1776474
2018-06-12 14:25:14 +02:00
Zuul
c9d2ba055b Merge "Match Net:SoftwareConfig resource in scenario000 to other scenarios" 2018-06-12 11:54:41 +00:00
Rajesh Tailor
db1976c0c7 Enable secure TUNNELLED mode for NFS
This is the follow up patch for change
Ie4fe217bd119b638f42c682d21572547f02f17b2 which allows
configuring NFS backend for Nova.

To provide enhanced security improvement for migration, this
change enables TUNNELLED mode for migration, in case of
NFS shared storage.

Change-Id: Id0cfc945814e6aa5a5c85643514cf206f42e50f4
Implements: bp tripleo-nova-nfs
2018-06-12 17:23:07 +05:30
Giulio Fidente
c0fc85f306 Uses new format for CephX keys caps
Updates the format of the CephX keys caps to a new one which
does not need backward compatibility in ceph-ansible

Change-Id: Icd36ac32ec0ed708e66fe638bcbf54cee2d1ae69
2018-06-12 10:58:32 +02:00
Zuul
a151ed15e8 Merge "Add a way to override base path when file driver is used" 2018-06-12 05:54:48 +00:00
baiwenteng
66b8d58ee8 Fix typo
replace "configuation" with "configuration"
replace "assigment" with "assignment"

Change-Id: Icd4735ffbdea14997557f8db0566cb190027101b
2018-06-12 11:51:24 +08:00
Giulio Fidente
dcf558628f Set Ceph pools rule_name to replicated_rule
By setting the value of rule_name explicitly, we prevent backward
incompatibility issues because the default which ceph-ansible uses
might fit a particular version of Ceph, not all.

Change-Id: I275c1ca53ea79eea607cbbb58aa21cae6d6be80b
Closes-Bug: 1776252
2018-06-11 18:57:02 +02:00
Zuul
a2c8a130db Merge "undercloud: set OS_CACERT when TLS is used" 2018-06-11 16:29:17 +00:00
Zuul
15c5e566ca Merge "rerun *_init_bundles all the time" 2018-06-11 13:36:05 +00:00
Zuul
f9ad91703c Merge "Introduce restart_bundle containers to detect config changes and restart pacemaker resources" 2018-06-11 13:36:04 +00:00
Jiri Stransky
416b35f4c3 Updates: run host_prep_tasks between update tasks and deployment tasks
We should re-run host_prep_tasks as part of the minor update, to make
sure the host is ready for starting the updated containers. The right
place for them is between update tasks and deployment tasks.

This is important in case we deliver changes to host_prep_tasks during
minor update, or if update_tasks do something that would partially
undo the host preparation, e.g. clear/delete some directories on the
host to get rid of previous state.

Change-Id: Ic0a905a8c4691cbe75113131bd84e8a39dea046d
Related-Bug: #1776206
2018-06-11 14:06:40 +02:00
Martin André
cc046a757c Do not fail on non existent ansible group
When a role is defined but this role has a host count of 0, the ansible
tasks to generate the openshift inventory for the service would fail
with an undefined variable error.

Setting the value for non existent groups to empty array should get us
past the error.

Change-Id: Ib42708c095d28827f5decdb885ceb4f2a67b3a8b
2018-06-11 11:31:12 +02:00
Martin André
b95d1c18d8 Map OpenShift resources to services
Also remove OS::Heat::None mappings for resources that are not part of
the deployed roles.

Depends-On: I85c4390519ace0149895285225f5a4ece453f1f8

Change-Id: I55e8b25a4fb0b4839be5d741acdceec5dad903ad
2018-06-11 11:31:12 +02:00
Mathieu Bultel
a472f7d513 Match only haproxy for docker ps and skipp all *-haproxy occurences
The grep regexp can match several lines if the haproxy pattern
is present.
By matching only the started by a whitespace it will match
the haproxy container listed by docker ps:
[...] Up 17 hours   neutron-haproxy-qrouter
[...] Up 20 hours   haproxy-bundle-docker-

Change-Id: Id63991e862ab10170c8afbde7a11677cc3d2e2f6
2018-06-11 10:50:39 +02:00
Zuul
e2bbd55a45 Merge "Add docker service to OpenShift CI roles" 2018-06-11 08:22:00 +00:00
Zuul
39939708b7 Merge "Fix update/upgrade or config change for ODL" 2018-06-09 17:20:47 +00:00
Michele Baldessari
a0dfc6c0c6 rerun *_init_bundles all the time
In the same spirit as change I1f07272499b419079466cf9f395fb04a082099bd
we want to rerun all pacemaker _init_bundles all the time. For a few main
reasons:
1) We will eventually support scaling-up roles that contain
   pacemaker-managed services and we need to rerun _init_bundles so that
   pacemaker properties are created for the newly added nodes.
2) When you replace a controller the pacemaker properties will be
   recreated for the newly added node.
3) We need to create appropriate iptables rules whenever we add a
   service to an existing deployment.

We do this by adding the DeployIdentifier to the environment so that
paunch will retrigger a run at every redeploy.

Partial-Bug: #1775196
Change-Id: Ifd48d74507609fc7f4abc269b61b2868bfbc9272
2018-06-09 10:22:15 +02:00
Zuul
7bad4f3bf9 Merge "Fix fail_if_empty invocation with pipes" 2018-06-09 02:51:34 +00:00
Tim Rozet
dc9c7315ae Fix update/upgrade or config change for ODL
OpenDaylight creates multiple files the first time it boots, which we do
not mount to the host. After the first boot, it creates a cache which we
do mount to the host. This means that on a config change or
update/upgrade of ODL the cache will not be removed, but the files will
be. This causes ODL to fail to start.

The solution is to stop the container in update/upgrade and then remove
the cache before the update happens. This will trigger the new ODL to
rebuild the cache with the new ODL version.  For config change, we also
need to remove the cache in the host_prep_tasks so that we do not end up
in a similar state.

Closes-Bug: 1775919

Change-Id: Ia457b90b765617822e9adbf07485c9ea1fe179e5
Signed-off-by: Tim Rozet <trozet@redhat.com>
2018-06-08 15:10:30 -04:00
Michele Baldessari
a6389da22d Introduce restart_bundle containers to detect config changes and restart pacemaker resources
During the containerization work we regressed on the restart of
pacemaker resources when a config change for the service was detected.
In baremetal we used to do the following:
1) If a puppet config change was detect we'd touch a file with the
   service name under /var/lib/tripleo/pacemaker-restarts/<service>
2) A post deployment bash script (extraconfig/tasks/pacemaker_resource_restart.sh)
   would test for the service file's existence and restart the pcs service via
   'pcs resource restart --wait=600 service' on the bootstrap node.

With this patchset we make use of paunch's ability do detect if a config
hash change happened to respawn a temporary container (called
<service>_restart_bundle) which will simply always restart the pacemaker
service from the bootstrap node whenever invoked, but only if the pcmk
resource already exists. For this reason we add config_volume and bind
mount it inside the container, so that the TRIPLEO_CONFIG_HASH env
variable gets generated for these *_restart_bundle containers.

We tested this change as follows:
A) Deployed an HA overcloud with this change and observed that pcmk resources
   were not restarted needlessly during initial deploy
B) Rerun the exact same overcloud deploy with no changes, observed that
   no spurious restarts would take place
C) Added an env file to trigger the of config of haproxy[1], redeployed and observed that it restarted
   haproxy only:
   Jun 06 16:22:37 overcloud-controller-0 dockerd-current[15272]: haproxy-bundle restart invoked
D) Added a trigger [2] for mysql config change, redeployed and observed restart:
   Jun 06 16:40:52 overcloud-controller-0 dockerd-current[15272]: galera-bundle restart invoked
E) Added a trigger [3] for a rabbitmq config change, redeployed and observed restart:
   Jun 06 17:03:41 overcloud-controller-0 dockerd-current[15272]: rabbitmq-bundle restart invoked
F) Added a trigger [4] for a redis config change, redeployed and observed restart:
   Jun 07 08:42:54 overcloud-controller-0 dockerd-current[15272]: redis-bundle restart invoked
G) Rerun a deploy with no changes and observed that no spurious restarts
   were triggered

[1] haproxy config change trigger:
parameter_defaults:
  ExtraConfig:
    tripleo::haproxy::haproxy_globals_override:
      'maxconn': 1111

[2] mysql config change trigger:
parameter_defaults:
  ExtraConfig:
    mysql_max_connections: 1111

[3] rabbitmq config change trigger (default partition handling is 'ignore'):
parameter_defaults:
  ExtraConfig:
    rabbitmq_config_variables:
      cluster_partition_handling: 'pause_minority'
      queue_master_locator: '<<"min-masters">>'
      loopback_users: '[]'

[4] redis config change trigger:
parameter_defaults:
  ExtraConfig:
    redis::tcp_backlog: 666
    redis::params::tcp_backlog: 666

Change-Id: I62870c055097569ceab2ff67cf0fe63122277c5b
Co-Authored-By: Damien Ciabrini <dciabrin@redhat.com>
Closes-Bug: #1775196
2018-06-08 16:06:24 +02:00
Lukas Bezdicka
979437aa89 Upgrades: Refactor package removal to step3
We need  to ensure idempotency of package removal.

Change-Id: I6a09549150d66cf2a88bbaf8134f2a62250ae869
2018-06-08 11:46:13 +02:00
Lukas Bezdicka
56bec75c02 Upgrades: Refactor playbooks to set facts
To not to redefine variable multiple times in each service we
run check only once and we set fact. To increase readability of
generated playbook we add block per strep in services.

Change-Id: I2399a72709d240f84e3463c5c3b56942462d1e5c
2018-06-08 11:46:12 +02:00
John Trowbridge
fd5339ac72 Match Net:SoftwareConfig resource in scenario000 to other scenarios
Change-Id: I070f9e95d1dc0c617da82ddaf1ba854be7624117
2018-06-07 23:25:53 +00:00
Dustin Schoenbrun
5e3d90f851 Fix typo with Manila upgrade template
There was a typo in the update_tasks for Manila which was causing
updates and upgrades to fail. This patch fixes the typo.

Closes-Bug: 1775667

Change-Id: I88dd16fa94111a4eb56aeaa32b560cf7d12b9f82
2018-06-07 18:59:31 +00:00