openstack/tripleo-quickstart-extras
Code Issues Proposed changes

Merge "Baremetal deploy network ports support"

Browse Source
This commit is contained in:
Zuul 2021-03-29 15:39:42 +00:00 committed by Gerrit Code Review
commit 1353686ddf
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

@ -1,12 +1,19 @@
{% for role in topology_map %} {% for role in topology_map %}
{% set role_count = topology_map[role].scale |default(0) %} {% set role_count = topology_map[role].scale |default(0) %}
{% set role_profile = topology_map[role].flavor |default('') %} {% set role_profile = topology_map[role].flavor |default('') %}
{% set role_networks = topology_map[role].networks |default([]) %}
{% if role_count %} {% if role_count %}
- name: {{ role }} - name: {{ role }}
count: {{ role_count }} count: {{ role_count }}
{% if role_profile %} {% if role_profile or (role_networks and network_isolation and network_provision|bool) %}
defaults: defaults:
{% endif %}
{% if role_profile %}
profile: {{ role_profile }} profile: {{ role_profile }}
{% endif %} {% endif %}
{% if role_networks and network_isolation and network_provision|bool %}
networks:
{{ role_networks | to_nice_yaml(indent=2) | indent(6)}}
{% endif %}
{% endif %} {% endif %}
{% endfor %} {% endfor %}