From 2b4c2320ce4b9484ce02aed6f4c3a9d5140adcda Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakub=20Soko=C5=82owski?= <jakub@status.im>
Date: Tue, 19 Jan 2021 10:33:27 +0100
Subject: [PATCH] move pyrmont variables to pyrmont.tf
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Jakub Sokołowski <jakub@status.im>
---
 pyrmont.tf     | 10 ++++++++++
 pyrmont_new.tf | 11 -----------
 pyrmont_old.tf | 30 +++++++++++++++---------------
 3 files changed, 25 insertions(+), 26 deletions(-)
 create mode 100644 pyrmont.tf

diff --git a/pyrmont.tf b/pyrmont.tf
new file mode 100644
index 0000000..bbbd717
--- /dev/null
+++ b/pyrmont.tf
@@ -0,0 +1,10 @@
+locals {
+  /* Volumes */
+  pyrmont_root_vol_size = 20
+  pyrmont_data_vol_size = 150
+  pyrmont_data_vol_type = "io1"
+  pyrmont_data_vol_iops = 2000
+  /* Instances */
+  pyrmont_large_instance_type = "z1d.large"
+  pyrmont_small_instance_type = "t3a.medium"
+}
diff --git a/pyrmont_new.tf b/pyrmont_new.tf
index 0e0c6bb..102cfec 100644
--- a/pyrmont_new.tf
+++ b/pyrmont_new.tf
@@ -1,14 +1,3 @@
-locals {
-  /* Volumes */
-  pyrmont_root_vol_size = 20
-  pyrmont_data_vol_size = 150
-  pyrmont_data_vol_type = "io1"
-  pyrmont_data_vol_iops = 2000
-  /* Instances */
-  pyrmont_large_instance_type = "z1d.large"
-  pyrmont_small_instance_type = "t3a.medium"
-}
-
 module "nimbus_nodes_pyrmont_stable_large" {
   source = "github.com/status-im/infra-tf-amazon-web-services"
 
diff --git a/pyrmont_old.tf b/pyrmont_old.tf
index ef1d6b4..11eb485 100644
--- a/pyrmont_old.tf
+++ b/pyrmont_old.tf
@@ -10,9 +10,9 @@ module "nimbus_nodes_pyrmont_master_large" {
   /* Scaling */
   instance_type = "z1d.large"
   root_vol_size = 20
-  data_vol_size = 150
-  data_vol_type = "io1"
-  data_vol_iops = 2000
+  data_vol_size = local.pyrmont_data_vol_size
+  data_vol_type = local.pyrmont_data_vol_type
+  data_vol_iops = local.pyrmont_data_vol_iops
   host_count    = 2
 
   /* Firewall */
@@ -38,9 +38,9 @@ module "nimbus_nodes_pyrmont_master_small" {
   /* Scaling */
   instance_type = "t3a.medium"
   root_vol_size = 20
-  data_vol_size = 150
-  data_vol_type = "io1"
-  data_vol_iops = 2000
+  data_vol_size = local.pyrmont_data_vol_size
+  data_vol_type = local.pyrmont_data_vol_type
+  data_vol_iops = local.pyrmont_data_vol_iops
   host_count    = 4
 
   /* Firewall */
@@ -66,9 +66,9 @@ module "nimbus_nodes_pyrmont_devel_large" {
   /* Scaling */
   instance_type = "z1d.large"
   root_vol_size = 20
-  data_vol_size = 150
-  data_vol_type = "io1"
-  data_vol_iops = 2000
+  data_vol_size = local.pyrmont_data_vol_size
+  data_vol_type = local.pyrmont_data_vol_type
+  data_vol_iops = local.pyrmont_data_vol_iops
   host_count    = 2
 
   /* Firewall */
@@ -94,9 +94,9 @@ module "nimbus_nodes_pyrmont_devel_small" {
   /* Scaling */
   instance_type = "t3a.medium"
   root_vol_size = 20
-  data_vol_size = 150
-  data_vol_type = "io1"
-  data_vol_iops = 2000
+  data_vol_size = local.pyrmont_data_vol_size
+  data_vol_type = local.pyrmont_data_vol_type
+  data_vol_iops = local.pyrmont_data_vol_iops
   host_count    = 4
 
   /* Firewall */
@@ -122,9 +122,9 @@ module "nimbus_nodes_pyrmont_libp2p_small" {
   /* Scaling */
   instance_type = "t3a.medium"
   root_vol_size = 20
-  data_vol_size = 150
-  data_vol_type = "io1"
-  data_vol_iops = 2000
+  data_vol_size = local.pyrmont_data_vol_size
+  data_vol_type = local.pyrmont_data_vol_type
+  data_vol_iops = local.pyrmont_data_vol_iops
   host_count    = 2
 
   /* Firewall */