From 3fe94d469695d2cc753c3c4c109e4ed29de834fd Mon Sep 17 00:00:00 2001
From: Pavel Kiselev <kpashka@gmail.com>
Date: Thu, 20 Apr 2017 12:17:33 +0300
Subject: [PATCH] Feature branch Apple pay
---
.../terraform/base/gce_branches/main.tf | 15 ++++
.../envs/gce_branches/terraform.tfstate | 88 +++++++++++++++++-
.../gce_branches/terraform.tfstate.backup | 90 +++----------------
3 files changed, 113 insertions(+), 80 deletions(-)
diff --git a/tabernacle/terraform/base/gce_branches/main.tf b/tabernacle/terraform/base/gce_branches/main.tf
index 7edb490c40..622013a314 100644
--- a/tabernacle/terraform/base/gce_branches/main.tf
+++ b/tabernacle/terraform/base/gce_branches/main.tf
@@ -51,3 +51,18 @@ module "bigbag" {
dnsimple_account = "${var.dnsimple_account}"
dnsimple_token = "${var.dnsimple_token}"
}
+
+##############################################
+# Setup Apple Pay Feature Branch
+##############################################
+module "applepay" {
+ source = "../../modules/gce/appliance"
+ instance_name = "feature-branch-apple"
+ dns_record = "feature-branch-apple"
+ appliance_image = "${var.appliance_image}"
+ consul_leader = "${var.consul_leader}"
+ ssh_user = "${var.ssh_user}"
+ ssh_private_key = "${var.ssh_private_key}"
+ dnsimple_account = "${var.dnsimple_account}"
+ dnsimple_token = "${var.dnsimple_token}"
+}
diff --git a/tabernacle/terraform/envs/gce_branches/terraform.tfstate b/tabernacle/terraform/envs/gce_branches/terraform.tfstate
index e911d88bc7..8b30832cab 100644
--- a/tabernacle/terraform/envs/gce_branches/terraform.tfstate
+++ b/tabernacle/terraform/envs/gce_branches/terraform.tfstate
@@ -1,7 +1,7 @@
{
"version": 3,
- "terraform_version": "0.9.2",
- "serial": 16,
+ "terraform_version": "0.9.3",
+ "serial": 21,
"lineage": "c0794ba9-7fe1-47b8-83ee-dd12cd64dbf5",
"modules": [
{
@@ -96,6 +96,90 @@
},
"depends_on": []
},
+ {
+ "path": [
+ "root",
+ "applepay"
+ ],
+ "outputs": {},
+ "resources": {
+ "dnsimple_record.frontend-dns-record": {
+ "type": "dnsimple_record",
+ "depends_on": [
+ "google_compute_instance.appliance"
+ ],
+ "primary": {
+ "id": "11481174",
+ "attributes": {
+ "domain": "foxcommerce.com",
+ "domain_id": "foxcommerce.com",
+ "hostname": "feature-branch-apple.foxcommerce.com",
+ "id": "11481174",
+ "name": "feature-branch-apple",
+ "priority": "0",
+ "ttl": "3600",
+ "type": "A",
+ "value": "10.240.0.16"
+ },
+ "meta": {},
+ "tainted": false
+ },
+ "deposed": [],
+ "provider": ""
+ },
+ "google_compute_instance.appliance": {
+ "type": "google_compute_instance",
+ "depends_on": [],
+ "primary": {
+ "id": "feature-branch-apple",
+ "attributes": {
+ "can_ip_forward": "false",
+ "create_timeout": "4",
+ "disk.#": "1",
+ "disk.0.auto_delete": "true",
+ "disk.0.device_name": "",
+ "disk.0.disk": "",
+ "disk.0.disk_encryption_key_raw": "",
+ "disk.0.disk_encryption_key_sha256": "",
+ "disk.0.image": "appliance-base-170207-004420",
+ "disk.0.scratch": "false",
+ "disk.0.size": "40",
+ "disk.0.type": "pd-ssd",
+ "id": "feature-branch-apple",
+ "machine_type": "n1-standard-4",
+ "metadata.%": "0",
+ "metadata_fingerprint": "1-7KLxnxNkU=",
+ "name": "feature-branch-apple",
+ "network.#": "0",
+ "network_interface.#": "1",
+ "network_interface.0.access_config.#": "0",
+ "network_interface.0.address": "10.240.0.16",
+ "network_interface.0.name": "nic0",
+ "network_interface.0.network": "default",
+ "network_interface.0.subnetwork": "",
+ "network_interface.0.subnetwork_project": "",
+ "self_link": "https://www.googleapis.com/compute/v1/projects/foxcomm-staging/zones/us-central1-a/instances/feature-branch-apple",
+ "service_account.#": "1",
+ "service_account.0.email": "953682058057-compute@developer.gserviceaccount.com",
+ "service_account.0.scopes.#": "1",
+ "service_account.0.scopes.1328717722": "https://www.googleapis.com/auth/devstorage.read_write",
+ "tags.#": "2",
+ "tags.1472900357": "no-ip",
+ "tags.3820487057": "feature-branch-apple",
+ "tags_fingerprint": "tAI71keGgz4=",
+ "zone": "us-central1-a"
+ },
+ "meta": {
+ "schema_version": "2"
+ },
+ "tainted": false
+ },
+ "deposed": [],
+ "provider": ""
+ }
+ },
+ "depends_on": []
+ },
{
"path": [
"root",
diff --git a/tabernacle/terraform/envs/gce_branches/terraform.tfstate.backup b/tabernacle/terraform/envs/gce_branches/terraform.tfstate.backup
index 2ee0d25db5..caa2afe9ef 100644
--- a/tabernacle/terraform/envs/gce_branches/terraform.tfstate.backup
+++ b/tabernacle/terraform/envs/gce_branches/terraform.tfstate.backup
@@ -1,7 +1,7 @@
{
"version": 3,
- "terraform_version": "0.9.2",
- "serial": 15,
+ "terraform_version": "0.9.3",
+ "serial": 20,
"lineage": "c0794ba9-7fe1-47b8-83ee-dd12cd64dbf5",
"modules": [
{
@@ -96,6 +96,15 @@
},
"depends_on": []
},
+ {
+ "path": [
+ "root",
+ "applepay"
+ ],
+ "outputs": {},
+ "resources": {},
+ "depends_on": []
+ },
{
"path": [
"root",
@@ -195,82 +204,7 @@
"peacock"
],
"outputs": {},
- "resources": {
- "dnsimple_record.frontend-dns-record": {
- "type": "dnsimple_record",
- "depends_on": [
- "google_compute_instance.appliance"
- ],
- "primary": {
- "id": "11150010",
- "attributes": {
- "domain": "foxcommerce.com",
- "domain_id": "foxcommerce.com",
- "hostname": "feature-branch-peacock.foxcommerce.com",
- "id": "11150010",
- "name": "feature-branch-peacock",
- "priority": "0",
- "ttl": "3600",
- "type": "A",
- "value": "10.240.0.21"
- },
- "meta": {},
- "tainted": false
- },
- "deposed": [],
- "provider": ""
- },
- "google_compute_instance.appliance": {
- "type": "google_compute_instance",
- "depends_on": [],
- "primary": {
- "id": "feature-branch-peacock",
- "attributes": {
- "can_ip_forward": "false",
- "create_timeout": "4",
- "disk.#": "1",
- "disk.0.auto_delete": "true",
- "disk.0.device_name": "",
- "disk.0.disk": "",
- "disk.0.disk_encryption_key_raw": "",
- "disk.0.disk_encryption_key_sha256": "",
- "disk.0.image": "appliance-base-170207-004420",
- "disk.0.scratch": "false",
- "disk.0.size": "40",
- "disk.0.type": "pd-ssd",
- "id": "feature-branch-peacock",
- "machine_type": "n1-standard-4",
- "metadata.%": "0",
- "metadata_fingerprint": "1-7KLxnxNkU=",
- "name": "feature-branch-peacock",
- "network.#": "0",
- "network_interface.#": "1",
- "network_interface.0.access_config.#": "0",
- "network_interface.0.address": "10.240.0.21",
- "network_interface.0.name": "nic0",
- "network_interface.0.network": "default",
- "network_interface.0.subnetwork": "",
- "network_interface.0.subnetwork_project": "",
- "self_link": "https://www.googleapis.com/compute/v1/projects/foxcomm-staging/zones/us-central1-a/instances/feature-branch-peacock",
- "service_account.#": "1",
- "service_account.0.email": "953682058057-compute@developer.gserviceaccount.com",
- "service_account.0.scopes.#": "1",
- "service_account.0.scopes.1328717722": "https://www.googleapis.com/auth/devstorage.read_write",
- "tags.#": "2",
- "tags.1358091742": "feature-branch-peacock",
- "tags.1472900357": "no-ip",
- "tags_fingerprint": "IPvV2u-8E0k=",
- "zone": "us-central1-a"
- },
- "meta": {
- "schema_version": "2"
- },
- "tainted": false
- },
- "deposed": [],
- "provider": ""
- }
- },
+ "resources": {},
"depends_on": []
},
{