From 3d2320a0f218e79e1de63058c6ed8b58dfb04583 Mon Sep 17 00:00:00 2001 From: Kevin van Zonneveld Date: Fri, 30 Sep 2016 13:13:20 +0200 Subject: [PATCH] Make ssh key creation, part of infra setup /cc @Acconut --- .infra/Frey-state-terraform.tfstate | 46 +++++++++++++++++++++-------- .infra/Freyfile.hcl | 8 ++++- .infra/ssh/frey-tusd.pub | 1 + 3 files changed, 41 insertions(+), 14 deletions(-) diff --git a/.infra/Frey-state-terraform.tfstate b/.infra/Frey-state-terraform.tfstate index 48dc2b9..38fad37 100644 --- a/.infra/Frey-state-terraform.tfstate +++ b/.infra/Frey-state-terraform.tfstate @@ -1,7 +1,7 @@ { "version": 3, "terraform_version": "0.7.3", - "serial": 28, + "serial": 29, "lineage": "deedcad1-a3e9-4e02-9135-c347bbbe0be0", "modules": [ { @@ -17,38 +17,40 @@ "public_address": { "sensitive": false, "type": "string", - "value": "ec2-54-166-147-2.compute-1.amazonaws.com" + "value": "ec2-54-226-202-57.compute-1.amazonaws.com" }, "public_addresses": { "sensitive": false, "type": "string", - "value": "ec2-54-166-147-2.compute-1.amazonaws.com" + "value": "ec2-54-226-202-57.compute-1.amazonaws.com" } }, "resources": { "aws_instance.tusd": { "type": "aws_instance", - "depends_on": [], + "depends_on": [ + "aws_key_pair.infra-tusd-main" + ], "primary": { - "id": "i-16ef798d", + "id": "i-0321c9c5ee19ea8c3", "attributes": { "ami": "ami-9bce7af0", - "availability_zone": "us-east-1d", + "availability_zone": "us-east-1a", "disable_api_termination": "false", "ebs_block_device.#": "0", "ebs_optimized": "false", "ephemeral_block_device.#": "0", "iam_instance_profile": "", - "id": "i-16ef798d", + "id": "i-0321c9c5ee19ea8c3", "instance_state": "running", "instance_type": "c3.large", - "key_name": "infra-tusd", + "key_name": "infra-tusd-main", "monitoring": "false", "network_interface_id": "", - "private_dns": "ip-10-99-128-27.ec2.internal", - "private_ip": "10.99.128.27", - "public_dns": "ec2-54-166-147-2.compute-1.amazonaws.com", - "public_ip": "54.166.147.2", + "private_dns": "ip-10-178-163-38.ec2.internal", + "private_ip": "10.178.163.38", + "public_dns": "ec2-54-226-202-57.compute-1.amazonaws.com", + "public_ip": "54.226.202.57", "root_block_device.#": "1", "root_block_device.0.delete_on_termination": "true", "root_block_device.0.iops": "100", @@ -71,6 +73,24 @@ "deposed": [], "provider": "" }, + "aws_key_pair.infra-tusd-main": { + "type": "aws_key_pair", + "depends_on": [], + "primary": { + "id": "infra-tusd-main", + "attributes": { + "id": "infra-tusd-main", + "key_name": "infra-tusd-main", + "public_key": "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCBRaeCTrJguFd7Ger1UNO4gY85dbwIKujzhG1U6UNmjMeLbZPrJXjNwOuAw2I6bo6rchtjH3pMAm0XfsAi1DWOaEv2Iu38xJom157b4Ihk23RLGRyzEWQF3XWIX6FGmOWuuy1YDojTVcKvdLXbgy8Kn/b3qBv3Qfrc0F5o6K/MrXbD5MvNqgJGaQUiIxgQllOB9fIq/5HfV1u1xlvih6VJLBx67HxQN+JMdeLifYOLGuJyF4ByqI+1DNjpf/Lu7wNUsoVFAdis5MQ11gT+rrOoMTeZxgj2XJAxl0tUEOBYd0S10kd0w2F9N8RJEI6Qv7Mdo/yIcYhb82tq3AFcGrkl kvz@tusd.freyproject.io" + }, + "meta": { + "schema_version": "1" + }, + "tainted": false + }, + "deposed": [], + "provider": "" + }, "aws_route53_record.www": { "type": "aws_route53_record", "depends_on": [ @@ -84,7 +104,7 @@ "id": "Z3IT8X6U91XY1P_master.tus.io_CNAME", "name": "master.tus.io", "records.#": "1", - "records.3871998453": "ec2-54-166-147-2.compute-1.amazonaws.com", + "records.2249160635": "ec2-54-226-202-57.compute-1.amazonaws.com", "set_identifier": "", "ttl": "300", "type": "CNAME", diff --git a/.infra/Freyfile.hcl b/.infra/Freyfile.hcl index f86a85f..8db24dd 100644 --- a/.infra/Freyfile.hcl +++ b/.infra/Freyfile.hcl @@ -44,10 +44,16 @@ infra output { } } +infra resource aws_key_pair "infra-tusd-main" { + key_name = "infra-tusd-main" + public_key = "${file("{{{config.global.ssh.publickey_file}}}")}" +} + infra resource aws_instance tusd { ami = "${lookup(var.amis, var.region)}" instance_type = "c3.large" - key_name = "infra-tusd" + key_name = "${aws_key_pair.infra-tusd-main.key_name}" + security_groups = ["fw-tusd-main"] connection { key_file = "{{{config.global.ssh.privatekey_file}}}" diff --git a/.infra/ssh/frey-tusd.pub b/.infra/ssh/frey-tusd.pub index e69de29..64a6117 100644 --- a/.infra/ssh/frey-tusd.pub +++ b/.infra/ssh/frey-tusd.pub @@ -0,0 +1 @@ +ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCBRaeCTrJguFd7Ger1UNO4gY85dbwIKujzhG1U6UNmjMeLbZPrJXjNwOuAw2I6bo6rchtjH3pMAm0XfsAi1DWOaEv2Iu38xJom157b4Ihk23RLGRyzEWQF3XWIX6FGmOWuuy1YDojTVcKvdLXbgy8Kn/b3qBv3Qfrc0F5o6K/MrXbD5MvNqgJGaQUiIxgQllOB9fIq/5HfV1u1xlvih6VJLBx67HxQN+JMdeLifYOLGuJyF4ByqI+1DNjpf/Lu7wNUsoVFAdis5MQ11gT+rrOoMTeZxgj2XJAxl0tUEOBYd0S10kd0w2F9N8RJEI6Qv7Mdo/yIcYhb82tq3AFcGrkl kvz@tusd.freyproject.io