Browse Source

variable changes for instance types

pull/992/head
Sathiya Shunmugasundaram 10 years ago
parent
commit
f72c21a032
  1. 3
      terraform/aws/consul.tf
  2. 0
      terraform/aws/scripts/rhel6/install.sh
  3. 0
      terraform/aws/scripts/rhel6/server.sh
  4. 0
      terraform/aws/scripts/rhel6/service.sh
  5. 0
      terraform/aws/scripts/rhel6/upstart-join.conf
  6. 0
      terraform/aws/scripts/rhel6/upstart.conf
  7. 11
      terraform/aws/variables.tf

3
terraform/aws/consul.tf

@ -1,7 +1,6 @@
resource "aws_instance" "server" { resource "aws_instance" "server" {
ami = "${lookup(var.ami, concat(var.region, "-", var.platform))}" ami = "${lookup(var.ami, concat(var.region, "-", var.platform))}"
#ami = "${lookup(var.ami, var.region, var.platform)}" instance_type = "${lookup(var.instance_type, var.platform)}"
instance_type = "${var.instance_type}"
key_name = "${var.key_name}" key_name = "${var.key_name}"
count = "${var.servers}" count = "${var.servers}"
security_groups = ["${aws_security_group.consul.name}"] security_groups = ["${aws_security_group.consul.name}"]

0
terraform/aws/scripts/rhel/install.sh → terraform/aws/scripts/rhel6/install.sh

0
terraform/aws/scripts/rhel/server.sh → terraform/aws/scripts/rhel6/server.sh

0
terraform/aws/scripts/rhel/service.sh → terraform/aws/scripts/rhel6/service.sh

0
terraform/aws/scripts/rhel/upstart-join.conf → terraform/aws/scripts/rhel6/upstart-join.conf

0
terraform/aws/scripts/rhel/upstart.conf → terraform/aws/scripts/rhel6/upstart.conf

11
terraform/aws/variables.tf

@ -3,11 +3,6 @@ variable "platform" {
description = "The region of AWS, for AMI lookups." description = "The region of AWS, for AMI lookups."
} }
variable "user" {
default = "ubuntu"
description = "The region of AWS, for AMI lookups."
}
variable "user" { variable "user" {
default = { default = {
ubuntu = "ubuntu" ubuntu = "ubuntu"
@ -43,8 +38,10 @@ variable "servers" {
} }
variable "instance_type" { variable "instance_type" {
default = "m3.medium" default = {
description = "The instance type to launch." ubuntu = "m1.small"
rhel6 = "m3.medium"
}
} }
variable "tagName" { variable "tagName" {

Loading…
Cancel
Save