From c1f3fbfc613cb51f104951ee38e014f430caa9fb Mon Sep 17 00:00:00 2001
From: Ivan Shumkov <ivan@shumkov.ru>
Date: Thu, 17 Dec 2020 16:28:54 +0800
Subject: [PATCH] feat: enable web and faucet for testnet

---
 ansible/deploy.yml                                 | 14 ++++----------
 terraform/aws/main.tf                              |  1 +
 .../aws/templates/inventory/ansible_inventory.tpl  |  4 ++--
 3 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/ansible/deploy.yml b/ansible/deploy.yml
index 843e4e97..b0409fa8 100644
--- a/ansible/deploy.yml
+++ b/ansible/deploy.yml
@@ -85,7 +85,6 @@
   become: true
   roles:
     - role: dashd
-      when: dash_network != "mainnet" and dash_network != "testnet"
       tags:
         - dashd
 
@@ -93,7 +92,6 @@
   become: true
   roles:
     - role: dashd
-      when: dash_network != "mainnet" and dash_network != "testnet"
       dashd_listen: true
       tags:
         - dashd
@@ -141,22 +139,19 @@
   become: true
   roles:
     - role: dashd-generate-miner
-      when: dash_network != "mainnet" and dash_network != "testnet"
+      when: dash_network != "mainnet"
 
 # Setup faucet and insight
 
 - hosts: web
   become: true
   roles:
-    - role: multifaucet
-      when: dash_network != "mainnet" and dash_network != "testnet"
+    - multifaucet
     - role: dashd
-      when: dash_network != "mainnet" and dash_network != "testnet"
       dashd_indexes: true
       dashd_zmq: true
       dashd_listen: true
-    - role: insight
-      when: dash_network != "mainnet" and dash_network != "testnet"
+    - insight
   tags:
     - web
 
@@ -165,8 +160,7 @@
 - hosts: masternode_wallet
   become: true
   roles:
-    - role: mn-init
-      when: dash_network != "mainnet"
+    - mn-init
 
 # Activate sporks
 
diff --git a/terraform/aws/main.tf b/terraform/aws/main.tf
index dbe2d640..675bb8cf 100644
--- a/terraform/aws/main.tf
+++ b/terraform/aws/main.tf
@@ -1,5 +1,6 @@
 # Specify the provider and access details
 provider "aws" {
+  version = "~> 3.21"
 }
 
 terraform {
diff --git a/terraform/aws/templates/inventory/ansible_inventory.tpl b/terraform/aws/templates/inventory/ansible_inventory.tpl
index 7616eb05..8b2292c5 100644
--- a/terraform/aws/templates/inventory/ansible_inventory.tpl
+++ b/terraform/aws/templates/inventory/ansible_inventory.tpl
@@ -18,8 +18,8 @@ ${masternode_hosts}
 [seed_node]
 ${node_hosts}
 
-[masternode_wallet]
+[faucet_wallet]
 dashd-wallet-1
 
-[faucet_wallet]
+[masternode_wallet]
 dashd-wallet-2