From 0ea697c2266638f5f002557a8821db275f75ceb8 Mon Sep 17 00:00:00 2001 From: Joshua Fernandes Date: Tue, 20 Apr 2021 07:49:16 +1000 Subject: [PATCH] new consensys namespace --- README.md | 14 +++++++------- defaults/main.yml | 1 + meta/main.yml | 4 ++-- templates/config.toml.j2 | 1 + 4 files changed, 11 insertions(+), 9 deletions(-) diff --git a/README.md b/README.md index 96befd5..af03b11 100644 --- a/README.md +++ b/README.md @@ -31,7 +31,7 @@ All variables which can be overridden are stored in [defaults/main.yml](defaults | Name | Default Value | Description | | -------------- | ------------- | -----------------------------------| | `besu_build_from_source` | ___unset___ | When set to `true`, Besu is build from git sources. See also `besu_git_repo` and `besu_git_commit` | -| `besu_version` | ___unset___ | __REQUIRED__ if `besu_build_from_source` is false. Version of Besu to install and run. All available versions are listed on our Besu [solutions](https://pegasys.tech/solutions/hyperledger-besu/) page | +| `besu_version` | ___unset___ | __REQUIRED__ if `besu_build_from_source` is false. Version of Besu to install and run. All available versions are listed on our Besu [solutions](https://github.com/hyperledger/besu/releases) page | | `besu_git_repo` | https://github.com/hyperledger/besu.git | The URL to use when cloning besu sources. Only necessary when `besu_build_from_source` is `true`. | | `besu_git_commit` | master | The git commit to use when building Besu from source. Can be a branchname, commit hash, or anything that's legal to be used as an argument to `git checkout`. Only used if `besu_build_from_source` is `true`. | | `besu_user` | besu | Besu user | @@ -94,11 +94,11 @@ All variables which can be overridden are stored in [defaults/main.yml](defaults 1. Default setup: Install the role from galaxy ``` -ansible-galaxy install pegasyseng.hyperledger_besu +ansible-galaxy install consensys.hyperledger_besu ``` Create a requirements.yml with the following: -Replace `x.y.z` below with the version you would like to use from the Besu [solutions](https://pegasys.tech/solutions/hyperledger-besu/) page +Replace `x.y.z` below with the version you would like to use from the Besu [solutions](https://github.com/hyperledger/besu/releases) page ``` --- - hosts: localhost @@ -106,7 +106,7 @@ Replace `x.y.z` below with the version you would like to use from the Besu [solu force_handlers: True roles: - - role: pegasyseng.hyperledger_besu + - role: consensys.hyperledger_besu vars: besu_version: x.y.z @@ -121,11 +121,11 @@ ansible-playbook -v /path/to/requirements.yml 2. Install via github ``` -ansible-galaxy install git+https://github.com/pegasyseng/ansible-role-besu.git +ansible-galaxy install git+https://github.com/consensys/ansible-role-besu.git ``` Create a requirements.yml with the following: -Replace `x.y.z` below with the version you would like to use from the Besu [solutions](https://pegasys.tech/solutions/hyperledger-besu/) page +Replace `x.y.z` below with the version you would like to use from the Besu [solutions](https://github.com/hyperledger/besu/releases) page ``` --- - hosts: localhost @@ -152,4 +152,4 @@ Apache ### Author Information -PegaSysEng, 2019 +Consensys, 2021 diff --git a/defaults/main.yml b/defaults/main.yml index f7c5b22..08ab903 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -62,6 +62,7 @@ besu_bootnodes: [] besu_host_whitelist: ["*"] besu_cmdline_args: [] besu_env_opts: [] +besu_permissions_nodes_contract_version: 2 # privacy besu_privacy_enabled: "false" diff --git a/meta/main.yml b/meta/main.yml index 861b20e..9a663e1 100644 --- a/meta/main.yml +++ b/meta/main.yml @@ -1,9 +1,9 @@ --- galaxy_info: - author: PegaSysEng + author: Consensys role_name: hyperledger-besu description: Besu is an open-source java enterprise ethereum client - company: PegaSysEng + company: Consensys license: license (Apache) min_ansible_version: 2.6 platforms: diff --git a/templates/config.toml.j2 b/templates/config.toml.j2 index 312f273..3ddb43f 100644 --- a/templates/config.toml.j2 +++ b/templates/config.toml.j2 @@ -93,6 +93,7 @@ permissions-accounts-contract-address="{{ besu_permissions_accounts_contract_add # onchain node permissions permissions-nodes-contract-enabled=true permissions-nodes-contract-address="{{ besu_permissions_nodes_contract_address }}" +permissions-nodes-contract-version={{besu_permissions_nodes_contract_version}} {% endif %} {% if besu_bootnodes|length > 0 %}