Skip to content

Commit

Permalink
clean up the defaults/main.yml files (Alina)
Browse files Browse the repository at this point in the history
  • Loading branch information
goneri committed Oct 24, 2022
1 parent 1dfb0e7 commit d72f275
Show file tree
Hide file tree
Showing 6 changed files with 6 additions and 149 deletions.
28 changes: 1 addition & 27 deletions tests/integration/targets/rds_cluster_create/defaults/main.yml
Original file line number Diff line number Diff line change
@@ -1,37 +1,11 @@
# defaults file for rds_cluster

# Create cluster
cluster_id: ansible-test-{{ inventory_hostname | replace('_','-') }}{{ tiny_prefix
}}
cluster_id: ansible-test-cluster-{{ tiny_prefix }}
username: testrdsusername
password: test-rds_password
engine: aurora
port: 3306
tags_create:
Name: ansible-test-cluster-{{ tiny_prefix }}
Created_By: Ansible_rds_cluster_integration_test

# Modify cluster
new_cluster_id: ansible-test-cluster-{{ tiny_prefix }}-new
new_port: 1155
new_password: test-rds_password-new
new_db_parameter_group_name: ansible-test-db-parameter-group-{{ tiny_prefix }}-new

# Tag cluster
tags_patch:
Name: '{{ tiny_prefix }}-new'
Created_by: Ansible rds_cluster integration tests

# Create cluster in a VPC
vpc_name: ansible-test-vpc-{{ tiny_prefix }}
vpc_cidr: 10.{{ 256 | random(seed=tiny_prefix) }}.0.0/16
subnets:
- {cidr: '10.{{ 256 | random(seed=tiny_prefix) }}.1.0/24', zone: '{{ aws_region }}a'}
- {cidr: '10.{{ 256 | random(seed=tiny_prefix) }}.2.0/24', zone: '{{ aws_region }}b'}
- {cidr: '10.{{ 256 | random(seed=tiny_prefix) }}.3.0/24', zone: '{{ aws_region }}c'}
- {cidr: '10.{{ 256 | random(seed=tiny_prefix) }}.4.0/24', zone: '{{ aws_region }}d'}

security_groups:
- '{{ tiny_prefix }}-sg-1'
- '{{ tiny_prefix }}-sg-2'
- '{{ tiny_prefix }}-sg-3'
Original file line number Diff line number Diff line change
@@ -1,26 +1,11 @@
# defaults file for rds_cluster

# Create cluster
cluster_id: ansible-test-{{ inventory_hostname | replace('_','-') }}{{ tiny_prefix
}}
cluster_id: ansible-test-cluster-{{ tiny_prefix }}
username: testrdsusername
password: test-rds_password
engine: aurora
port: 3306
tags_create:
Name: ansible-test-cluster-{{ tiny_prefix }}
Created_By: Ansible_rds_cluster_integration_test

# Modify cluster
new_cluster_id: ansible-test-cluster-{{ tiny_prefix }}-new
new_port: 1155
new_password: test-rds_password-new
new_db_parameter_group_name: ansible-test-db-parameter-group-{{ tiny_prefix }}-new

# Tag cluster
tags_patch:
Name: '{{ tiny_prefix }}-new'
Created_by: Ansible rds_cluster integration tests

# Create cluster in a VPC
vpc_name: ansible-test-vpc-{{ tiny_prefix }}
Expand Down
25 changes: 1 addition & 24 deletions tests/integration/targets/rds_cluster_modify/defaults/main.yml
Original file line number Diff line number Diff line change
@@ -1,37 +1,14 @@
# defaults file for rds_cluster

# Create cluster
cluster_id: ansible-test-{{ inventory_hostname | replace('_','-') }}{{ tiny_prefix
}}
cluster_id: ansible-test-cluster-{{ tiny_prefix }}
username: testrdsusername
password: test-rds_password
engine: aurora
port: 3306
tags_create:
Name: ansible-test-cluster-{{ tiny_prefix }}
Created_By: Ansible_rds_cluster_integration_test

# Modify cluster
new_cluster_id: ansible-test-cluster-{{ tiny_prefix }}-new
new_port: 1155
new_password: test-rds_password-new
new_db_parameter_group_name: ansible-test-db-parameter-group-{{ tiny_prefix }}-new

# Tag cluster
tags_patch:
Name: '{{ tiny_prefix }}-new'
Created_by: Ansible rds_cluster integration tests

# Create cluster in a VPC
vpc_name: ansible-test-vpc-{{ tiny_prefix }}
vpc_cidr: 10.{{ 256 | random(seed=tiny_prefix) }}.0.0/16
subnets:
- {cidr: '10.{{ 256 | random(seed=tiny_prefix) }}.1.0/24', zone: '{{ aws_region }}a'}
- {cidr: '10.{{ 256 | random(seed=tiny_prefix) }}.2.0/24', zone: '{{ aws_region }}b'}
- {cidr: '10.{{ 256 | random(seed=tiny_prefix) }}.3.0/24', zone: '{{ aws_region }}c'}
- {cidr: '10.{{ 256 | random(seed=tiny_prefix) }}.4.0/24', zone: '{{ aws_region }}d'}

security_groups:
- '{{ tiny_prefix }}-sg-1'
- '{{ tiny_prefix }}-sg-2'
- '{{ tiny_prefix }}-sg-3'
31 changes: 1 addition & 30 deletions tests/integration/targets/rds_cluster_promote/defaults/main.yml
Original file line number Diff line number Diff line change
@@ -1,37 +1,8 @@
# defaults file for rds_cluster

