Skip to content

Commit

Permalink
Merge branch 'main' into ocp_patching_workflow
Browse files Browse the repository at this point in the history
  • Loading branch information
l3acon authored Aug 29, 2024
2 parents ca4837d + 8a99b66 commit 2ebb788
Show file tree
Hide file tree
Showing 34 changed files with 12,516 additions and 941 deletions.
Binary file added .github/images/setup_domain_end_state.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added .github/images/setup_domain_workflow.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added .github/images/setup_domain_workflow_domain.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@ choose_demo_example_aws.yml
.ansible.cfg
*.gz
*artifact*.json
**/roles/*
!**/roles/requirements.yml
roles/*
!roles/requirements.yml
.deployment_id
4 changes: 4 additions & 0 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,10 @@ repos:
rev: v4.4.0
hooks:
- id: end-of-file-fixer
exclude: rhel[89]STIG/.*$

- id: trailing-whitespace
exclude: rhel[89]STIG/.*$

- id: check-yaml
exclude: \.j2.(yaml|yml)$|\.(yaml|yml).j2$
Expand All @@ -26,4 +29,5 @@ repos:
rev: 23.11.0
hooks:
- id: black
exclude: rhel[89]STIG/.*$
...
5 changes: 5 additions & 0 deletions cloud/aws_key.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,3 +23,8 @@
state: present
tags:
owner: "{{ aws_keypair_owner }}"

- name: Set VPC stats
ansible.builtin.set_stats:
data:
stat_aws_key_pair: '{{ aws_key_name }}'
9 changes: 9 additions & 0 deletions cloud/create_vpc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -122,3 +122,12 @@
Name: "{{ aws_rt_name }}"
owner: "{{ aws_owner_tag }}"
purpose: "{{ aws_purpose_tag }}"

- name: Set VPC stats
ansible.builtin.set_stats:
data:
stat_aws_region: '{{ create_vm_aws_region }}'
stat_aws_vpc_id: '{{ aws_vpc.vpc.id }}'
stat_aws_vpc_cidr: '{{ aws_vpc_cidr_block }}'
stat_aws_subnet_id: '{{ aws_subnet.subnet.id }}'
stat_aws_subnet_cidr: '{{ aws_subnet_cidr }}'
18 changes: 18 additions & 0 deletions cloud/display-ec2-stats.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
---
- name: Display EC2 stats
hosts: localhost
gather_facts: false

tasks:
- name: Display stats for EC2 VPC and key pair
ansible.builtin.debug:
var: '{{ item }}'
loop:
- stat_aws_region
- stat_aws_key_pair
- stat_aws_vpc_id
- stat_aws_vpc_cidr
- stat_aws_subnet_id
- stat_aws_subnet_cidr

...
Loading

0 comments on commit 2ebb788

Please sign in to comment.