From b522f40e259bec463d1173e693aaca0ed1d1b403 Mon Sep 17 00:00:00 2001
From: phahulin
Date: Fri, 1 Dec 2017 16:35:00 +0300
Subject: [PATCH] Separate group_vars by roles; Rename parity_nouncles; Extract
NODE_SOURCE_DEB
---
.gitignore | 7 +++
files/.gitkeep | 0
files/ssh_bootnode.pub | 1 -
group_vars/all | 63 +++++++++++++++++++
group_vars/all.example | 5 +-
group_vars/bootnode.example | 10 +++
group_vars/explorer.example | 5 ++
group_vars/mining.example | 14 +++++
group_vars/netstat.example | 10 +++
group_vars/owner.example | 13 ++++
roles/nodejs/tasks/main.yml | 6 +-
roles/oracles-parity/tasks/main.yml | 4 +-
.../templates/oracles-parity.j2 | 2 +-
13 files changed, 130 insertions(+), 10 deletions(-)
create mode 100644 .gitignore
create mode 100644 files/.gitkeep
delete mode 120000 files/ssh_bootnode.pub
create mode 100644 group_vars/all
create mode 100644 group_vars/bootnode.example
create mode 100644 group_vars/explorer.example
create mode 100644 group_vars/mining.example
create mode 100644 group_vars/netstat.example
create mode 100644 group_vars/owner.example
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..9753880
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,7 @@
+files/*.pub
+
+group_vars/bootnode
+group_vars/explorer
+group_vars/mining
+group_vars/netstat
+group_vars/owner
diff --git a/files/.gitkeep b/files/.gitkeep
new file mode 100644
index 0000000..e69de29
diff --git a/files/ssh_bootnode.pub b/files/ssh_bootnode.pub
deleted file mode 120000
index 9d17408..0000000
--- a/files/ssh_bootnode.pub
+++ /dev/null
@@ -1 +0,0 @@
-./admins.pub
\ No newline at end of file
diff --git a/group_vars/all b/group_vars/all
new file mode 100644
index 0000000..bffb4f5
--- /dev/null
+++ b/group_vars/all
@@ -0,0 +1,63 @@
+---
+ssh_root:
+ - "{{ lookup('file', 'files/admins.pub') }}"
+
+snmp_syslocation: "USA"
+snmp_ipsubnet: "172.16.0.0/16"
+
+nameservers:
+ - "8.8.8.8"
+ - "8.8.4.4"
+
+ntpservers:
+ - "server 0.us.pool.ntp.org"
+ - "server 1.us.pool.ntp.org"
+ - "server 2.us.pool.ntp.org"
+ - "server 3.us.pool.ntp.org"
+
+image: "ami-9d04e4e5"
+region: "us-west-2"
+
+NODE_PWD: "node.pwd" # don't change this one
+NODE_SOURCE_DEB: "https://deb.nodesource.com/node_8.x"
+PARITY_BIN_LOC: "https://github.com/oraclesorg/binary-releases/releases/download/1.8.2/parity"
+
+SCRIPTS_OWNER_BRANCH: "master"
+SCRIPTS_VALIDATOR_BRANCH: "master"
+MAIN_REPO_FETCH: "oraclesorg"
+TEMPLATES_BRANCH: "dev-mainnet"
+GENESIS_BRANCH: "master"
+
+OWNER_ADDRESS: "0xdd0bb0e2a1594240fed0c2f2c17c1e9ab4f87126"
+NETSTATS_SERVER: "34.215.172.88"
+TX_GAS_LIMIT: "6700000"
+
+#bootnode
+bootnode_instance_type: "t2.large"
+bootnode_instance_name: "bootnode"
+bootnode_count_instances: "1"
+bootnode_security_group: "bootnode-security"
+
+#netstat
+netstat_instance_type: "t2.large"
+netstat_instance_name: "netstat"
+netstat_count_instances: "1"
+netstat_security_group: "netstat-security"
+
+#mining
+mining_instance_type: "t2.large"
+mining_instance_name: "mining"
+mining_count_instances: "1"
+mining_security_group: "mining-security"
+
+#owner
+owner_instance_type: "t2.large"
+owner_instance_name: "owner"
+owner_count_instances: "1"
+owner_security_group: "owner-security"
+
+#explorer
+explorer_instance_type: "t2.large"
+explorer_instance_name: "explorer"
+explorer_count_instances: "1"
+explorer_security_group: "explorer-security"
diff --git a/group_vars/all.example b/group_vars/all.example
index bccabdc..4153e9e 100644
--- a/group_vars/all.example
+++ b/group_vars/all.example
@@ -42,11 +42,10 @@ SCRIPTS_OWNER_BRANCH: "master"
SCRIPTS_VALIDATOR_BRANCH: "master"
TX_GAS_LIMIT: "6700000"
-
NODE_PWD: "node.pwd"
-parity_nouncles: "https://github.com/oraclesorg/binary-releases/releases/download/1.8.2/parity"
-
+NODE_SOURCE_DEB: "https://deb.nodesource.com/node_8.x"
+PARITY_BIN_LOC: "https://github.com/oraclesorg/binary-releases/releases/download/1.8.2/parity"
#bootnode
bootnode_instance_type: "t2.large"
diff --git a/group_vars/bootnode.example b/group_vars/bootnode.example
new file mode 100644
index 0000000..f2ebad9
--- /dev/null
+++ b/group_vars/bootnode.example
@@ -0,0 +1,10 @@
+access_key: "_INSERT KEY HERE_"
+secret_key: "_INSERT SECRET HERE_"
+awskeypair_name: "keypairname"
+
+vpc_subnet_id: "subnet-ID-number"
+
+NODE_FULLNAME: "_INSERT NODENAME_"
+NODE_ADMIN_EMAIL: "_INSERT@EMAIL_"
+
+NETSTATS_SECRET: "_INSERT SECRET_"
diff --git a/group_vars/explorer.example b/group_vars/explorer.example
new file mode 100644
index 0000000..7005995
--- /dev/null
+++ b/group_vars/explorer.example
@@ -0,0 +1,5 @@
+access_key: "_INSERT KEY HERE_"
+secret_key: "_INSERT SECRET HERE_"
+awskeypair_name: "keypairname"
+
+vpc_subnet_id: "subnet-ID-number"
diff --git a/group_vars/mining.example b/group_vars/mining.example
new file mode 100644
index 0000000..02e20ca
--- /dev/null
+++ b/group_vars/mining.example
@@ -0,0 +1,14 @@
+access_key: "_INSERT KEY HERE_"
+secret_key: "_INSERT SECRET HERE_"
+awskeypair_name: "keypairname"
+
+vpc_subnet_id: "subnet-ID-number"
+
+NODE_FULLNAME: "_INSERT NODENAME_"
+NODE_ADMIN_EMAIL: "_INSERT@EMAIL_"
+
+NETSTATS_SECRET: "_INSERT SECRET_"
+
+MINING_KEYFILE: "_INSERT_"
+MINING_ADDRESS: "_INSERT_"
+MINING_KEYPASS: "_INSERT_"
diff --git a/group_vars/netstat.example b/group_vars/netstat.example
new file mode 100644
index 0000000..f2ebad9
--- /dev/null
+++ b/group_vars/netstat.example
@@ -0,0 +1,10 @@
+access_key: "_INSERT KEY HERE_"
+secret_key: "_INSERT SECRET HERE_"
+awskeypair_name: "keypairname"
+
+vpc_subnet_id: "subnet-ID-number"
+
+NODE_FULLNAME: "_INSERT NODENAME_"
+NODE_ADMIN_EMAIL: "_INSERT@EMAIL_"
+
+NETSTATS_SECRET: "_INSERT SECRET_"
diff --git a/group_vars/owner.example b/group_vars/owner.example
new file mode 100644
index 0000000..7a6e738
--- /dev/null
+++ b/group_vars/owner.example
@@ -0,0 +1,13 @@
+access_key: "_INSERT KEY HERE_"
+secret_key: "_INSERT SECRET HERE_"
+awskeypair_name: "keypairname"
+
+vpc_subnet_id: "subnet-ID-number"
+
+NODE_FULLNAME: "_INSERT NODENAME_"
+NODE_ADMIN_EMAIL: "_INSERT@EMAIL_"
+
+NETSTATS_SECRET: "_INSERT SECRET_"
+
+OWNER_KEYPASS: "_INSERT_"
+OWNER_KEYFILE: "_INSERT_"
diff --git a/roles/nodejs/tasks/main.yml b/roles/nodejs/tasks/main.yml
index b916b01..2d04140 100644
--- a/roles/nodejs/tasks/main.yml
+++ b/roles/nodejs/tasks/main.yml
@@ -1,7 +1,7 @@
---
- name: Ensure apt-transport-https is installed.
apt: name=apt-transport-https state=present
-
+
- name: add nodejs repository key
apt_key:
keyserver: keyserver.ubuntu.com
@@ -10,10 +10,10 @@
- name: Add nodejs repository
apt_repository:
- repo: 'deb https://deb.nodesource.com/node_8.x {{ansible_distribution_release}} main'
+ repo: 'deb {{ NODE_SOURCE_DEB }} {{ansible_distribution_release}} main'
state: present
-- name: Install nodejs packages
+- name: Install nodejs packages
apt: name={{ item }} state=present update_cache=yes
with_items:
- nodejs
diff --git a/roles/oracles-parity/tasks/main.yml b/roles/oracles-parity/tasks/main.yml
index e98937b..2d83c6f 100644
--- a/roles/oracles-parity/tasks/main.yml
+++ b/roles/oracles-parity/tasks/main.yml
@@ -15,8 +15,8 @@
owner: "{{ username }}"
group: "{{ username }}"
-- name: Download parity-nouncles
- get_url: url="{{ parity_nouncles }}" dest={{ home }}/parity-nouncles mode=0755
+- name: Download parity-bin
+ get_url: url="{{ PARITY_BIN_LOC }}" dest={{ home }}/parity mode=0755
notify:
- restart oracles-parity
diff --git a/roles/oracles-parity/templates/oracles-parity.j2 b/roles/oracles-parity/templates/oracles-parity.j2
index 9ab1511..5cdb508 100644
--- a/roles/oracles-parity/templates/oracles-parity.j2
+++ b/roles/oracles-parity/templates/oracles-parity.j2
@@ -5,7 +5,7 @@ After=network.target
User={{ username }}
Group={{ username }}
WorkingDirectory=/home/{{ username }}
-ExecStart=/home/{{ username }}/parity-nouncles --config=node.toml
+ExecStart=/home/{{ username }}/parity --config=node.toml
Restart=always
[Install]
WantedBy=multi-user.target