Skip to content

Remove unused arguments when calling testbed_config_vchassis playbook. #17999

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rlhui merged 2 commits into from
Apr 18, 2025
Merged

Remove unused arguments when calling testbed_config_vchassis playbook. #17999

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6c6e9f2
remove unused arguments when calling config_vchassis playbook.
BYGX-wcr Apr 15, 2025
eb6c406
remove unused --vault-password-file
BYGX-wcr Apr 16, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions ansible/testbed-cli.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -332,8 +332,7 @@ function add_topo
fi

if [[ $topo == *"t2"* ]]; then
ansible-playbook -i ${inv_name} testbed_config_vchassis.yml --vault-password-file="$passfile" -l "$duts" -e testbed_name="$testbed_name" \
-e topo="$topo" -e testbed_file=$tbfile -e vm_file=$vmfile -e server="$server" $@
ansible-playbook -i ${inv_name} testbed_config_vchassis.yml --vault-password-file="$passfile" -l "$duts" -e topo="$topo"
Copy link
Copy Markdown
Contributor

@arista-nwolfe arista-nwolfe Apr 16, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think the password file is saved in the variable ${passwd} in add_topo, not sure how important this is for this call.

Copy link
Copy Markdown
Contributor Author

@BYGX-wcr BYGX-wcr Apr 16, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I just removed it.

fi

# Delete the obsoleted arp entry for the PTF IP
Expand Down Expand Up @@ -828,8 +827,7 @@ function config_vs_chassis

read_file $testbed_name

ansible-playbook -i "$inventory" testbed_config_vchassis.yml --vault-password-file="$passfile" -l "$duts" -e testbed_name="$testbed_name" \
-e topo="$topo" -e testbed_file=$tbfile -e vm_file=$vmfile -e deploy=true $@
ansible-playbook -i "$inventory" testbed_config_vchassis.yml --vault-password-file="$passfile" -l "$duts" -e topo="$topo"

echo Done
}
Expand Down
6 changes: 0 additions & 6 deletions ansible/testbed_config_vchassis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,6 @@
meta: end_play
when: is_vs_chassis is not defined or is_vs_chassis == false

- name: Check that variable testbed_name is defined
fail: msg="Define testbed_name variable with -e testbed_name=something"
when: testbed_name is not defined

- debug: msg="testbed_name = {{ testbed_name }}"

- name: Check that variable topo is defined
fail: msg="Define topo variable with -e topo=something"
when: topo is not defined
Expand Down
Loading