diff --git a/it-linux-base/main.tf b/it-linux-base/main.tf index cadecc8..d09b4b8 100644 --- a/it-linux-base/main.tf +++ b/it-linux-base/main.tf @@ -90,9 +90,9 @@ resource "aws_security_group" "this_security_group" { } tags = merge( + map("Name", "sg-${local.name}"), var.tags, map("boc:tf_module_version", var._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 995332d..5d6c81d 100644 --- a/it-linux-base/ports.tf +++ b/it-linux-base/ports.tf @@ -31,8 +31,8 @@ locals { [ 1002, 1002, "tcp", "OPSware-Control", local.n_all, ["external"] ], [ 9080, 9080, "tcp", "", [local.n_census[2] ], ["external"]], - [ 10082, 10082, "tcp", "", local.n_all, ["external"] ], - [ 10102, 10102, "tcp", "", local.n_all, ["external"] ], + [ 10082, 10082, "tcp", "Netbackup-spoold", local.n_all, ["external"] ], + [ 10102, 10102, "tcp", "Netbackup-spad", local.n_all, ["external"] ], ] # these are ignored diff --git a/it-linux-base/version.tf b/it-linux-base/version.tf index 84fd21a..3c275e9 100644 --- a/it-linux-base/version.tf +++ b/it-linux-base/version.tf @@ -1,5 +1,5 @@ variable "_module_version" { description = "Module version number" type = string - default = "1.0" + default = "1.0.1" } diff --git a/ois-scanner/CHANGELOG.md b/ois-scanner/CHANGELOG.md new file mode 100644 index 0000000..250eb5c --- /dev/null +++ b/ois-scanner/CHANGELOG.md @@ -0,0 +1,3 @@ +# v1.16 -- 20200604 + +* add version number, update tags diff --git a/ois-scanner/main.tf b/ois-scanner/main.tf index 99bfc3a..52042ba 100644 --- a/ois-scanner/main.tf +++ b/ois-scanner/main.tf @@ -55,10 +55,10 @@ resource "aws_security_group" "this_security_group" { } tags = merge( - { - "Name" = "sg-${var.name}" - }, + map("Name", "sg-${var.name}"), var.tags, + map("boc:tf_module_version", var._module_version), + map("boc:vpc:info", join(" ", compact(list(var.vpc_id, var.vpc_full_name)))), ) } diff --git a/ois-scanner/version.tf b/ois-scanner/version.tf new file mode 100644 index 0000000..bb082f5 --- /dev/null +++ b/ois-scanner/version.tf @@ -0,0 +1,5 @@ +variable "_module_version" { + description = "Module version number" + type = string + default = "1.16" +} diff --git a/rds-mssql/CHANGELOG.md b/rds-mssql/CHANGELOG.md index 3714839..a43aed8 100644 --- a/rds-mssql/CHANGELOG.md +++ b/rds-mssql/CHANGELOG.md @@ -2,3 +2,7 @@ * add version.tf * add port 5023 to rds-mssql + +# v1.5 -- 20200604 + +* update tags to include module version diff --git a/rds-mssql/main.tf b/rds-mssql/main.tf index 0cf630c..77c9805 100644 --- a/rds-mssql/main.tf +++ b/rds-mssql/main.tf @@ -54,5 +54,7 @@ resource "aws_security_group" "this_security_group" { tags = merge( map("Name", local.name), var.tags, + map("boc:tf_module_version", var._module_version), + map("boc:vpc:info", join(" ", compact(list(var.vpc_id, var.vpc_full_name)))), ) } diff --git a/rds-mssql/version.tf b/rds-mssql/version.tf index 82a588a..4284311 100644 --- a/rds-mssql/version.tf +++ b/rds-mssql/version.tf @@ -1,5 +1,5 @@ variable "_module_version" { description = "Module version number" type = string - default = "1.4" + default = "1.5" } diff --git a/rds-oracle/CHANGELOG.md b/rds-oracle/CHANGELOG.md new file mode 100644 index 0000000..239a373 --- /dev/null +++ b/rds-oracle/CHANGELOG.md @@ -0,0 +1,3 @@ +# v1.3 -- 20200604 + +* add module version, update tags diff --git a/rds-oracle/main.tf b/rds-oracle/main.tf index e2ae845..dd3e339 100644 --- a/rds-oracle/main.tf +++ b/rds-oracle/main.tf @@ -44,8 +44,9 @@ resource "aws_security_group" "this_security_group" { } tags = merge( - var.tags, - map("VPC", var.vpc_full_name), map("Name", "sg-${local.name}"), + var.tags, + map("boc:tf_module_version", var._module_version), + map("boc:vpc:info", join(" ", compact(list(var.vpc_id, var.vpc_full_name)))), ) } diff --git a/rds-oracle/version.tf b/rds-oracle/version.tf new file mode 100644 index 0000000..38fadfd --- /dev/null +++ b/rds-oracle/version.tf @@ -0,0 +1,5 @@ +variable "_module_version" { + description = "Module version number" + type = string + default = "1.3" +}