openstack
/
tripleo-quickstart-extras
Code Issues Proposed changes

Run os-net-config as part of node provisioning 

Render in the network_config from the node topology_map
and switch the 'node provision' command to use the
'--network-config' option so that the tripleo_network_config
role is applied to deployed nodes prior to running the
overcloud deploy command.

Related: blueprint network-data-v2-ports
Depends-On: https://review.opendev.org/790286
Change-Id: I438220744bdb1d426c8484d8548716278737ff86
This commit is contained in:
Harald Jensås 2021-05-07 19:29:06 +02:00
parent 10507caa47
commit d6482cd149
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
roles/overcloud-deploy/templates/overcloud-deploy.sh.j2
View File

@ -52,7 +52,7 @@ fi
## * Provision the baremetal nodes
## ::
openstack overcloud node provision \
{% if network_provision|bool %}--network-ports{% endif %} \
{% if network_provision|bool %}--network-config{% endif %} \
--stack {{ stack_name }} \
--output {{ working_dir }}/overcloud-baremetal-deployed.yaml {{ working_dir }}/overcloud_baremetal_deploy.yaml
if [ $? -ne 0 ]; then

7
roles/overcloud-deploy/templates/overcloud_baremetal_deploy.yaml.j2
View File

@ -2,10 +2,11 @@
{% set role_count = topology_map[role].scale |default(0) %}
{% set role_profile = topology_map[role].flavor |default('') %}
{% set role_networks = topology_map[role].networks |default([]) %}
{% set network_config = topology_map[role].network_config |default('') %}
{% if role_count %}
- name: {{ role }}
count: {{ role_count }}
{% if role_profile or (role_networks and network_isolation and network_provision|bool) %}
{% if role_profile or (network_config and network_provision|bool) or (role_networks and network_isolation and network_provision|bool) %}
defaults:
{% endif %}
{% if role_profile %}
@ -15,5 +16,9 @@
networks:
{{ role_networks | to_nice_yaml(indent=2) | indent(6)}}
{% endif %}
{% if network_config and network_provision|bool %}
network_config:
{{ network_config | to_nice_yaml(indent=2) | indent(6)}}
{% endif %}
{% endif %}
{% endfor %}