diff options
| author |   Ross Brattain <ross.b.brattain@intel.com> | 2018-03-12 09:06:04 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2018-03-12 09:06:04 +0000 |
| commit | 31efe64526ae5250b103a313c3041baa79864b5f (patch) | |
| tree | d4661b961bf5631dff4ff4b4bb7bb67d9e523f6c | |
| parent | 3a5627e416d68e2ba6a170750a680403ad8a1b6d (diff) | |
| parent | 67e46e2bcc624e455fd7fb82c64eb71529e2dee0 (diff) | |
Merge "Update the fuel pod.yaml"
| -rw-r--r-- | etc/yardstick/nodes/fuel_baremetal/pod.yaml | 13 | ||||
| -rwxr-xr-x | tests/ci/prepare_env.sh | 10 |
2 files changed, 22 insertions, 1 deletions
diff --git a/etc/yardstick/nodes/fuel_baremetal/pod.yaml b/etc/yardstick/nodes/fuel_baremetal/pod.yaml index 5ce555293..301433d50 100644 --- a/etc/yardstick/nodes/fuel_baremetal/pod.yaml +++ b/etc/yardstick/nodes/fuel_baremetal/pod.yaml @@ -49,3 +49,16 @@ nodes: ip: ip5 user: node_username key_filename: node_keyfile +- + name: node6 + role: Opendaylight + ip: ip6 + user: node_username + key_filename: node_keyfile +- + name: node7 + role: Gateway + ip: ip7 + user: node_username + key_filename: node_keyfile + diff --git a/tests/ci/prepare_env.sh b/tests/ci/prepare_env.sh index a097cec69..d7c60d48f 100755 --- a/tests/ci/prepare_env.sh +++ b/tests/ci/prepare_env.sh @@ -72,10 +72,12 @@ if [ "$INSTALLER_TYPE" == "fuel" ]; then # update "ip" according to the CI env ssh -l ubuntu "${INSTALLER_IP}" -i ${SSH_KEY} ${ssh_options} \ - "sudo salt -C 'ctl* or cmp*' grains.get fqdn_ip4 --out yaml">node_info + "sudo salt -C 'ctl* or cmp* or odl01* or gtw*' grains.get fqdn_ip4 --out yaml">node_info controller_ips=($(awk '/ctl/{getline; print $2}' < node_info)) compute_ips=($(awk '/cmp/{getline; print $2}' < node_info)) + odl_ip=($(awk '/odl01/{getline; print $2}' < node_info)) + gateway_ip=($(awk '/gtw/{getline; print $2}' < node_info)) if [[ ${controller_ips[0]} ]]; then sed -i "s|ip1|${controller_ips[0]}|" "${pod_yaml}" @@ -92,6 +94,12 @@ if [ "$INSTALLER_TYPE" == "fuel" ]; then if [[ ${compute_ips[1]} ]]; then sed -i "s|ip5|${compute_ips[1]}|" "${pod_yaml}" fi + if [[ ${odl_ip[0]} ]]; then + sed -i "s|ip6|${odl_ip[0]}|" "${pod_yaml}" + fi + if [[ ${gateway_ip[0]} ]]; then + sed -i "s|ip7|${gateway_ip[0]}|" "${pod_yaml}" + fi # update 'user' and 'key_filename' according to the CI env sed -i "s|node_username|${USER_NAME}|;s|node_keyfile|${SSH_KEY}|" "${pod_yaml}" |