Przeglądaj źródła

set enable vols to false by default

Chris Mague 4 lat temu
rodzic
commit
b5a93b46bc
2 zmienionych plików z 41 dodań i 41 usunięć
  1. 1 1
      ansible/default.yaml
  2. 40 40
      variables.tf

+ 1 - 1
ansible/default.yaml

@@ -1,2 +1,2 @@
 ---
-enable_volumes: "{{ ENABLE_VOLUMES|default(true) }}"
+enable_volumes: "{{ ENABLE_VOLUMES|default(false) }}"

+ 40 - 40
variables.tf

@@ -15,7 +15,7 @@ variable "common-tags" {
 variable "open-nets" {
   type        = list
   description = "CIDRs that will have access to everything"
-  default = []
+  default     = []
 }
 
 variable "vpc-cidr" {
@@ -32,7 +32,7 @@ variable "vpc-name" {
 
 variable "ssh-key" {
   description = "Set if the SSH key you wish to use does not match the VPC name"
-  default = ""
+  default     = ""
 }
 
 
@@ -68,233 +68,233 @@ variable "enable-flash" {
 
 variable "enable-volumes" {
   description = "Enable EBS Devices for Ephemeral and Persistent storage"
-  default     = true
+  default     = false
 }
 
 variable "flash-iops" {
   description = "Enable Flash IOPS"
   default     = "100"
-  }
+}
 
 variable "allow-public-ssh" {
   description = "Allow SSH to be open to the public - disabled by default"
   default     = "0"
-  }
+}
 
 variable "internal-rules" {
   description = "Security rules to allow for connectivity within the VPC"
-  type = list
+  type        = list
   default = [
     {
-      type = "ingress"
+      type      = "ingress"
       from_port = "22"
       to_port   = "22"
       protocol  = "tcp"
       comment   = "SSH from VPC"
     },
     {
-      type = "ingress"
+      type      = "ingress"
       from_port = "1968"
       to_port   = "1968"
       protocol  = "tcp"
       comment   = "Proxy traffic (Internal use)"
     },
     {
-      type = "ingress"
+      type      = "ingress"
       from_port = "3333"
       to_port   = "3339"
       protocol  = "tcp"
       comment   = "Cluster traffic (Internal use)"
     },
     {
-      type = "ingress"
+      type      = "ingress"
       from_port = "36379"
       to_port   = "36380"
       protocol  = "tcp"
       comment   = "Cluster traffic (Internal use)"
     },
     {
-      type = "ingress"
+      type      = "ingress"
       from_port = "8001"
       to_port   = "8001"
       protocol  = "tcp"
       comment   = "Traffic from application to RS Discovery Service"
     },
     {
-      type = "ingress"
+      type      = "ingress"
       from_port = "8443"
       to_port   = "8443"
       protocol  = "tcp"
       comment   = "Secure (HTTPS) access to the management web UI"
     },
     {
-      type = "ingress"
+      type      = "ingress"
       from_port = "8444"
       to_port   = "8444"
       protocol  = "tcp"
       comment   = "nginx <-> cnm_http/cm traffic (Internal use)"
     },
     {
-      type = "ingress"
+      type      = "ingress"
       from_port = "9080"
       to_port   = "9080"
       protocol  = "tcp"
       comment   = "nginx <-> cnm_http/cm traffic (Internal use)"
     },
     {
-      type = "ingress"
+      type      = "ingress"
       from_port = "9081"
       to_port   = "9081"
       protocol  = "tcp"
       comment   = "For CRDB management (Internal use)"
     },
     {
-      type = "ingress"
+      type      = "ingress"
       from_port = "8070"
       to_port   = "8071"
       protocol  = "tcp"
       comment   = "Prometheus metrics exporter"
     },
     {
-      type = "ingress"
+      type      = "ingress"
       from_port = "9443"
       to_port   = "9443"
       protocol  = "tcp"
       comment   = "REST API traffic, including cluster management and node bootstrap"
     },
     {
-      type = "ingress"
+      type      = "ingress"
       from_port = "10000"
       to_port   = "19999"
       protocol  = "tcp"
       comment   = "Database traffic - if manually creating db ports pare down"
     },
     {
-      type = "ingress"
+      type      = "ingress"
       from_port = "20000"
       to_port   = "29999"
       protocol  = "tcp"
       comment   = "Database shards traffic - if manually creating db ports pare down"
     },
     {
-      type = "ingress"
+      type      = "ingress"
       from_port = "53"
       to_port   = "53"
       protocol  = "udp"
       comment   = "DNS Traffic"
     },
     {
-      type = "ingress"
+      type      = "ingress"
       from_port = "5353"
       to_port   = "5353"
       protocol  = "udp"
       comment   = "DNS Traffic"
     },
     {
-      type = "ingress"
+      type      = "ingress"
       from_port = "-1"
       to_port   = "-1"
       protocol  = "icmp"
       comment   = "Ping for connectivity checks between nodes"
     },
     {
-      type = "egress"
+      type      = "egress"
       from_port = "-1"
       to_port   = "-1"
       protocol  = "icmp"
       comment   = "Ping for connectivity checks between nodes"
     },
     {
-      type = "egress"
+      type      = "egress"
       from_port = "0"
       to_port   = "65535"
       protocol  = "tcp"
       comment   = "Let TCP out to the VPC"
     },
     {
-      type = "egress"
+      type      = "egress"
       from_port = "0"
       to_port   = "65535"
       protocol  = "udp"
       comment   = "Let UDP out to the VPC"
     },
     {
-      type = "ingress"
+      type      = "ingress"
       from_port = "8301"
       to_port   = "8301"
       protocol  = "udp"
       comment   = "Consul Traffic Gossip"
     },
     {
-      type = "ingress"
+      type      = "ingress"
       from_port = "8301"
       to_port   = "8301"
       protocol  = "tcp"
       comment   = "Consul Traffic Gossip"
     },
     {
-      type = "ingress"
+      type      = "ingress"
       from_port = "8600"
       to_port   = "8600"
       protocol  = "tcp"
       comment   = "Consul Traffic DNS"
     },
     {
-      type = "ingress"
+      type      = "ingress"
       from_port = "8600"
       to_port   = "8600"
       protocol  = "udp"
       comment   = "Consul Traffic DNS"
     },
     {
-      type = "ingress"
+      type      = "ingress"
       from_port = "8400"
       to_port   = "8400"
       protocol  = "tcp"
       comment   = "Consul Traffic RPC"
     },
     {
-      type = "ingress"
+      type      = "ingress"
       from_port = "8500"
       to_port   = "8500"
       protocol  = "tcp"
       comment   = "Consul Traffic HTTP"
     },
     {
-      type = "ingress"
+      type      = "ingress"
       from_port = "8300"
       to_port   = "8300"
       protocol  = "tcp"
       comment   = "Consul Traffic Internal"
     },
-    ]
-  }
+  ]
+}
 
 variable "external-rules" {
   description = "Security rules to allow for connectivity external to the VPC"
-  type = list
+  type        = list
   default = [
     {
-      type = "ingress"
+      type      = "ingress"
       from_port = "53"
       to_port   = "53"
       protocol  = "udp"
       cidr      = ["0.0.0.0/0"]
     },
     {
-      type = "egress"
+      type      = "egress"
       from_port = "0"
       to_port   = "65535"
       protocol  = "tcp"
       cidr      = ["0.0.0.0/0"]
     },
     {
-      type = "egress"
+      type      = "egress"
       from_port = "0"
       to_port   = "65535"
       protocol  = "udp"
       cidr      = ["0.0.0.0/0"]
     }
-    ]
-  }
+  ]
+}