Browse Source

Merge "tripleo_overcloud_node_provision - add --network-config"

master
Zuul 3 days ago
committed by Gerrit Code Review
parent
commit
14e275358a
3 changed files with 14 additions and 0 deletions
  1. +1
    -0
      roles/tripleo_overcloud_node_provision/defaults/main.yml
  2. +12
    -0
      roles/tripleo_overcloud_node_provision/molecule/default/converge.yml
  3. +1
    -0
      roles/tripleo_overcloud_node_provision/tasks/main.yml

+ 1
- 0
roles/tripleo_overcloud_node_provision/defaults/main.yml View File

@ -20,3 +20,4 @@ tripleo_overcloud_node_provision_stack:
tripleo_overcloud_node_provision_timeout: 3700
tripleo_overcloud_node_provision_timeout_arg:
tripleo_overcloud_node_provision_network_ports:
tripleo_overcloud_node_provision_network_config:

+ 12
- 0
roles/tripleo_overcloud_node_provision/molecule/default/converge.yml View File

@ -115,3 +115,15 @@
that:
- tripleo_overcloud_node_provision_output ==
"overcloud node provision --network-ports"
- name: Assert "tripleo_overcloud_node_provision_network_config"
include_role:
name: "tripleo_overcloud_node_provision"
vars:
tripleo_overcloud_node_provision_network_config: true
- name: Validate tripleo_overcloud_node_provision_network_config
assert:
that:
- tripleo_overcloud_node_provision_output ==
"overcloud node provision --network-config"

+ 1
- 0
roles/tripleo_overcloud_node_provision/tasks/main.yml View File

@ -8,6 +8,7 @@
{{ tripleo_overcloud_node_provision_output_file | ternary('-o $PROVISION_OUTPUT', '') }}
{{ tripleo_overcloud_node_provision_stack | ternary('--stack $PROVISION_STACK', '') }}
{{ tripleo_overcloud_node_provision_network_ports | ternary('--network-ports', '') }}
{{ tripleo_overcloud_node_provision_network_config | ternary('--network-config', '') }}
{{ tripleo_overcloud_node_provision_overcloud_ssh_user | ternary('--overcloud-ssh-user $PROVISION_USER', '') }}
{{ tripleo_overcloud_node_provision_overcloud_ssh_key | ternary('--overcloud-ssh-key $PROVISION_KEY', '') }}
{{ tripleo_overcloud_node_provision_concurrency | ternary('--concurrency $PROVISION_CONCURRENCY', '') }}


Loading…
Cancel
Save