Skip to content
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.

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

fixing various issues #2161

Merged
merged 1 commit into from
Jul 8, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
region: "{{ ec2_region }}"
owners: "679593333241"
filters:
name: "Cisco-C8K-17.06.06a-42cb6e93-8d9d-490b-a73c-e3e56077ffd1"
name: "Cisco-C8K-17.14.01a-42cb6e93-8d9d-490b-a73c-e3e56077ffd1"
architecture: "x86_64"
register: cisco_ami_list

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,6 @@
username: "{{ item.tags.Student }}"
ansible_user: "{{ item.tags.username }}"
ansible_port: "{{ ssh_port }}"
ansible_libssh_publickey_algorithms: "ssh-rsa"
ansible_network_cli_ssh_type: libssh
ansible_ssh_private_key_file: "{{ playbook_dir }}/{{ ec2_name_prefix|lower }}/{{ ec2_name_prefix|lower }}-private.pem"
private_ip: "{{ item.private_ip_address }}"
ansible_network_os: "{{ item.tags.ansible_network_os }}"
Expand Down
1 change: 1 addition & 0 deletions roles/manage_ec2_instances/tasks/resources/resources.yml
Original file line number Diff line number Diff line change
Expand Up @@ -139,6 +139,7 @@
amazon.aws.ec2_key:
name: "{{ ec2_name_prefix }}-key"
region: "{{ ec2_region }}"
key_type: "ed25519"
register: create_key

- name: save private key
Expand Down
48 changes: 40 additions & 8 deletions roles/populate_controller/tasks/network.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
loop:
- 'infra.controller_configuration.hosts'
- 'infra.controller_configuration.organizations'
- 'infra.controller_configuration.users'
- 'infra.controller_configuration.users'
- 'infra.controller_configuration.teams'
- 'infra.controller_configuration.projects'
- 'infra.controller_configuration.job_templates'
Expand All @@ -16,7 +16,7 @@
loop_var: setup_controller

- name: Debug the student number via the username var
ansible.builtin.debug:
ansible.builtin.debug:
msg:
- "student: {{ student_number }}"
- "{{ groups['routers'] }}"
Expand All @@ -25,10 +25,10 @@
ansible.builtin.set_fact:
student_hosts: "{{ groups['routers'] | select('search', 'student' ~ student_number ~ '-') | list }}"

- name: Debug hosts for
- name: Debug hosts for
ansible.builtin.debug:
msg: "{{ student_hosts }}"

- name: Add devices into controller inventory
awx.awx.host:
name: "{{ hostvars[item].short_name }}"
Expand Down Expand Up @@ -58,7 +58,7 @@

- name: Debug the routers
debug:
msg:
msg:
- "cisco_routers_short_names: {{ cisco_routers_short_names }}"
- "arista_routers: {{ arista_routers }}"
- "juniper_routers: {{ juniper_routers }}"
Expand All @@ -73,7 +73,7 @@
controller_username: admin
controller_password: "{{ admin_password }}"
controller_host: "https://{{ ansible_host }}"
validate_certs: false
validate_certs: false

- name: Add hosts to juniper
awx.awx.group:
Expand All @@ -85,7 +85,7 @@
controller_username: admin
controller_password: "{{ admin_password }}"
controller_host: "https://{{ ansible_host }}"
validate_certs: false
validate_certs: false

- name: Add hosts to arista
awx.awx.group:
Expand All @@ -97,4 +97,36 @@
controller_username: admin
controller_password: "{{ admin_password }}"
controller_host: "https://{{ ansible_host }}"
validate_certs: false
validate_certs: false

- name: Add group routers
awx.awx.group:
name: routers
inventory: "Workshop Inventory"
children:
- cisco
- arista
- juniper
preserve_existing_hosts: True
preserve_existing_children: True
controller_username: admin
controller_password: "{{ admin_password }}"
controller_host: "https://{{ ansible_host }}"
validate_certs: false

- name: Add group network
awx.awx.group:
name: network
inventory: "Workshop Inventory"
children:
- routers
preserve_existing_hosts: True
preserve_existing_children: True
variables:
restore_inventory: "Workshop Inventory"
restore_credential: "Workshop Credential"
restore_project: "Workshop Project"
controller_username: admin
controller_password: "{{ admin_password }}"
controller_host: "https://{{ ansible_host }}"
validate_certs: false
16 changes: 1 addition & 15 deletions roles/populate_controller/vars/network.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ controller_hosts:
inventory: "Workshop Inventory"
enabled: true
variables:
ansible_user: "ec2-user"
ansible_user: "ec2-user"
controller_organizations:
- name: "Red Hat network organization"
description: "Red Hat Network Organization"
Expand Down Expand Up @@ -177,17 +177,3 @@ controller_groups:
variables:
ansible_network_os: junos
ansible_connection: netconf
- name: routers
inventory: "Workshop Inventory"
children:
- cisco
- arista
- juniper
- name: network
inventory: "Workshop Inventory"
children:
- routers
variables:
restore_inventory: "Workshop Inventory"
restore_credential: "Workshop Credential"
restore_project: "Workshop Project"