mirror of https://github.com/hashicorp/consul
terraform: fix formatting of consul.tf (#4580)
parent
344d78dc54
commit
4ea03e7db7
|
@ -22,7 +22,6 @@ resource "aws_instance" "server" {
|
||||||
destination = "/tmp/${lookup(var.service_conf_dest, var.platform)}"
|
destination = "/tmp/${lookup(var.service_conf_dest, var.platform)}"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
provisioner "remote-exec" {
|
provisioner "remote-exec" {
|
||||||
inline = [
|
inline = [
|
||||||
"echo ${var.servers} > /tmp/consul-server-count",
|
"echo ${var.servers} > /tmp/consul-server-count",
|
||||||
|
|
|
@ -55,6 +55,7 @@ resource "google_compute_firewall" "consul_ingress" {
|
||||||
|
|
||||||
allow {
|
allow {
|
||||||
protocol = "tcp"
|
protocol = "tcp"
|
||||||
|
|
||||||
ports = [
|
ports = [
|
||||||
"8300", # Server RPC
|
"8300", # Server RPC
|
||||||
"8301", # Serf LAN
|
"8301", # Serf LAN
|
||||||
|
|
|
@ -1,4 +1,3 @@
|
||||||
output "server_address" {
|
output "server_address" {
|
||||||
value = "${google_compute_instance.consul.0.network_interface.0.address}"
|
value = "${google_compute_instance.consul.0.network_interface.0.address}"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -32,6 +32,7 @@ variable "service_conf" {
|
||||||
centos7 = "rhel_consul.service"
|
centos7 = "rhel_consul.service"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
variable "service_conf_dest" {
|
variable "service_conf_dest" {
|
||||||
default = {
|
default = {
|
||||||
ubuntu = "upstart.conf"
|
ubuntu = "upstart.conf"
|
||||||
|
|
|
@ -3,9 +3,11 @@ variable "password" {}
|
||||||
variable "tenant_name" {}
|
variable "tenant_name" {}
|
||||||
variable "auth_url" {}
|
variable "auth_url" {}
|
||||||
variable "public_key" {}
|
variable "public_key" {}
|
||||||
|
|
||||||
variable "user_login" {
|
variable "user_login" {
|
||||||
default = "stack"
|
default = "stack"
|
||||||
}
|
}
|
||||||
|
|
||||||
variable "key_file_path" {}
|
variable "key_file_path" {}
|
||||||
|
|
||||||
variable "nb_of_nodes" {
|
variable "nb_of_nodes" {
|
||||||
|
@ -14,7 +16,7 @@ variable "nb_of_nodes" {
|
||||||
|
|
||||||
variable "pub_net_id" {
|
variable "pub_net_id" {
|
||||||
default = {
|
default = {
|
||||||
tr2="PublicNetwork-01"
|
tr2 = "PublicNetwork-01"
|
||||||
tr2-1 = ""
|
tr2-1 = ""
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue