Make sure we keep using tripleo-admin as ssh user in CI

First we switched the user to tripleo-admin [1] which made CI on
updates job green, but broke Nova-based environments. We're now
switching the default back to heat-admin [2] which will break updates
job again, so we add support to tripleo-upgrade [3] to customize the
user name and set it here to the value for CI (deployed server
environments).

Fear not, when we switch to --config-download as our only supported
deployment method, tripleo-admin should become unconditionally present
in all environments, and we'll be able to converge to a single method
of logging into the overcloud nodes.

[1] I1ec66886d6d61ccf528e5e27872cf68c7a603727
[2] I0df57002b2305c1e2504c9f7a7d0c326d8ffcaf7
[3] Ib486a812aa9fd96bc753eda122cd05682d97b209

Co-Authored-By: Jose Luis Franco <jfrancoa@redhat.com>
Change-Id: I063d438fbeeded28134658aaefc6c8b7119aee43
Related-Bug: #1759845
Depends-On: I0df57002b2305c1e2504c9f7a7d0c326d8ffcaf7
This commit is contained in:
Jiri Stransky 2018-04-04 17:39:06 +02:00 committed by Jose Luis Franco Arza
parent f844fc3f97
commit 190c3b6941
3 changed files with 4 additions and 0 deletions

View File

@ -9,6 +9,7 @@ tripleo_upgrade_validations_non_fatal: true
tripleo_upgrade_debug: true
tripleo_ci: true
use_oooq: true
overcloud_ssh_user: "tripleo-admin"
network_isolation: false
enable_pacemaker: false

View File

@ -46,6 +46,7 @@ tripleo_ci: true
use_oooq: true
tripleo_upgrade_debug: true
overcloud_ssh_user: "tripleo-admin"
# Mandatory for deployed_servers
tripleo_upgrade_validations_non_fatal: true
@ -91,3 +92,4 @@ overcloud_roles:
- Storage
- StorageMgmt
- Tenant

View File

@ -47,6 +47,7 @@ tripleo_ci: true
use_oooq: true
tripleo_upgrade_debug: true
overcloud_ssh_user: "tripleo-admin"
# Mandatory for deployed_servers
tripleo_upgrade_validations_non_fatal: true