consolidated settings, updated security group management and dependency management.
diff --git a/environments/aws/aws-create-default-settings.yml b/environments/aws/aws-create-default-settings.yml deleted file mode 100644 index 3676608..0000000 --- a/environments/aws/aws-create-default-settings.yml +++ /dev/null
@@ -1,14 +0,0 @@ ---- -vpc_subnet_id: '{{ secure_vpc_subnet_id }}' -name_prefix: '{{ secure_name_prefix }}' -env_name: '{{ secure_env_name }}' -bag: '{{ secure_bag }}' -department: '{{ secure_department }}' -company_env: '{{ secure_company_env }}' -owner_contact_info: '{{ secure_owner_contact_info }}' -team_contact_info: '{{ secure_team_contact_info }}' -env: '{{ name_prefix }}-{{ env_name }}' -volume_type: gp2 -volume_size: 30 -delete_on_termination: true -device_name: /dev/sda1 \ No newline at end of file
diff --git a/environments/aws/aws_terminate.yml b/environments/aws/aws_terminate.yml index 9f3d7dc..e434a67 100644 --- a/environments/aws/aws_terminate.yml +++ b/environments/aws/aws_terminate.yml
@@ -8,9 +8,6 @@ pre_tasks: - - name: "Load default provisioning settings" - include_vars: aws-create-default-settings.yml - - setup: - ec2_facts:
diff --git a/environments/aws/remove-security-group.yml b/environments/aws/remove-security-group.yml index ca98ae8..fb524c0 100644 --- a/environments/aws/remove-security-group.yml +++ b/environments/aws/remove-security-group.yml
@@ -4,12 +4,7 @@ vars_files: - ~/.apigee/credentials.yml - tasks: - - name: Remove security group - ec2_group: - state: "{{ ec2_group_state | d('absent') }}" - name: "{{ security_group | d('EDGEMICRO') }}" - description: Security group for Edgemicro - aws_access_key: "{{ aws_access_key|default(lookup('env', 'AWS_ACCESS_KEY_ID')) }}" - aws_secret_key: "{{ aws_secret_key|default(lookup('env', 'AWS_SECRET_ACCESS_KEY')) }}" - aws_region: "{{ aws_region|default(lookup('env', 'AWS_REGION')) }}" + pre_tasks: + + roles: + - { role: apigee-opdk-aws-security-group, ec2_group_state: absent }
diff --git a/environments/aws/requirements.yml b/environments/aws/requirements.yml index 9bdde7b..a39edc1 100644 --- a/environments/aws/requirements.yml +++ b/environments/aws/requirements.yml
@@ -1,6 +1,8 @@ --- - src: https://github.com/carlosfrias/apigee-opdk-aws-create +- src: https://github.com/carlosfrias/apigee-opdk-aws-setup + - src: https://github.com/carlosfrias/apigee-opdk-aws-terminate - src: https://github.com/carlosfrias/apigee-opdk-aws-security-group