openstack/tripleo-heat-templates
Code Issues Proposed changes

Merge "Fix hiera condition in UndercloudCtlplaneNetworkDeployment"

Browse Source
This commit is contained in:
Zuul 2018-11-10 03:46:51 +00:00 committed by Gerrit Code Review
commit 2ffe5d65f9
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
extraconfig/post_deploy/undercloud_ctlplane_network.py
View File

@ -260,8 +260,11 @@ def config_neutron_segments_and_subnets(sdk, ctlplane_id):
_ensure_neutron_router(sdk, name, subnet.id) _ensure_neutron_router(sdk, name, subnet.id)
if 'true' not in _run_command(['hiera', 'neutron_api_enabled'],
if _run_command(['hiera', 'neutron_api_enabled'], name='hiera'): name='hiera').lower():
print('WARNING: UndercloudCtlplaneNetworkDeployment : The Neutron API '
'is disabled. The ctlplane network cannot be configured.')
else:
sdk = os_client_config.make_sdk(auth_url=AUTH_URL, sdk = os_client_config.make_sdk(auth_url=AUTH_URL,
project_name='admin', project_name='admin',
username='admin', username='admin',

1
extraconfig/post_deploy/undercloud_post.yaml
View File

@ -184,6 +184,7 @@ resources:
UndercloudCtlplaneNetworkDeployment: UndercloudCtlplaneNetworkDeployment:
type: OS::Heat::SoftwareDeployments type: OS::Heat::SoftwareDeployments
depends_on: UndercloudPostDeployment
properties: properties:
name: UndercloudCtlplaneNetworkDeployment name: UndercloudCtlplaneNetworkDeployment
servers: {get_param: servers} servers: {get_param: servers}