openstack
/
python-tripleoclient
Code Issues Proposed changes

Fallback the default roles file for UC config 

The roles_file config param is expected to have a
fallback value for undercloud --use-heat deployments.

Change-Id: Iaef2671acf516b7e89358984a0d8a59555fc91f0
Signed-off-by: Bogdan Dobrelya <bdobreli@redhat.com>
This commit is contained in:
Bogdan Dobrelya 2018-05-22 16:36:21 +02:00
parent 3931606423
commit 7a7cafe161
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
tripleoclient/v1/undercloud_config.py
View File

@ -34,6 +34,7 @@ from tripleo_common.image import kolla_builder
from tripleoclient.config.undercloud import SUBNETS_DEFAULT
from tripleoclient.config.undercloud import UndercloudConfig
from tripleoclient import constants
from tripleoclient import exceptions
from tripleoclient import utils
from tripleoclient.v1 import undercloud_preflight
@ -328,7 +329,7 @@ def prepare_undercloud_deploy(upgrade=False, no_validations=False,
tht_templates = THT_HOME
deploy_args.append('--templates=%s' % THT_HOME)
if CONF.get('roles_file', None):
if CONF.get('roles_file', constants.UNDERCLOUD_ROLES_FILE):
deploy_args.append('--roles-file=%s' % CONF['roles_file'])
if upgrade: