diff --git a/network-tests/ami/cleanup-old-images.sh b/network-tests/ami/cleanup-old-images.sh index d6fde347f..0162bce93 100755 --- a/network-tests/ami/cleanup-old-images.sh +++ b/network-tests/ami/cleanup-old-images.sh @@ -1,5 +1,7 @@ regions=( "us-east-1" +"us-east-2" +"us-west-1" "us-west-2" "ca-central-1" "ap-northeast-1" diff --git a/network-tests/ami/ziti-ami.pkr.hcl b/network-tests/ami/ziti-ami.pkr.hcl index 814b57bca..295da7fe9 100644 --- a/network-tests/ami/ziti-ami.pkr.hcl +++ b/network-tests/ami/ziti-ami.pkr.hcl @@ -12,7 +12,7 @@ packer { source "amazon-ebs" "ziti-tests-ubuntu-ami" { ami_description = "An Ubuntu AMI that has everything needed for running fablab smoketests." ami_name = "ziti-tests-{{ timestamp }}" - ami_regions = ["us-east-1", "us-west-2", "ca-central-1", "ap-northeast-1", "ap-southeast-2", "sa-east-1", "eu-central-1", "af-south-1"] + ami_regions = ["us-east-1", "us-east-2", "us-west-1", "us-west-2", "ca-central-1", "ap-northeast-1", "ap-southeast-2", "sa-east-1", "eu-central-1", "af-south-1"] instance_type = "t2.micro" region = "us-east-1" source_ami_filter { diff --git a/network-tests/simple-transfer/configs/ctrl.yml b/network-tests/simple-transfer/configs/ctrl.yml index b487530c6..0814a2560 100644 --- a/network-tests/simple-transfer/configs/ctrl.yml +++ b/network-tests/simple-transfer/configs/ctrl.yml @@ -36,17 +36,6 @@ ctrl: # connections. The value of newListener must be resolvable both via DNS and validate via certificates #newListener: tls:localhost:6262 - #metrics: - #file: - #path: /tmp/ziti-controller-metrics.log - #maxsizemb: 100:wq - # Supported formats: json, plain - # Defaults to json - #format: plain - #influxdb: - #url: http://localhost:8086 - #database: ziti - #events: # jsonLogger: # subscriptions: