From 4cb362d62511de95c97748492a61c13a38a64434 Mon Sep 17 00:00:00 2001 From: Greg Szabo Date: Thu, 27 Jul 2017 20:40:10 +0000 Subject: [PATCH] Preparations and fixes for AWS deployments --- ansible/install.yml | 2 +- ansible/inventory/ec2.py | 0 ansible/reset.yml | 2 +- ansible/restart.yml | 2 +- ansible/start.yml | 2 +- ansible/status.yml | 2 +- ansible/stop.yml | 2 +- ansible/ubuntu16-patch.yml | 2 +- ansible/upgrade-reset.yml | 2 +- build/spectemplates/basecoin.spec | 2 +- build/spectemplates/ethermint.spec | 2 +- build/spectemplates/gaia.spec | 2 +- build/spectemplates/trackomatron.spec | 2 +- 13 files changed, 12 insertions(+), 12 deletions(-) mode change 100644 => 100755 ansible/inventory/ec2.py diff --git a/ansible/install.yml b/ansible/install.yml index 31e9ba53a..cf4f285d8 100644 --- a/ansible/install.yml +++ b/ansible/install.yml @@ -2,7 +2,7 @@ #variable "service" is required -- hosts: "{{ lookup('env','TF_VAR_TESTNET_NAME') }}" +- hosts: "{{ lookup('env','TF_VAR_TESTNET_NAME') }}:tag_Environment_{{ lookup('env','TF_VAR_TESTNET_NAME') }}" roles: - install - {role: config, testnet_name: "{{lookup('env','TF_VAR_TESTNET_NAME')}}"} diff --git a/ansible/inventory/ec2.py b/ansible/inventory/ec2.py old mode 100644 new mode 100755 diff --git a/ansible/reset.yml b/ansible/reset.yml index 45b63b65e..05845eba0 100644 --- a/ansible/reset.yml +++ b/ansible/reset.yml @@ -1,6 +1,6 @@ --- -- hosts: "{{ lookup('env','TF_VAR_TESTNET_NAME') }}" +- hosts: "{{ lookup('env','TF_VAR_TESTNET_NAME') }}:tag_Environment_{{ lookup('env','TF_VAR_TESTNET_NAME') }}" become: yes roles: - stop diff --git a/ansible/restart.yml b/ansible/restart.yml index 0dd1ce1e5..7ff755f21 100644 --- a/ansible/restart.yml +++ b/ansible/restart.yml @@ -2,7 +2,7 @@ #variable "service" is required -- hosts: "{{ lookup('env','TF_VAR_TESTNET_NAME') }}" +- hosts: "{{ lookup('env','TF_VAR_TESTNET_NAME') }}:tag_Environment_{{ lookup('env','TF_VAR_TESTNET_NAME') }}" roles: - stop - start diff --git a/ansible/start.yml b/ansible/start.yml index 1dec9c7f7..92ade42fd 100644 --- a/ansible/start.yml +++ b/ansible/start.yml @@ -2,7 +2,7 @@ #variable "service" is required -- hosts: "{{ lookup('env','TF_VAR_TESTNET_NAME') }}" +- hosts: "{{ lookup('env','TF_VAR_TESTNET_NAME') }}:tag_Environment_{{ lookup('env','TF_VAR_TESTNET_NAME') }}" roles: - start diff --git a/ansible/status.yml b/ansible/status.yml index 5ffebc551..738c23b98 100644 --- a/ansible/status.yml +++ b/ansible/status.yml @@ -2,7 +2,7 @@ #variable "service" is required -- hosts: "{{ lookup('env','TF_VAR_TESTNET_NAME') }}" +- hosts: "{{ lookup('env','TF_VAR_TESTNET_NAME') }}:tag_Environment_{{ lookup('env','TF_VAR_TESTNET_NAME') }}" roles: - status diff --git a/ansible/stop.yml b/ansible/stop.yml index cc0366fe1..f0050e065 100644 --- a/ansible/stop.yml +++ b/ansible/stop.yml @@ -2,7 +2,7 @@ #variable "service" is required -- hosts: "{{ lookup('env','TF_VAR_TESTNET_NAME') }}" +- hosts: "{{ lookup('env','TF_VAR_TESTNET_NAME') }}:tag_Environment_{{ lookup('env','TF_VAR_TESTNET_NAME') }}" roles: - stop diff --git a/ansible/ubuntu16-patch.yml b/ansible/ubuntu16-patch.yml index a9070a484..a8ba935d6 100644 --- a/ansible/ubuntu16-patch.yml +++ b/ansible/ubuntu16-patch.yml @@ -1,7 +1,7 @@ --- #Ubuntu 16.04 is not installing the python package in the standard installation on DigitalOcean. This "patch" will install it so the rest of the ansible playbooks can work properly. -- hosts: "{{ lookup('env','TF_VAR_TESTNET_NAME') }}" +- hosts: "{{ lookup('env','TF_VAR_TESTNET_NAME') }}:tag_Environment_{{ lookup('env','TF_VAR_TESTNET_NAME') }}" gather_facts: no tasks: - raw: test -e /usr/bin/python || (apt -y update && apt install -y python-minimal) diff --git a/ansible/upgrade-reset.yml b/ansible/upgrade-reset.yml index 59ddaabf7..97b76f96e 100644 --- a/ansible/upgrade-reset.yml +++ b/ansible/upgrade-reset.yml @@ -2,7 +2,7 @@ #variable "service" is required -- hosts: "{{ lookup('env','TF_VAR_TESTNET_NAME') }}" +- hosts: "{{ lookup('env','TF_VAR_TESTNET_NAME') }}:tag_Environment_{{ lookup('env','TF_VAR_TESTNET_NAME') }}" roles: - stop - install diff --git a/build/spectemplates/basecoin.spec b/build/spectemplates/basecoin.spec index 57dd23565..6fd70d837 100644 --- a/build/spectemplates/basecoin.spec +++ b/build/spectemplates/basecoin.spec @@ -12,7 +12,7 @@ URL: https://tendermint.com/ Packager: Greg Szabo Requires: tendermint >= 0.10.0 Provides: basecli -Requires(pre): /sbin/useradd +Requires(pre): useradd %description Basecoin is an ABCI application designed to be used with the Tendermint consensus engine to form a Proof-of-Stake cryptocurrency. It also provides a general purpose framework for extending the feature-set of the cryptocurrency by implementing plugins. diff --git a/build/spectemplates/ethermint.spec b/build/spectemplates/ethermint.spec index 3f2eaa546..50fc62b2a 100644 --- a/build/spectemplates/ethermint.spec +++ b/build/spectemplates/ethermint.spec @@ -11,7 +11,7 @@ License: Apache 2.0 URL: https://tendermint.com/ Packager: Greg Szabo Requires: tendermint >= 0.10.0 -Requires(pre): /sbin/useradd +Requires(pre): useradd %description Ethermint enables ethereum to run as an ABCI application on tendermint and the COSMOS hub. This application allows you to get all the benefits of ethereum without having to run your own miners. diff --git a/build/spectemplates/gaia.spec b/build/spectemplates/gaia.spec index abc4e036e..98fb5285f 100644 --- a/build/spectemplates/gaia.spec +++ b/build/spectemplates/gaia.spec @@ -11,7 +11,7 @@ License: Apache 2.0 URL: https://cosmos.network/ Packager: Greg Szabo Requires: tendermint >= 0.10.0 -Requires(pre): /sbin/useradd +Requires(pre): useradd %description Gaia description comes later. diff --git a/build/spectemplates/trackomatron.spec b/build/spectemplates/trackomatron.spec index a159c9816..82f20b5a0 100644 --- a/build/spectemplates/trackomatron.spec +++ b/build/spectemplates/trackomatron.spec @@ -11,7 +11,7 @@ License: Apache 2.0 URL: https://tendermint.com/ Packager: Greg Szabo Requires: tendermint >= 0.10.0 -Requires(pre): /sbin/useradd +Requires(pre): useradd %description This software is intended to create a space to easily send invoices between and within institutions. Firstly, the commands of trackmatron are separated into two broad categories: submitting information to the blockchain (transactions), and retrieving information from the blockchain (query).