From 61529b77d80927786c7459c0776ad036682ceca3 Mon Sep 17 00:00:00 2001 From: Justin Wind Date: Fri, 10 Mar 2017 14:04:49 -0800 Subject: [PATCH] split infrastructure further --- .../meta/main.yml | 1 + .../tasks/main.yml | 18 ------------------ roles/common-infrastructure/meta/main.yml | 3 +++ roles/common-infrastructure/tasks/main.yml | 18 ++++++++++++++++++ 4 files changed, 22 insertions(+), 18 deletions(-) create mode 100644 roles/common-infrastructure/meta/main.yml create mode 100644 roles/common-infrastructure/tasks/main.yml diff --git a/roles/aws-management-infrastructure/meta/main.yml b/roles/aws-management-infrastructure/meta/main.yml index f4f0c2a..381b352 100644 --- a/roles/aws-management-infrastructure/meta/main.yml +++ b/roles/aws-management-infrastructure/meta/main.yml @@ -1,3 +1,4 @@ --- dependencies: - { role: aws-management-queues } + - { role: common-infrastructure } diff --git a/roles/aws-management-infrastructure/tasks/main.yml b/roles/aws-management-infrastructure/tasks/main.yml index 512f229..d0edb77 100644 --- a/roles/aws-management-infrastructure/tasks/main.yml +++ b/roles/aws-management-infrastructure/tasks/main.yml @@ -5,24 +5,6 @@ - DEFAULT_AMI != '' tags: ['check_vars'] -- name: sg ssh - ec2_group: - vpc_id: "{{ vpc.vpc.id }}" - region: "{{ vpc_region }}" - state: present - name: ssh - description: "allow ssh from anywhere" - purge_rules: false - rules: - - proto: tcp - from_port: 22 - to_port: 22 - cidr_ip: 0.0.0.0/0 - rules_egress: - - proto: all - cidr_ip: 0.0.0.0/0 - register: sg_ssh - - name: sg management-elb ec2_group: vpc_id: "{{ vpc.vpc.id }}" diff --git a/roles/common-infrastructure/meta/main.yml b/roles/common-infrastructure/meta/main.yml new file mode 100644 index 0000000..279092d --- /dev/null +++ b/roles/common-infrastructure/meta/main.yml @@ -0,0 +1,3 @@ +--- +dependencies: + - { role: aws-vpc } diff --git a/roles/common-infrastructure/tasks/main.yml b/roles/common-infrastructure/tasks/main.yml new file mode 100644 index 0000000..6d40a64 --- /dev/null +++ b/roles/common-infrastructure/tasks/main.yml @@ -0,0 +1,18 @@ +--- +- name: sg ssh + ec2_group: + vpc_id: "{{ vpc.vpc.id }}" + region: "{{ vpc_region }}" + state: present + name: ssh + description: "allow ssh from anywhere" + purge_rules: false + rules: + - proto: tcp + from_port: 22 + to_port: 22 + cidr_ip: 0.0.0.0/0 + rules_egress: + - proto: all + cidr_ip: 0.0.0.0/0 + register: sg_ssh -- 2.43.2