Added VPC setting and removed obsolete option

Author: Dmitry Berezovsky

modules/domain_controller/ec2.tf

@@ -1,4 +1,5 @@
 resource "aws_security_group" "clearos" {
+  vpc_id = "${var.vpc_id}"
   name = "${var.env_name}: Domain controller SG"
   description = "Rules for domain controller"
 

modules/domain_controller/variables.tf

@@ -46,10 +46,10 @@ variable "centos_ami" {
   default = "ami-46c1b650"
 }
 
-variable "provisioning_key_path" {
-  description = "Private key (.pem file) to be used for instance provisioning"
-}
-
 variable "enable_termination_protection" {
   default = true
+}
+
+variable "vpc_id" {
+  description = "VPC to place instance in"
 }

test/test_domain_controller/modules.tf

@@ -17,12 +17,12 @@ data "aws_security_group" "vpc_default" {
 module "domain_controller" {
   source = "../../modules/domain_controller"
   target_subnet_id = "${data.aws_subnet.default_subnet.id}"
-  trusted_networks_ssh = "0.0.0.0/0"
+  trusted_networks_ssh = ["0.0.0.0/0"]
   instance_key_name = "aws-logicifydev2"
   env_name = "${var.env_name}"
-  trusted_networks_webpanel = "0.0.0.0/0"
+  trusted_networks_webpanel = ["0.0.0.0/0"]
   centos_ami = "ami-f5d7f195"
-  provisioning_key_path = "${path.root}/keys/aws-logicifydev2.pem"
   default_security_group_ids = ["${data.aws_security_group.vpc_default.id}"]
   enable_termination_protection = "false"
+  vpc_id = "${data.aws_vpc.default_vpc.id}"
 }