diff --git a/docs/contribute-aws.md b/docs/contribute-aws.md index 961b1fb64..5bfa14354 100644 --- a/docs/contribute-aws.md +++ b/docs/contribute-aws.md @@ -9,3 +9,9 @@ There are four components to the AWS `manage_ec2_instances` role: - **ami_find** - this dynamically figures out the correct AMI (Amazon Machine Image) to use depending on which Amazon region you are in (e.g. `us-east-1`). Examples for each `workshop_type` can be found in `provisioner/roles/manage_ec2_instances/tasks/ami_find` - **inventory** - this loads the newly created instances into Ansible Inventory so subsequent Ansible Plays can be executed. This is so Ansible can now configure the vanilla images by making changes to the newly created instances. For example we install Ansible for each student, configure their `/etc/hosts`, the `~/.ssh/config` and much more depending the `workshop_type`. Examples of inventory can be found in `provisioner/roles/manage_ec2_instances/tasks/inventory` + +## Getting Help + +Please [file issues on Github](https://github.com/ansible/workshops/issues). Please fill out all required information. Your issue will be closed if you skip required information in the Github issues template. + +![Ansible-Workshop-Logo.png](../images/Ansible-Workshop-Logo.png) diff --git a/docs/contribute.md b/docs/contribute.md index 65bfefe07..09edfec86 100644 --- a/docs/contribute.md +++ b/docs/contribute.md @@ -109,3 +109,9 @@ To make sure this is run everytime one commits a change, and hence one is not se The following links will be helpful if you want to contribute code to the Ansible Workshops project, or any Ansible project: - [Ansible Committer Guidelines](http://docs.ansible.com/ansible/latest/committer_guidelines.html) - [Learning Git](https://git-scm.com/book/en/v2) + +## Getting Help + +Please [file issues on Github](https://github.com/ansible/workshops/issues). Please fill out all required information. Your issue will be closed if you skip required information in the Github issues template. + +![Ansible-Workshop-Logo.png](../images/Ansible-Workshop-Logo.png) diff --git a/docs/exercises.md b/docs/exercises.md index 5b7bcc197..d4730400e 100644 --- a/docs/exercises.md +++ b/docs/exercises.md @@ -89,3 +89,9 @@ exercise_src_location: "exercises/my_exercises" ``` This would load the exercises `/exercises/my_exercises` from fork `github.com/ipvsean/workshops.git` branch `test_branch` into the student home directory of `~/my_folder` + +## Getting Help + +Please [file issues on Github](https://github.com/ansible/workshops/issues). Please fill out all required information. Your issue will be closed if you skip required information in the Github issues template. + +![Ansible-Workshop-Logo.png](../images/Ansible-Workshop-Logo.png) diff --git a/docs/faq.md b/docs/faq.md index 6079ff1a6..73efb1eb7 100644 --- a/docs/faq.md +++ b/docs/faq.md @@ -156,3 +156,9 @@ objc[43678]: +[__NSPlaceholderDate initialize] may have been in progress in anot ``` $ export OBJC_DISABLE_INITIALIZE_FORK_SAFETY=YES ``` + +## Getting Help + +Please [file issues on Github](https://github.com/ansible/workshops/issues). Please fill out all required information. Your issue will be closed if you skip required information in the Github issues template. + +![Ansible-Workshop-Logo.png](../images/Ansible-Workshop-Logo.png) diff --git a/docs/release.md b/docs/release.md index fd877a467..bed640aa2 100644 --- a/docs/release.md +++ b/docs/release.md @@ -51,3 +51,9 @@ cc @cloin @liquidat @goetzrieger @Spredzy ![passed ci](../images/passed.png) 7. If there are major changes, announce these to Roland to make sure they reach his newsletter :) + +## Getting Help + +Please [file issues on Github](https://github.com/ansible/workshops/issues). Please fill out all required information. Your issue will be closed if you skip required information in the Github issues template. + +![Ansible-Workshop-Logo.png](../images/Ansible-Workshop-Logo.png) diff --git a/docs/setup.md b/docs/setup.md index 878bdd5af..b350728a4 100644 --- a/docs/setup.md +++ b/docs/setup.md @@ -54,3 +54,9 @@ https://docs.ansible.com/ansible-tower/latest/html/upgrade-migration-guide/virtu [root@centos ~]# pip install --upgrade boto3 [root@centos ~]# deactivate ``` + +## Getting Help + +Please [file issues on Github](https://github.com/ansible/workshops/issues). Please fill out all required information. Your issue will be closed if you skip required information in the Github issues template. + +![Ansible-Workshop-Logo.png](../images/Ansible-Workshop-Logo.png) diff --git a/images/Ansible-Workshop-Logo.png b/images/Ansible-Workshop-Logo.png new file mode 100644 index 000000000..1f04aa264 Binary files /dev/null and b/images/Ansible-Workshop-Logo.png differ diff --git a/provisioner/README.md b/provisioner/README.md index 70a55e915..6b7b4ae76 100644 --- a/provisioner/README.md +++ b/provisioner/README.md @@ -199,3 +199,5 @@ What does the AWS provisioner take care of automatically? ## Getting Help Please [file issues on Github](https://github.com/ansible/workshops/issues). Please fill out all required information. Your issue will be closed if you skip required information in the Github issues template. + +![Ansible-Workshop-Logo.png](../images/Ansible-Workshop-Logo.png) diff --git a/provisioner/roles/manage_ec2_instances/tasks/cluster_instances.yml b/provisioner/roles/manage_ec2_instances/tasks/cluster_instances.yml index a1113d916..9a9207ccf 100644 --- a/provisioner/roles/manage_ec2_instances/tasks/cluster_instances.yml +++ b/provisioner/roles/manage_ec2_instances/tasks/cluster_instances.yml @@ -20,6 +20,7 @@ Students: "{{ student_total }}" username: "{{ ec2_info[control_type].username }}" short_name: "ansible-{{ sequence }}" + ansible-workshops: true wait: "{{ ec2_wait }}" vpc_subnet_id: "{{ ec2_vpc_subnet_id }}" volumes: diff --git a/provisioner/roles/manage_ec2_instances/tasks/instances/instances_attendance.yml b/provisioner/roles/manage_ec2_instances/tasks/instances/instances_attendance.yml index 886f76ac9..2e038294b 100644 --- a/provisioner/roles/manage_ec2_instances/tasks/instances/instances_attendance.yml +++ b/provisioner/roles/manage_ec2_instances/tasks/instances/instances_attendance.yml @@ -23,6 +23,7 @@ short_name: 'attendance-host' long_name: "attendance-host.{{ ec2_name_prefix }}.{{ workshop_dns_zone | default('') }}" username: "{{ ec2_info['attendance_host']['username'] }}" + ansible-workshops: true wait: "{{ ec2_wait }}" vpc_subnet_id: "{{ ec2_vpc_subnet_id }}" register: attendance_output diff --git a/provisioner/roles/manage_ec2_instances/tasks/instances/instances_devops.yml b/provisioner/roles/manage_ec2_instances/tasks/instances/instances_devops.yml index a8e700dc1..7542b1d0b 100644 --- a/provisioner/roles/manage_ec2_instances/tasks/instances/instances_devops.yml +++ b/provisioner/roles/manage_ec2_instances/tasks/instances/instances_devops.yml @@ -23,6 +23,7 @@ short_name: "dev_web1" username: "{{ ec2_info[rhel].username }}" Devops_tag: dev_web1 + ansible-workshops: true wait: "{{ ec2_wait }}" vpc_subnet_id: "{{ ec2_vpc_subnet_id }}" volumes: @@ -70,6 +71,7 @@ short_name: "dev_web2" username: "{{ ec2_info[rhel].username }}" Devops_tag: dev_web2 + ansible-workshops: true wait: "{{ ec2_wait }}" vpc_subnet_id: "{{ ec2_vpc_subnet_id }}" volumes: @@ -117,6 +119,7 @@ short_name: "prod_web1" username: "{{ ec2_info[rhel].username }}" Devops_tag: prod_web1 + ansible-workshops: true wait: "{{ ec2_wait }}" vpc_subnet_id: "{{ ec2_vpc_subnet_id }}" volumes: @@ -164,6 +167,7 @@ short_name: "prod_web2" username: "{{ ec2_info[rhel].username }}" Devops_tag: prod_web2 + ansible-workshops: true wait: "{{ ec2_wait }}" vpc_subnet_id: "{{ ec2_vpc_subnet_id }}" volumes: diff --git a/provisioner/roles/manage_ec2_instances/tasks/instances/instances_f5.yml b/provisioner/roles/manage_ec2_instances/tasks/instances/instances_f5.yml index 45589de3d..40430451f 100644 --- a/provisioner/roles/manage_ec2_instances/tasks/instances/instances_f5.yml +++ b/provisioner/roles/manage_ec2_instances/tasks/instances/instances_f5.yml @@ -23,6 +23,7 @@ Students: "{{ student_total }}" username: "{{ ec2_info.f5node.username }}" short_name: "f5" + ansible-workshops: true wait: "{{ ec2_wait }}" vpc_subnet_id: "{{ ec2_vpc_subnet_id }}" register: f5_output @@ -64,6 +65,7 @@ Students: "{{ student_total }}" short_name: node1 username: "{{ ec2_info[rhel].username }}" + ansible-workshops: true wait: "{{ ec2_wait }}" vpc_subnet_id: "{{ ec2_vpc_subnet_id }}" register: node1_output @@ -105,6 +107,7 @@ Students: "{{ student_total }}" short_name: node2 username: "{{ ec2_info[rhel].username }}" + ansible-workshops: true wait: "{{ ec2_wait }}" vpc_subnet_id: "{{ ec2_vpc_subnet_id }}" register: node2_output diff --git a/provisioner/roles/manage_ec2_instances/tasks/instances/instances_network.yml b/provisioner/roles/manage_ec2_instances/tasks/instances/instances_network.yml index a56ce14fc..8c2b93c0e 100644 --- a/provisioner/roles/manage_ec2_instances/tasks/instances/instances_network.yml +++ b/provisioner/roles/manage_ec2_instances/tasks/instances/instances_network.yml @@ -34,6 +34,7 @@ ansible_network_os: "{{ ec2_info[rtr1_type].os }}" username: "{{ ec2_info[rtr1_type].username }}" group: core + ansible-workshops: true wait: "{{ ec2_wait }}" vpc_subnet_id: "{{ ec2_vpc_subnet_id }}" volumes: "{{ec2_info[rtr1_type].volume | default(omit)}}" @@ -80,6 +81,7 @@ ansible_network_os: "{{ ec2_info[rtr2_type].os }}" username: "{{ ec2_info[rtr1_type].username }}" group: core + ansible-workshops: true wait: "{{ ec2_wait }}" vpc_subnet_id: "{{ ec2_vpc_subnet_id2 }}" volumes: "{{ ec2_info[rtr2_type].volume | default(omit) }}" @@ -126,6 +128,7 @@ ansible_network_os: "{{ ec2_info[rtr3_type].os }}" username: "{{ ec2_info[rtr1_type].username }}" group: access + ansible-workshops: true wait: "{{ ec2_wait }}" vpc_subnet_id: "{{ ec2_vpc_subnet_id }}" volumes: "{{ ec2_info[rtr3_type].volume | default(omit) }}" @@ -172,6 +175,7 @@ ansible_network_os: "{{ ec2_info[rtr4_type].os }}" username: "{{ ec2_info[rtr1_type].username }}" group: access + ansible-workshops: true wait: "{{ ec2_wait }}" vpc_subnet_id: "{{ ec2_vpc_subnet_id2 }}" volumes: "{{ ec2_info[rtr4_type].volume | default(omit) }}" diff --git a/provisioner/roles/manage_ec2_instances/tasks/instances/instances_rhel.yml b/provisioner/roles/manage_ec2_instances/tasks/instances/instances_rhel.yml index 9d6e1f89f..db671fe72 100644 --- a/provisioner/roles/manage_ec2_instances/tasks/instances/instances_rhel.yml +++ b/provisioner/roles/manage_ec2_instances/tasks/instances/instances_rhel.yml @@ -22,6 +22,7 @@ Students: "{{ student_total }}" short_name: "node1" username: "{{ ec2_info[rhel].username }}" + ansible-workshops: true wait: "{{ ec2_wait }}" vpc_subnet_id: "{{ ec2_vpc_subnet_id }}" volumes: @@ -68,6 +69,7 @@ Students: "{{ student_total }}" short_name: "node2" username: "{{ ec2_info[rhel].username }}" + ansible-workshops: true wait: "{{ ec2_wait }}" vpc_subnet_id: "{{ ec2_vpc_subnet_id }}" volumes: @@ -114,6 +116,7 @@ Students: "{{ student_total }}" short_name: "node3" username: "{{ ec2_info[rhel].username }}" + ansible-workshops: true wait: "{{ ec2_wait }}" vpc_subnet_id: "{{ ec2_vpc_subnet_id }}" volumes: @@ -160,6 +163,7 @@ Students: "{{ student_total }}" short_name: "isonode" username: "{{ ec2_info[rhel].username }}" + ansible-workshops: true wait: "{{ ec2_wait }}" vpc_subnet_id: "{{ ec2_vpc_subnet_id }}" volumes: @@ -205,6 +209,7 @@ Students: "{{ student_total }}" short_name: "remotenode" username: "{{ ec2_info[rhel].username }}" + ansible-workshops: true wait: "{{ ec2_wait }}" vpc_subnet_id: "{{ ec2_vpc_subnet_id }}" volumes: diff --git a/provisioner/roles/manage_ec2_instances/tasks/instances/instances_smart_mgmt.yml b/provisioner/roles/manage_ec2_instances/tasks/instances/instances_smart_mgmt.yml index 60964e3ed..3cccac790 100644 --- a/provisioner/roles/manage_ec2_instances/tasks/instances/instances_smart_mgmt.yml +++ b/provisioner/roles/manage_ec2_instances/tasks/instances/instances_smart_mgmt.yml @@ -22,6 +22,7 @@ Students: "{{ student_total }}" short_name: "satellite" username: "{{ ec2_info[rhel].username }}" + ansible-workshops: true wait: "{{ ec2_wait }}" vpc_subnet_id: "{{ ec2_vpc_subnet_id }}" volumes: diff --git a/provisioner/roles/manage_ec2_instances/tasks/instances/instances_storage.yml b/provisioner/roles/manage_ec2_instances/tasks/instances/instances_storage.yml index 2dff73355..4d5cc0958 100644 --- a/provisioner/roles/manage_ec2_instances/tasks/instances/instances_storage.yml +++ b/provisioner/roles/manage_ec2_instances/tasks/instances/instances_storage.yml @@ -35,6 +35,7 @@ Students: "{{ student_total }}" short_name: "netapp" username: "{{ ec2_info[rhel].username }}" + ansible-workshops: true wait: "{{ ec2_wait }}" vpc_subnet_id: "{{ ec2_vpc_subnet_id }}" volumes: @@ -54,6 +55,7 @@ Index: "{{ item[0] }}" Student: "student{{ item.0 + 1 }}" launch_time: "{{ item.1.launch_time }}" + ansible-workshops: true with_indexed_items: - "{{ netapp_output.instances }}" when: netapp_output.instance_ids is not none diff --git a/provisioner/roles/manage_ec2_instances/tasks/instances/instances_windows.yml b/provisioner/roles/manage_ec2_instances/tasks/instances/instances_windows.yml index dc58daace..c5967670c 100644 --- a/provisioner/roles/manage_ec2_instances/tasks/instances/instances_windows.yml +++ b/provisioner/roles/manage_ec2_instances/tasks/instances/instances_windows.yml @@ -25,6 +25,7 @@ short_name: 'gitlab' long_name: "gitlab.{{ ec2_name_prefix }}.{{ workshop_dns_zone | default('') }}" username: "{{ ec2_info['skylight_rhel8_gitlab']['username'] }}" + ansible-workshops: true wait: "{{ ec2_wait }}" vpc_subnet_id: "{{ ec2_vpc_subnet_id }}" user_data: "{{ lookup('template', 'skylight_gitlab_userdata.j2') }}" @@ -53,6 +54,7 @@ Linklight: "This was provisioned through the linklight provisioner" Students: "{{ student_total }}" short_name: "instance1" + ansible-workshops: true wait: "{{ ec2_wait }}" vpc_subnet_id: "{{ ec2_vpc_subnet_id }}" user_data: "{{ lookup('template', 'skylight_windows_userdata.j2', template_vars=dict(vm_name='instance1')) }}" @@ -81,6 +83,7 @@ Linklight: "This was provisioned through the linklight provisioner" Students: "{{ student_total }}" short_name: "instance2" + ansible-workshops: true wait: "{{ ec2_wait }}" vpc_subnet_id: "{{ ec2_vpc_subnet_id }}" user_data: "{{ lookup('template', 'skylight_windows_userdata.j2', template_vars=dict(vm_name='instance2')) }}" diff --git a/provisioner/roles/manage_ec2_instances/tasks/resources/resources.yml b/provisioner/roles/manage_ec2_instances/tasks/resources/resources.yml index 9c4d08470..4ac7506ba 100644 --- a/provisioner/roles/manage_ec2_instances/tasks/resources/resources.yml +++ b/provisioner/roles/manage_ec2_instances/tasks/resources/resources.yml @@ -14,6 +14,7 @@ Students: "{{ student_total }}" Workshop_type: "{{ workshop_type }}" Workshop: "{{ ec2_name_prefix }}" + ansible-workshops: true register: create_vpc until: create_vpc is not failed retries: 5 @@ -41,6 +42,7 @@ Students: "{{ student_total }}" Workshop_type: "{{ workshop_type }}" Workshop: "{{ ec2_name_prefix }}" + ansible-workshops: true rules: "{{ all_rules }}" rules_egress: - proto: all @@ -64,6 +66,7 @@ Students: "{{ student_total }}" Workshop_type: "{{ workshop_type }}" Workshop: "{{ ec2_name_prefix }}" + ansible-workshops: true rules: - proto: tcp from_port: 22 @@ -108,6 +111,7 @@ Students: "{{ student_total }}" Workshop_type: "{{ workshop_type }}" Workshop: "{{ ec2_name_prefix }}" + ansible-workshops: true register: create_subnet when: ec2_vpc_id is undefined until: create_subnet is not failed @@ -128,6 +132,7 @@ Students: "{{ student_total }}" Workshop_type: "{{ workshop_type }}" Workshop: "{{ ec2_name_prefix }}" + ansible-workshops: true register: create_subnet2 until: create_subnet2 is not failed retries: 15 @@ -143,6 +148,7 @@ Students: "Total {{ student_total }}" Workshop_type: "{{ workshop_type }}" Workshop: "{{ ec2_name_prefix }}" + ansible-workshops: true register: igw until: igw is not failed retries: 15 @@ -164,6 +170,7 @@ Students: "{{ student_total }}" Workshop_type: "{{ workshop_type }}" Workshop: "{{ ec2_name_prefix }}" + ansible-workshops: true register: routetable until: routetable is not failed retries: 5 @@ -181,6 +188,8 @@ name: "{{ ec2_name_prefix|lower }}.{{ workshop_dns_zone|lower }}.private" state: present region: "{{ ec2_region }}" + tags: + ansible-workshops: true retries: 4 delay: 15 register: s3_result diff --git a/provisioner/roles/manage_ec2_instances/tasks/resources/resources_network.yml b/provisioner/roles/manage_ec2_instances/tasks/resources/resources_network.yml index 7a71d0177..6bd0aa385 100644 --- a/provisioner/roles/manage_ec2_instances/tasks/resources/resources_network.yml +++ b/provisioner/roles/manage_ec2_instances/tasks/resources/resources_network.yml @@ -9,6 +9,7 @@ Info: "Username that provisioned this-> {{ aws_user }}" Linklight: "This was provisioned through the linklight provisioner" Students: "{{student_total}}" + ansible-workshops: true register: create_vpc2 when: ec2_vpc_id2 is undefined until: create_vpc2 is not failed @@ -25,6 +26,7 @@ Info: "Username that provisioned this-> {{ aws_user }}" Linklight: "This was provisioned through the linklight provisioner" Students: "{{student_total}}" + ansible-workshops: true rules: - proto: 47 to_port: -1 @@ -78,6 +80,7 @@ Info: "Username that provisioned this-> {{ aws_user }}" Linklight: "This was provisioned through the linklight provisioner" Students: "{{student_total}}" + ansible-workshops: true register: create_subnet2 until: create_subnet2 is not failed retries: 15 @@ -92,6 +95,7 @@ Info: "Username that provisioned this-> {{ aws_user }}" Linklight: "This was provisioned through the linklight provisioner" Students: "Total {{student_total}}" + ansible-workshops: true register: igw2 until: igw2 is not failed retries: 15 @@ -111,6 +115,7 @@ Info: "Username that provisioned this-> {{ aws_user }}" Linklight: "This was provisioned through the linklight provisioner" Students: "{{student_total}}" + ansible-workshops: true register: routetablenetworking until: routetablenetworking is not failed retries: 5 diff --git a/provisioner/roles/manage_ec2_instances/tasks/security_includes/security_ec2_checkpoint_gw_eni_bookkeeping.yml b/provisioner/roles/manage_ec2_instances/tasks/security_includes/security_ec2_checkpoint_gw_eni_bookkeeping.yml index ed28c39ce..efefa8016 100644 --- a/provisioner/roles/manage_ec2_instances/tasks/security_includes/security_ec2_checkpoint_gw_eni_bookkeeping.yml +++ b/provisioner/roles/manage_ec2_instances/tasks/security_includes/security_ec2_checkpoint_gw_eni_bookkeeping.yml @@ -84,6 +84,7 @@ uuid: "{{ ec2_name_prefix }}" guid: "{{ ec2_name_prefix }}" VPC: "{{ec2_name_prefix}}" + ansible-workshops: true when: "(item|length|int > 1) and ('allocation_id' in item[1])" with_indexed_items: - "{{ ('results' in wait_subnet1_eip_creation_checkpoint_gw) | ternary(wait_subnet1_eip_creation_checkpoint_gw['results'], []) }}" @@ -106,6 +107,7 @@ Workshop: "{{ ec2_name_prefix }}" uuid: "{{ ec2_name_prefix }}" guid: "{{ ec2_name_prefix }}" + ansible-workshops: true when: "(item|length|int > 1) and ('interface' in item[1])" with_indexed_items: - "{{ ('results' in wait_eni1_creation_checkpoint_gw) | ternary(wait_eni1_creation_checkpoint_gw['results'], []) }}" @@ -128,6 +130,7 @@ Workshop: "{{ ec2_name_prefix }}" uuid: "{{ ec2_name_prefix }}" guid: "{{ ec2_name_prefix }}" + ansible-workshops: true when: "(item|length|int > 1) and ('interface' in item[1])" with_indexed_items: - "{{ ('results' in wait_eni2_creation_checkpoint_gw) | ternary(wait_eni2_creation_checkpoint_gw['results'], []) }}" @@ -167,6 +170,8 @@ network_interfaces: - "{{ item[0]['interface']['id'] }}" - "{{ item[1]['interface']['id'] }}" + instance_tags: + ansible-workshops: true async: "{{ async_timeout_seconds }}" poll: 0 register: checkpoint_gw_async @@ -206,6 +211,7 @@ Students: "{{student_total}}" short_name: "checkpoint_gw" username: "{{ec2_info.checkpoint_gw.username}}" + ansible-workshops: true with_indexed_items: - "{{ checkpoint_gw_output }}" async: "{{ async_timeout_seconds }}" diff --git a/provisioner/roles/manage_ec2_instances/tasks/security_includes/security_ec2_create_instances.yml b/provisioner/roles/manage_ec2_instances/tasks/security_includes/security_ec2_create_instances.yml index 6ce6f96b6..ea2a73e34 100644 --- a/provisioner/roles/manage_ec2_instances/tasks/security_includes/security_ec2_create_instances.yml +++ b/provisioner/roles/manage_ec2_instances/tasks/security_includes/security_ec2_create_instances.yml @@ -20,6 +20,7 @@ Students: "{{ student_total }}" short_name: "qradar" username: '{{ ec2_info["rhel8"]["username"] }}' + ansible-workshops: true wait: "{{ ec2_wait }}" vpc_subnet_id: "{{ ec2_vpc_subnet_id }}" volumes: @@ -53,6 +54,7 @@ Students: "{{ student_total }}" short_name: "splunk" username: '{{ ec2_info["rhel8"]["username"] }}' + ansible-workshops: true wait: "{{ ec2_wait }}" vpc_subnet_id: "{{ ec2_vpc_subnet_id }}" volumes: @@ -93,6 +95,7 @@ Students: "{{ student_total }}" short_name: "snort" username: '{{ ec2_info["rhel8"]["username"] }}' + ansible-workshops: true wait: "{{ ec2_wait }}" vpc_subnet_id: "{{ ec2_vpc_subnet_id }}" volumes: @@ -125,6 +128,7 @@ Students: "{{ student_total }}" short_name: "attacker" username: '{{ ec2_info["rhel8"]["username"] }}' + ansible-workshops: true wait: "{{ ec2_wait }}" vpc_subnet_id: "{{ ec2_vpc_subnet_id }}" volumes: @@ -158,6 +162,7 @@ Students: "{{ student_total }}" short_name: "checkpoint_mgmt" username: "{{ ec2_info.checkpoint_mgmt.username }}" + ansible-workshops: true wait: "{{ ec2_wait }}" vpc_subnet_id: "{{ ec2_vpc_subnet_id }}" async: "{{ async_timeout_seconds }}" @@ -186,6 +191,7 @@ Students: "{{ student_total }}" short_name: "windows_ws" username: "{{ ec2_info.windows_ws.username }}" + ansible-workshops: true wait: "{{ ec2_wait }}" vpc_subnet_id: "{{ ec2_vpc_subnet_id }}" async: "{{ async_timeout_seconds }}" diff --git a/provisioner/roles/manage_ec2_instances/tasks/security_includes/security_ec2_subnet2_eni.yml b/provisioner/roles/manage_ec2_instances/tasks/security_includes/security_ec2_subnet2_eni.yml index a487edf63..c927b4f66 100644 --- a/provisioner/roles/manage_ec2_instances/tasks/security_includes/security_ec2_subnet2_eni.yml +++ b/provisioner/roles/manage_ec2_instances/tasks/security_includes/security_ec2_subnet2_eni.yml @@ -62,6 +62,7 @@ Students: "{{student_total}}" Subnet: '{{ ec2_name_prefix }}-subnet2' Workshop: "{{ec2_name_prefix}}" + ansible-workshops: true when: "(item|length|int > 1) and ('interface' in item[1])" with_indexed_items: - "{{ ('results' in wait_eni2_creation_attacker) | ternary(wait_eni2_creation_attacker['results'],[]) }}" @@ -82,6 +83,7 @@ Students: "{{student_total}}" Subnet: '{{ ec2_name_prefix }}-subnet2' Workshop: "{{ec2_name_prefix}}" + ansible-workshops: true when: "(item|length|int > 1) and ('interface' in item[1])" with_indexed_items: - "{{ ('results' in wait_eni2_creation_snort) | ternary(wait_eni2_creation_snort['results'], []) }}" diff --git a/provisioner/roles/manage_ec2_instances/tasks/security_includes/security_ec2_tags.yml b/provisioner/roles/manage_ec2_instances/tasks/security_includes/security_ec2_tags.yml index 9a9139793..6bb523423 100644 --- a/provisioner/roles/manage_ec2_instances/tasks/security_includes/security_ec2_tags.yml +++ b/provisioner/roles/manage_ec2_instances/tasks/security_includes/security_ec2_tags.yml @@ -9,6 +9,7 @@ Index: "{{ item[0] }}" Student: "student{{ item[0] + 1 }}" launch_time: "{{ item.1.launch_time }}" + ansible-workshops: true with_indexed_items: - "{{ siem_output.instances }}" async: "{{ async_timeout_seconds }}" @@ -27,6 +28,7 @@ Index: "{{ item[0] }}" Student: "student{{ item[0] + 1 }}" launch_time: "{{ item.1.launch_time }}" + ansible-workshops: true with_indexed_items: - "{{ siem_output.instances }}" async: "{{ async_timeout_seconds }}" @@ -52,6 +54,7 @@ Index: "{{ item[0] }}" Student: "student{{ item[0] + 1 }}" launch_time: "{{ item.1.launch_time }}" + ansible-workshops: true with_indexed_items: - "{{ snort_output.instances }}" async: "{{ async_timeout_seconds }}" @@ -69,6 +72,7 @@ Index: "{{ item[0] }}" Student: "student{{ item[0] + 1 }}" launch_time: "{{ item.1.launch_time }}" + ansible-workshops: true with_indexed_items: - "{{ attacker_output.instances }}" async: "{{ async_timeout_seconds }}" @@ -87,6 +91,7 @@ Index: "{{ item[0] }}" Student: "student{{ item[0] + 1 }}" launch_time: "{{ item.1.launch_time }}" + ansible-workshops: true with_indexed_items: - "{{ checkpoint_mgmt_output.instances }}" async: "{{ async_timeout_seconds }}" @@ -106,6 +111,7 @@ Index: "{{ item[0] }}" Student: "student{{ item[0] + 1 }}" launch_time: "{{ item.1.launch_time }}" + ansible-workshops: true with_indexed_items: - "{{ windows_ws_output.instances }}" async: "{{ async_timeout_seconds }}"