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

Fix GitHub action errors #6

Merged
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
3 changes: 2 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
# rhbk-datagrid-aws

[![CI](https://github.com/ansible-middleware/rhbk-datagrid-aws/actions/workflows/ci.yml/badge.svg)](https://github.com/ansible-middleware/rhbk-datagrid-aws/actions/workflows/ci.yml)

Provision and deploy a Red Hat Build of Keycloak authentication service on multiple AWS regions via Ansible

Expand Down Expand Up @@ -73,7 +74,7 @@ These configurations ensure the infrastructure is tailored to your specific setu

Inside `playbooks/roles` path we have `infra-up.yml` and `infra-down.yml` run both according to you need.

### run the deployment of data_grid and rhbk
### 7. run the deployment of data_grid and rhbk

Inside `playbooks/roles` path we have `deploy.yml` playbook to deploy data_grid and rhbk.

Expand Down
2 changes: 1 addition & 1 deletion meta/runtime.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
# runtime.yml
---
requires_ansible: ">=2.14.0"
requires_ansible: ">=2.15.0"
1 change: 1 addition & 0 deletions molecule/default/converge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@
rhbk_jdbc_url: jdbc:postgresql://postgres:5432/keycloak
rhn_username: "{{ lookup('env', 'PROD_JBOSSNETWORK_API_CLIENTID') }}"
rhn_password: "{{ lookup('env', 'PROD_JBOSSNETWORK_API_SECRET') }}"
rhbk_show_deprecation_warnings: False
roles:
- role: redhat.rhbk.rhbk
rhbk_admin_pass: "{{ admin_pass }}"
Expand Down
4 changes: 2 additions & 2 deletions playbooks/roles/aws/tasks/create.yml
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@
routes:
- dest: "{{ (vpc_result | dict2items | last).value.cidr_block }}"
vpc_peering_connection_id: "{{ created_peering.peering_id }}"
tags: "{{ resource_tags | combine( { 'Name': 'Main Route Table', 'Cloud': 'AWS' } ) }}"
tags: "{{ resource_tags | combine({'Name': 'Main Route Table', 'Cloud': 'AWS'}) }}"
when: vpc_result | dict2items | length > 1

- name: Reverse route table for peering
Expand All @@ -99,7 +99,7 @@
routes:
- dest: "{{ (vpc_result | dict2items | first).value.cidr_block }}"
vpc_peering_connection_id: "{{ created_peering.peering_id }}"
tags: "{{ resource_tags| combine( { 'Name': 'Main Route Table', 'Cloud': 'AWS' } ) }}"
tags: "{{ resource_tags| combine({'Name': 'Main Route Table', 'Cloud': 'AWS'}) }}"
when: vpc_result | dict2items | length > 1

- name: Create key pair using key_material
Expand Down
2 changes: 1 addition & 1 deletion playbooks/roles/aws/tasks/instance.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
vpc_subnet_id: "{{ instance.subnet.subnet_id | default(omit) }}"
key_name: "{{ ssh_key_name }}"
security_group: "{{ vpc_result[instance.region].name }}-{{ instance.role }}"
tags: "{{ resource_tags | combine( { 'Role': instance.role, 'Site': instance.region, 'Region': instance.region } ) }}"
tags: "{{ resource_tags | combine({'Role': instance.role, 'Site': instance.region, 'Region': instance.region}) }}"
image_id: "{{ latest_ami[instance.region] }}"
termination_protection: False
volumes:
Expand Down
4 changes: 2 additions & 2 deletions playbooks/roles/aws/tasks/vpc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
{ 'vpc_id': created_vpc.vpc.id,
'igw_id': created_igw.gateway_id
}, recursive=True )
} ) }}"
}) }}"

- name: Create subnets in VPC
loop: "{{ vpc_data.subnets | list }}"
Expand All @@ -38,7 +38,7 @@
routes:
- dest: 0.0.0.0/0
gateway_id: "{{ created_igw.gateway_id }}"
tags: "{{ resource_tags | combine( { 'Name': 'Main Route Table', 'Cloud': 'AWS' } )}}"
tags: "{{ resource_tags | combine({'Name': 'Main Route Table', 'Cloud': 'AWS'})}}"
register: created_rtb

- name: Create security groups
Expand Down
2 changes: 1 addition & 1 deletion playbooks/roles/aws/tasks/vpc_subnet.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,4 @@
{ 'subnet_id': created_subnet.subnet.id, 'az': created_subnet.subnet.availability_zone }
}
}
}, recursive=True ) }}"
}, recursive=True) }}"
Loading