Skip to content

rename eos login/password variable name for clarity #793

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
lguohan merged 3 commits into from
Jan 30, 2019
Merged

rename eos login/password variable name for clarity #793

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bb7ff0a
rename eos login/password variable name for clarity
lguohan Jan 30, 2019
55055cd
rename sonic password variable names
lguohan Jan 30, 2019
d417089
move eos/sonic creds into group_vars/all to share them among differen…
lguohan Jan 30, 2019
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
11 changes: 11 additions & 0 deletions ansible/group_vars/all/creds.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
eos_default_login: "admin"
eos_default_password: ""
eos_login: admin
eos_password: 123456
eos_root_password: 123456

sonic_login: "admin"
sonic_default_passwords:
- "YourPaSsWoRd"
- "password"
sonic_password: "password"
4 changes: 0 additions & 4 deletions ansible/group_vars/eos/creds.yml
View file
Open in desktop

This file was deleted.

3 changes: 3 additions & 0 deletions ansible/roles/eos/tasks/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
- name: Set ansible login user name and password
set_fact: ansible_user="root" ansible_password={{ eos_root_password }}

- name: Load topo variables
include_vars: "vars/topo_{{ topo }}.yml"

Expand Down
4 changes: 2 additions & 2 deletions ansible/roles/vm_set/tasks/start_sonic_vm.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,11 +39,11 @@
- name: Wait until vm {{ dut_name }} is loaded
sonic_kickstart: telnet_port={{ serial_port }}
login={{ sonic_login }}
passwords={{ sonic_passwords }}
passwords={{ sonic_default_passwords }}
hostname={{ dut_name }}
mgmt_ip="{{ mgmt_ip_address }}/{{ mgmt_prefixlen }}"
mgmt_gw={{ vm_mgmt_gw | default(mgmt_gw) }}
new_password={{ sonic_new_password }}
new_password={{ sonic_password }}
register: kickstart_output

- name: Fail if kickstart gives error for {{ dut_name }}
Expand Down
20 changes: 10 additions & 10 deletions ansible/roles/vm_set/tasks/start_vm.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,14 +50,14 @@

- name: Wait until vm {{ vm_name }} is loaded
kickstart: telnet_port={{ serial_port }}
login={{ login }}
password={{ password }}
login={{ eos_default_login }}
password={{ eos_default_password }}
hostname={{ hostname }}
mgmt_ip="{{ mgmt_ip_address }}/{{ mgmt_prefixlen }}"
mgmt_gw={{ vm_mgmt_gw | default(mgmt_gw) }}
new_login={{ new_login }}
new_password={{ new_password }}
new_root_password={{ new_root_password }}
new_login={{ eos_login }}
new_password={{ eos_password }}
new_root_password={{ eos_root_password }}
register: kickstart_output
when: vm_name not in vm_list_running.list_vms or vm_name in respin_vms

Expand All @@ -77,14 +77,14 @@

- name: Wait until vm {{ vm_name }} is loaded
kickstart: telnet_port={{ serial_port }}
login={{ login }}
password={{ password }}
login={{ eos_default_login }}
password={{ eos_default_password }}
hostname={{ hostname }}
mgmt_ip="{{ mgmt_ip_address }}/{{ mgmt_prefixlen }}"
mgmt_gw={{ vm_mgmt_gw | default(mgmt_gw) }}
new_login={{ new_login }}
new_password={{ new_password }}
new_root_password={{ new_root_password }}
new_login={{ eos_login }}
new_password={{ eos_password }}
new_root_password={{ eos_root_password }}
register: kickstart_output_final
when: vm_name not in vm_list_running.list_vms and kickstart_output.kickstart_code != 0

Expand Down
12 changes: 0 additions & 12 deletions ansible/roles/vm_set/vars/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,3 @@
login: "admin"
password: ""
new_login: admin
new_password: 123456
new_root_password: 123456

sonic_login: "admin"
sonic_passwords:
- "YourPaSsWoRd"
- "password"
sonic_new_password: "password"

tor_memory: 1572864
spine_memory: 2097152

Expand Down