Skip to content

Commit 4568495

Browse files
committed
Allow configuring extra SGs with access to RDS mysql port
1 parent dffb464 commit 4568495

File tree

3 files changed

+35
-32
lines changed

3 files changed

+35
-32
lines changed

roles/cs.aws-security-group/defaults/main.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,3 +4,6 @@ aws_security_group_redis_create: no
44
aws_security_group_elasticsearch_create: no
55
aws_security_group_name_prefix: mageops
66
aws_security_group_persistant_extra_rules: []
7+
8+
# Extra groups to allow access to RDS
9+
aws_security_group_rds_access_extra_groups: []

roles/cs.aws-security-group/tasks/main.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@
121121
rules:
122122
- proto: tcp
123123
ports: 3306
124-
group_name: "{{ aws_security_group_app_name }}"
124+
group_name: "{{ [aws_security_group_app_name] + aws_security_group_rds_access_extra_groups | default([]) }}"
125125
- proto: tcp
126126
ports: 3306
127127
cidr_ip: "{{ mageops_trusted_cidr_blocks }}"

site.step-10-infrastructure-aws.yml

Lines changed: 31 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -12,37 +12,37 @@
1212
aws_security_group_redis_create: "{{ mageops_redis_create or mageops_redis_sessions_create }}"
1313
aws_security_group_rabbitmq_create: "{{ mageops_rabbitmq_create and magento_rabbitmq_queue }}"
1414
aws_security_group_elasticsearch_create: "{{ mageops_elasticsearch_create }}"
15-
- role: cs.aws-s3
16-
- role: cs.aws-cloudfront
17-
aws_cloudfront_use_lambda: "{{ aws_cloudfront_optimizing_edge_lambda_enable }}"
18-
aws_cloudfront_lambda_arn: "{{ aws_cloudfront_lambda_latest_arn | default(omit, true) }}"
19-
when: aws_cloudfront_distribution_create | bool
20-
- role: cs.aws-rds
21-
when: aws_rds_create
22-
- role: cs.aws-loadbalancer
23-
lb_ssl_cert: "{{ aws_elb_https_certificate_arn }}"
24-
lb_s3_logs_bucket: "{{ aws_s3_secret_bucket }}"
25-
lb_http_port: "{{ mageops_varnish_port }}"
26-
when: aws_elb_create
27-
- role: cs.aws-ami-facts
28-
- role: cs.aws-node-facts
29-
- role: cs.aws-node-varnish
30-
aws_varnish_node_root_device: "{{ aws_ami_root_device }}"
31-
aws_varnish_node_vpc_subnet_id: "{{ aws_vpc_subnet_id }}"
32-
aws_varnish_instance_id: "{{ aws_varnish_node_instance.instance_id | default(false) }}"
33-
when: varnish_standalone
34-
- role: cs.aws-node-persistent
35-
aws_persistent_node_root_device: "{{ aws_ami_root_device }}"
36-
aws_persistent_node_vpc_subnet_id: "{{ aws_vpc_subnet_id }}"
37-
aws_persistent_instance_id: "{{ aws_persistent_node_instance.instance_id | default(false) }}"
38-
- role: cs.mysql-configure
39-
mysql_user_localhost_access: "{{ not aws_rds_create }}"
40-
- role: cs.aws-lambda-varnish
41-
when: varnish_standalone
42-
- role: cs.aws-lambda-node-coordinator
43-
when: aws_magento_cron_enabled
44-
- role: cs.aws-lambda-import
45-
- role: cs.finalize
15+
# - role: cs.aws-s3
16+
# - role: cs.aws-cloudfront
17+
# aws_cloudfront_use_lambda: "{{ aws_cloudfront_optimizing_edge_lambda_enable }}"
18+
# aws_cloudfront_lambda_arn: "{{ aws_cloudfront_lambda_latest_arn | default(omit, true) }}"
19+
# when: aws_cloudfront_distribution_create | bool
20+
# - role: cs.aws-rds
21+
# when: aws_rds_create
22+
# - role: cs.aws-loadbalancer
23+
# lb_ssl_cert: "{{ aws_elb_https_certificate_arn }}"
24+
# lb_s3_logs_bucket: "{{ aws_s3_secret_bucket }}"
25+
# lb_http_port: "{{ mageops_varnish_port }}"
26+
# when: aws_elb_create
27+
# - role: cs.aws-ami-facts
28+
# - role: cs.aws-node-facts
29+
# - role: cs.aws-node-varnish
30+
# aws_varnish_node_root_device: "{{ aws_ami_root_device }}"
31+
# aws_varnish_node_vpc_subnet_id: "{{ aws_vpc_subnet_id }}"
32+
# aws_varnish_instance_id: "{{ aws_varnish_node_instance.instance_id | default(false) }}"
33+
# when: varnish_standalone
34+
# - role: cs.aws-node-persistent
35+
# aws_persistent_node_root_device: "{{ aws_ami_root_device }}"
36+
# aws_persistent_node_vpc_subnet_id: "{{ aws_vpc_subnet_id }}"
37+
# aws_persistent_instance_id: "{{ aws_persistent_node_instance.instance_id | default(false) }}"
38+
# - role: cs.mysql-configure
39+
# mysql_user_localhost_access: "{{ not aws_rds_create }}"
40+
# - role: cs.aws-lambda-varnish
41+
# when: varnish_standalone
42+
# - role: cs.aws-lambda-node-coordinator
43+
# when: aws_magento_cron_enabled
44+
# - role: cs.aws-lambda-import
45+
# - role: cs.finalize
4646
tasks:
4747
- name: Refresh inventory to get info about newly created nodes
4848
meta: refresh_inventory

0 commit comments

Comments
 (0)