From de076e940f0fa7752beb63b58adb865ea2d0ab64 Mon Sep 17 00:00:00 2001 From: badra001 Date: Fri, 26 Feb 2021 10:59:14 -0500 Subject: [PATCH] re-order some stuff, include iperf3, riverbed --- it-linux-base/CHANGELOG.md | 4 +++- it-linux-base/README.md | 14 ++++++++++++-- it-linux-base/main.tf | 3 ++- it-linux-base/ports.tf | 12 +++++++++--- it-linux-base/version.tf | 6 ++---- 5 files changed, 28 insertions(+), 11 deletions(-) diff --git a/it-linux-base/CHANGELOG.md b/it-linux-base/CHANGELOG.md index e8a2db0..aa61a24 100644 --- a/it-linux-base/CHANGELOG.md +++ b/it-linux-base/CHANGELOG.md @@ -1,3 +1,5 @@ # v1.0 -- 20200603 + * create from running security group for use throughout -* create from running security group for use throughout +# v1.1.0 -- 20210226 + * updated some ports to sync with what is deployed diff --git a/it-linux-base/README.md b/it-linux-base/README.md index 2ef8e0e..e22a66c 100644 --- a/it-linux-base/README.md +++ b/it-linux-base/README.md @@ -30,11 +30,22 @@ module "it-linux-base" { |------|---------| | aws | n/a | +## Modules + +No Modules. + +## Resources + +| Name | +|------| +| [aws_security_group](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/data-sources/security_group) | +| [aws_security_group](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/security_group) | +| [aws_vpc](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/data-sources/vpc) | + ## Inputs | Name | Description | Type | Default | Required | |------|-------------|------|---------|:--------:| -| \_module\_version | Module version number | `string` | `"1.0.1"` | no | | description | Security Group Description | `string` | `"Linux Common Base Security Group"` | no | | egress\_networks | List of egress networks (all ports) | `list(string)` | 
[
  "0.0.0.0/0"
]
| no | | egress\_security\_groups | List of egress security groups (all ports) | `list(string)` | `[]` | no | @@ -53,4 +64,3 @@ module "it-linux-base" { | Name | Description | |------|-------------| | this\_security\_group\_arn | Created security group ARN | -| this\_security\_group\_id | Created security group ID | diff --git a/it-linux-base/main.tf b/it-linux-base/main.tf index 8b23560..82a94e5 100644 --- a/it-linux-base/main.tf +++ b/it-linux-base/main.tf @@ -113,7 +113,8 @@ resource "aws_security_group" "this_security_group" { tags = merge( var.tags, - map("boc:tf_module_version", var._module_version), + map("boc:created_by", "terraform"), + map("boc:tf_module_version", local._module_version), map("boc:vpc:info", join(" ", compact(list(var.vpc_id, var.vpc_full_name)))), map("Name", "sg-${local.name}"), ) diff --git a/it-linux-base/ports.tf b/it-linux-base/ports.tf index 0c48c65..35102ec 100644 --- a/it-linux-base/ports.tf +++ b/it-linux-base/ports.tf @@ -10,6 +10,7 @@ locals { n_all = ["0.0.0.0/0"] n_census = ["148.129.0.0/16", "192.168.0.0/16", "172.16.0.0/12", "10.0.0.0/8"] n_mgmt = ["148.129.162.0/24", "148.129.95.0/24"] + n_riverbed = ["172.24.100.107/32"] source_groups = ["all", "external"] name = var.name ports = [ @@ -22,17 +23,19 @@ locals { [4949, 4949, "tcp", "Munin", local.n_mgmt, ["external"]], [5001, 5003, "tcp", "iperf", local.n_all, ["external"]], [5001, 5003, "udp", "iperf", local.n_all, ["external"]], + [5201, 5201, "tcp", "iperf3", local.n_all, ["external"]], + [5201, 5201, "udp", "iperf3", local.n_all, ["external"]], [1556, 1556, "tcp", "Netbackup", local.n_all, ["external"]], [13724, 13724, "tcp", "Netbackup", local.n_all, ["external"]], [13782, 13782, "tcp", "Netbackup", local.n_all, ["external"]], + [10082, 10082, "tcp", "Netbackup-spoold", local.n_all, ["external"]], + [10102, 10102, "tcp", "Netbackup-spad", local.n_all, ["external"]], [1830, 1830, "tcp", "Oracle-OEM", ["10.193.8.0/23"], ["external"]], - [1002, 1002, "tcp", "OPSware-Control", local.n_all, ["external"]], [9080, 9080, "tcp", "", [local.n_census[2]], ["external"]], - [10082, 10082, "tcp", "Netbackup-spoold", local.n_all, ["external"]], - [10102, 10102, "tcp", "Netbackup-spad", local.n_all, ["external"]], + [27401, 27401, "tcp", "TransactionAgent", local.n_riverbed, ["external"]], ] # these are ignored @@ -49,3 +52,6 @@ locals { s => [for p in local.p_map : p if contains(p["source_group"], s)] } } + +# + sg_id=sg-9b19a7fe sg_name='it-linux-base' vpc_id=vpc-95ff37f0 sg_id=sg-9b19a7fe sg_name='it-linux-base' vpc_id=vpc-95ff37f0 direction=ingress pft=tcp,8080,8080 range=0.0.0.0/0 +# + sg_id=sg-9b19a7fe sg_name='it-linux-base' vpc_id=vpc-95ff37f0 sg_id=sg-9b19a7fe sg_name='it-linux-base' vpc_id=vpc-95ff37f0 direction=ingress pft=tcp,1571,1571 range=0.0.0.0/0 diff --git a/it-linux-base/version.tf b/it-linux-base/version.tf index 3c275e9..9c489cd 100644 --- a/it-linux-base/version.tf +++ b/it-linux-base/version.tf @@ -1,5 +1,3 @@ -variable "_module_version" { - description = "Module version number" - type = string - default = "1.0.1" +locals { + _module_version = "1.1.0" }