Explorar o código

Fixed uuid for customer based on sha256

Roberto Barbosa %!s(int64=8) %!d(string=hai) anos
pai
achega
d5b2b763b0
Modificáronse 3 ficheiros con 18 adicións e 13 borrados
  1. 4 8
      instance/main.tf
  2. 10 1
      main.tf
  3. 4 4
      s3/main.tf

+ 4 - 8
instance/main.tf

@@ -1,14 +1,14 @@
 #-------------------------------
 # Create Nuxeo Ubuntu Instance
 #-------------------------------
-# Create a new EC2 instance 
+# Create a new EC2 instance
 
 variable "stack_name" {
   type = "string"
   description = "Name of the Stack/Env that this instance will used for"
 }
 
-variable "ubuntu_releases" {  
+variable "ubuntu_releases" {
     default = {
         trusty  = "trusty-14.04"
         xenial  = "xenial-16.04"
@@ -56,17 +56,16 @@ variable "public_key_path" {
 }
 
 #---------------------
-# Deployer SSH keys 
+# Deployer SSH keys
 #--------------------
 resource "aws_key_pair" "deployer" {
-  key_name = "deployer-key" 
+  key_name = "deployer-key"
   public_key = "${file(var.public_key_path)}"
 }
 
 #---------------------
 # EC2 Instance
 #--------------------
-
 resource "aws_instance" "ec2" {
     ami = "${data.aws_ami.ubuntu.id}"
     instance_type = "${var.instance_type}"
@@ -80,6 +79,3 @@ resource "aws_instance" "ec2" {
       managed_by="terraform"
     }
 }
-
-
-

+ 10 - 1
main.tf

@@ -2,6 +2,15 @@
 * https://wiki.nuxeo.com/display/INFRA/Cloud+Provisioning
 */
 
+///////////////////////////////////////////////////////////////////////
+// Load defaults
+///////////////////////////////////////////////////////////////////////
+/*module "defaults" {
+  source = "./defaults"
+  region = "${var.region}"
+  cidr   = "${var.cidr}"
+}*/
+
 ///////////////////////////////////////////////////////////////////////
 // RESOURCES
 ///////////////////////////////////////////////////////////////////////
@@ -39,7 +48,7 @@ resource "aws_route53_record" "dns" {
 module "s3" {
   source = "./s3/"
   stack_name = "${var.stack_name}"
-  cust_id = "${uuid()}"
+  cust_id = "${sha256("${var.stack_name}")}"
 }
 
 

+ 4 - 4
s3/main.tf

@@ -2,11 +2,11 @@
 # S3 Bucket
 # -------------
 resource "aws_s3_bucket" "bucket" {
-    bucket = "nuxeo-${var.stack_name}"
+    bucket = "nuxeo-${var.cust_id}"
     acl = "private"
 
   tags {
-    Name              = "nuxeo-${var.stack_name}"
+    Name              = "nuxeo-${var.cust_id}"
     billing-category    = "customers"
     billing-subcategory = "${var.stack_name}"
     role                = "nuxeo.aws-s3"
@@ -14,11 +14,11 @@ resource "aws_s3_bucket" "bucket" {
 }
 
 resource "aws_s3_bucket" "bucket_backup" {
-    bucket = "nuxeo-backup-${var.stack_name}"
+    bucket = "nuxeo-backup-${var.cust_id}"
     acl = "private"
 
   tags {
-    Name              = "nuxeo-backup-${var.stack_name}"
+    Name              = "nuxeo-backup-${var.cust_id}"
     billing-category    = "customers"
     billing-subcategory = "${var.stack_name}"
     role                = "nuxeo.aws-s3"