From c84a128300e7560bc5558a50605cbe515e2d09a8 Mon Sep 17 00:00:00 2001
From: Vitaly Znachenok <vitaly@znachenok.com>
Date: Mon, 27 Nov 2017 00:03:42 +0300
Subject: [PATCH] Mining role and fix variable name in ec2 create instance

---
 ansible.cfg                 | 1 +
 bootnode.tml                | 6 +++---
 mining.yml                  | 6 +++---
 netstat.yml                 | 6 +++---
 roles/mining/tasks/main.yml | 4 ++--
 5 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/ansible.cfg b/ansible.cfg
index 7e9d97b..1b7798d 100644
--- a/ansible.cfg
+++ b/ansible.cfg
@@ -6,6 +6,7 @@ forks          = 20
 gathering = implicit
 # SSH timeout
 timeout = 10
+host_key_checking = False
 
 remote_user = root
 ansible_managed = This file is managed by ansible
diff --git a/bootnode.tml b/bootnode.tml
index 8500807..1decd2c 100644
--- a/bootnode.tml
+++ b/bootnode.tml
@@ -56,11 +56,11 @@
         ec2_secret_key: "{{ secret_key }}"
         key_name: "{{ awskeypair_name }}"
         instance_tags: 
-          Name: "{{ instance_name }}"
+          Name: "{{ bootnode_instance_name }}"
         group: "{{ bootnode_security_group }}"
-        instance_type: "{{ instance_type }}"
+        instance_type: "{{ bootnode_instance_type }}"
         image: "{{ image }}"
-        count: "{{ count_instances }}"
+        count: "{{ bootnode_count_instances }}"
         wait: yes
         region: "{{ region }}"
         vpc_subnet_id: "{{ vpc_subnet_id }}"
diff --git a/mining.yml b/mining.yml
index d0a1159..a53061a 100644
--- a/mining.yml
+++ b/mining.yml
@@ -52,11 +52,11 @@
         ec2_secret_key: "{{ secret_key }}"
         key_name: "{{ awskeypair_name }}"
         instance_tags: 
-          Name: "{{ instance_name }}"
+          Name: "{{ mining_instance_name }}"
         group: "{{ mining_security_group }}"
-        instance_type: "{{ instance_type }}"
+        instance_type: "{{ mining_instance_type }}"
         image: "{{ image }}"
-        count: "{{ count_instances }}"
+        count: "{{ mining_count_instances }}"
         wait: yes
         region: "{{ region }}"
         vpc_subnet_id: "{{ vpc_subnet_id }}"
diff --git a/netstat.yml b/netstat.yml
index bfd0eaa..cfa90fb 100644
--- a/netstat.yml
+++ b/netstat.yml
@@ -64,11 +64,11 @@
         ec2_secret_key: "{{ secret_key }}"
         key_name: "{{ awskeypair_name }}"
         instance_tags: 
-          Name: "{{ instance_name }}"
+          Name: "{{ netstat_instance_name }}"
         group: "{{ netstat_security_group }}"
-        instance_type: "{{ instance_type }}"
+        instance_type: "{{ netstat_instance_type }}"
         image: "{{ image }}"
-        count: "{{ count_instances }}"
+        count: "{{ netstat_count_instances }}"
         wait: yes
         region: "{{ region }}"
         vpc_subnet_id: "{{ vpc_subnet_id }}"
diff --git a/roles/mining/tasks/main.yml b/roles/mining/tasks/main.yml
index 86007ca..3685483 100644
--- a/roles/mining/tasks/main.yml
+++ b/roles/mining/tasks/main.yml
@@ -20,7 +20,7 @@
   with_items:
     - "https://raw.githubusercontent.com/oraclesorg/oracles-scripts/sokol/spec.json"
     - "https://raw.githubusercontent.com/oraclesorg/deployment-azure/dev-mainnet/nodes/bootnodes.txt"
-    - "https://raw.githubusercontent.com/oraclesorg/deployment-azure/dev-mainnet/nodes/bootnode/node.toml"
+    - "https://raw.githubusercontent.com/oraclesorg/deployment-azure/dev-mainnet/nodes/mining-node/node.toml"
 
 - name: Change nat in node.toml
   lineinfile: 
@@ -72,7 +72,7 @@
 - git: repo=https://github.com/oraclesorg/eth-net-intelligence-api dest={{ home }}/eth-net-intelligence-api
 
 - name: Install netstats config
-  template: src=app.json.j2 dest={{ home }}/eth-net-intelligence-api/app.json owner=bootnode group=bootnode mode=0644
+  template: src=app.json.j2 dest={{ home }}/eth-net-intelligence-api/app.json owner=mining group=mining mode=0644
 
 - file: path={{ home }} owner={{ username }} group={{ username }} recurse=yes