In tripleo-quickstart, we use the composable_scenario variable to indicate the path of an environment file that defines how the overcloud nodes are going to be deployed. This is working well in the general case, however in the case of the upgrade from BM to container, we need a different variable for the composable_scenario used at deploy time and the one used at upgrade time, otherwise we'll use the containers scenario to deploy the first overcloud, which means we're never actually testing BM to containers upgrade.
Here is an example where quickstart includes the '/home/jenkins/tripleo-heat-templates/ci/environments/scenario002-multinode-containers.yaml' environment file pointing to containerized resource to deploy the overcloud:
http://logs.openstack.org/57/499457/2/check/gate-tripleo-ci-centos-7-scenario002-multinode-oooq-container-upgrades-nv/038060a/logs/undercloud/home/jenkins/overcloud-deploy.sh
Related fix proposed to branch: master /review. openstack. org/500546
Review: https:/