# Create cluster
cluster_id: ansible-test-{{ inventory_hostname | replace('_','-') }}{{ tiny_prefix
}}
cluster_id: ansible-test-cluster-{{ tiny_prefix }}
username: testrdsusername
password: test-rds_password
engine: aurora
port: 3306
tags_create:
Name: ansible-test-cluster-{{ tiny_prefix }}
Created_By: Ansible_rds_cluster_integration_test

# Modify cluster
new_cluster_id: ansible-test-cluster-{{ tiny_prefix }}-new
new_port: 1155
new_password: test-rds_password-new
new_db_parameter_group_name: ansible-test-db-parameter-group-{{ tiny_prefix }}-new

# Tag cluster
tags_patch:
Name: '{{ tiny_prefix }}-new'
Created_by: Ansible rds_cluster integration tests

# Create cluster in a VPC
vpc_name: ansible-test-vpc-{{ tiny_prefix }}
vpc_cidr: 10.{{ 256 | random(seed=tiny_prefix) }}.0.0/16
subnets:
- {cidr: '10.{{ 256 | random(seed=tiny_prefix) }}.1.0/24', zone: '{{ aws_region }}a'}
- {cidr: '10.{{ 256 | random(seed=tiny_prefix) }}.2.0/24', zone: '{{ aws_region }}b'}
- {cidr: '10.{{ 256 | random(seed=tiny_prefix) }}.3.0/24', zone: '{{ aws_region }}c'}
- {cidr: '10.{{ 256 | random(seed=tiny_prefix) }}.4.0/24', zone: '{{ aws_region }}d'}

security_groups:
- '{{ tiny_prefix }}-sg-1'
- '{{ tiny_prefix }}-sg-2'
- '{{ tiny_prefix }}-sg-3'
31 changes: 1 addition & 30 deletions tests/integration/targets/rds_cluster_restore/defaults/main.yml
Original file line number Diff line number Diff line change
@@ -1,37 +1,8 @@
# defaults file for rds_cluster

# Create cluster
cluster_id: ansible-test-{{ inventory_hostname | replace('_','-') }}{{ tiny_prefix
}}
cluster_id: ansible-test-cluster-{{ tiny_prefix }}
username: testrdsusername
password: test-rds_password
engine: aurora
port: 3306
tags_create:
Name: ansible-test-cluster-{{ tiny_prefix }}
Created_By: Ansible_rds_cluster_integration_test

# Modify cluster
new_cluster_id: ansible-test-cluster-{{ tiny_prefix }}-new
new_port: 1155
new_password: test-rds_password-new
new_db_parameter_group_name: ansible-test-db-parameter-group-{{ tiny_prefix }}-new

# Tag cluster
tags_patch:
Name: '{{ tiny_prefix }}-new'
Created_by: Ansible rds_cluster integration tests

# Create cluster in a VPC
vpc_name: ansible-test-vpc-{{ tiny_prefix }}
vpc_cidr: 10.{{ 256 | random(seed=tiny_prefix) }}.0.0/16
subnets:
- {cidr: '10.{{ 256 | random(seed=tiny_prefix) }}.1.0/24', zone: '{{ aws_region }}a'}
- {cidr: '10.{{ 256 | random(seed=tiny_prefix) }}.2.0/24', zone: '{{ aws_region }}b'}
- {cidr: '10.{{ 256 | random(seed=tiny_prefix) }}.3.0/24', zone: '{{ aws_region }}c'}
- {cidr: '10.{{ 256 | random(seed=tiny_prefix) }}.4.0/24', zone: '{{ aws_region }}d'}

security_groups:
- '{{ tiny_prefix }}-sg-1'
- '{{ tiny_prefix }}-sg-2'
- '{{ tiny_prefix }}-sg-3'
23 changes: 1 addition & 22 deletions tests/integration/targets/rds_cluster_tag/defaults/main.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
# defaults file for rds_cluster

# Create cluster
cluster_id: ansible-test-{{ inventory_hostname | replace('_','-') }}{{ tiny_prefix
}}
cluster_id: ansible-test-cluster-{{ tiny_prefix }}
username: testrdsusername
password: test-rds_password
engine: aurora
Expand All @@ -11,27 +10,7 @@ tags_create:
Name: ansible-test-cluster-{{ tiny_prefix }}
Created_By: Ansible_rds_cluster_integration_test

# Modify cluster
new_cluster_id: ansible-test-cluster-{{ tiny_prefix }}-new
new_port: 1155
new_password: test-rds_password-new
new_db_parameter_group_name: ansible-test-db-parameter-group-{{ tiny_prefix }}-new

# Tag cluster
tags_patch:
Name: '{{ tiny_prefix }}-new'
Created_by: Ansible rds_cluster integration tests

# Create cluster in a VPC
vpc_name: ansible-test-vpc-{{ tiny_prefix }}
vpc_cidr: 10.{{ 256 | random(seed=tiny_prefix) }}.0.0/16
subnets:
- {cidr: '10.{{ 256 | random(seed=tiny_prefix) }}.1.0/24', zone: '{{ aws_region }}a'}
- {cidr: '10.{{ 256 | random(seed=tiny_prefix) }}.2.0/24', zone: '{{ aws_region }}b'}
- {cidr: '10.{{ 256 | random(seed=tiny_prefix) }}.3.0/24', zone: '{{ aws_region }}c'}
- {cidr: '10.{{ 256 | random(seed=tiny_prefix) }}.4.0/24', zone: '{{ aws_region }}d'}

security_groups:
- '{{ tiny_prefix }}-sg-1'
- '{{ tiny_prefix }}-sg-2'
- '{{ tiny_prefix }}-sg-3'

0 comments on commit d72f275

Please sign in to comment.