Merge pull request #74 from SylvainMartel/stable

Stable

ansible/indy_node/roles/indy_node/defaults/main.yml

@@ -1,8 +1,8 @@
 ---
-indy_node_channel: rc
+indy_node_channel: stable
 indy_node_pkg: indy-node
-indy_node_pkg_version: 1.13.2~rc3
-indy_plenum_pkg_version: 1.13.1~rc2
+indy_node_pkg_version: 1.13.2
+indy_plenum_pkg_version: 1.13.1
 
 # Configuration Parameters
 cloud: azure
@@ -20,4 +20,4 @@ indy_node_configuration: true
 start_indy_node: true
 
 # Don't set this, it is auto-detected
-distribution_codename: null
+distribution_codename: null

ansible/indy_node/roles/indy_node/tasks/install.yml

@@ -10,144 +10,134 @@
 
 - name: Install dependencies
   block:
+    # =============================
+    # RocksDb and Dependenaces
+    #------------------------------
+    - name: rocksdb
+      apt:
+        name:
+          - "rocksdb=5.8.8"
+        update_cache: true
+      become: true
+      tags:
+        - install
+        - package
 
-  # =============================
-  # RocksDb and Dependenaces
-  #------------------------------
-  - name: rocksdb
-    apt:
-      name:
-        - "rocksdb=5.8.8"
-      update_cache: true
-    become: true
-    tags:
-      - install
-      - package
+    - name: libgflags-dev
+      apt:
+        name:
+          - "libgflags-dev"
+        update_cache: true
+      become: true
+      tags:
+        - install
+        - package
 
-  - name: libgflags-dev
-    apt:
-      name:
-        - "libgflags-dev"
-      update_cache: true
-    become: true
-    tags:
-      - install
-      - package
+    - name: libsnappy-dev
+      apt:
+        name:
+          - "libsnappy-dev"
+        update_cache: true
+      become: true
+      tags:
+        - install
+        - package
 
-  - name: libsnappy-dev
-    apt:
-      name:
-        - "libsnappy-dev"
-      update_cache: true
-    become: true
-    tags:
-      - install
-      - package
+    - name: zlib1g-dev
+      apt:
+        name:
+          - "zlib1g-dev"
+        update_cache: true
+      become: true
+      tags:
+        - install
+        - package
 
-  - name: zlib1g-dev
-    apt:
-      name:
-        - "zlib1g-dev"
-      update_cache: true
-    become: true
-    tags:
-      - install
-      - package
+    - name: libbz2-dev
+      apt:
+        name:
+          - "libbz2-dev"
+        update_cache: true
+      become: true
+      tags:
+        - install
+        - package
 
-  - name: libbz2-dev
-    apt:
-      name:
-        - "libbz2-dev"
-      update_cache: true
-    become: true
-    tags:
-      - install
-      - package
+    - name: liblz4-dev
+      apt:
+        name:
+          - "liblz4-dev"
+        update_cache: true
+      become: true
+      tags:
+        - install
+        - package
+    # =============================
 
-  - name: liblz4-dev
-    apt:
-      name:
-        - "liblz4-dev"
-      update_cache: true
-    become: true
-    tags:
-      - install
-      - package
-  # =============================
+    - name: libssl1.0.0
+      apt:
+        name:
+          - "libssl1.0.0"
+        update_cache: true
+      become: true
+      tags:
+        - install
+        - package
 
-  - name: libssl1.0.0
-    apt:
-      name:
-        - "libssl1.0.0"
-      update_cache: true
-    become: true
-    tags:
-      - install
-      - package
+    # =============================
+    # Ursa
+    # -----------------------------
+    - name: ursa
+      apt:
+        name:
+          - "ursa=0.3.2-1"
+        update_cache: true
+      become: true
+      tags:
+        - install
+        - package
 
-  # =============================
-  # Ursa
-  # -----------------------------
-  - name: ursa
-    apt:
-      name:
-        - "ursa=0.3.2-1"
-      update_cache: true
-    become: true
-    tags:
-      - install
-      - package
+    # =============================
 
-  - name:  Move libursa.so to parent dirirectory
-    shell: >
-      if [ -d /usr/lib/ursa ]; then
-        mv /usr/lib/ursa/* /usr/lib && rm -rf /usr/lib/ursa
-      fi
-    become: true
-    tags:
-      - install
-      - package
-  # =============================
+    - name: python3-libnacl
+      apt:
+        name:
+          - "python3-libnacl=1.6.1"
+        update_cache: true
+      become: true
+      tags:
+        - install
+        - package
 
-  - name: python3-libnacl
-    apt:
-      name:
-        - "python3-libnacl=1.6.1"
-      update_cache: true
-    become: true
-    tags:
-      - install
-      - package
+    - name: python3-ujson
+      apt:
+        name:
+          - "python3-ujson=1.33"
+        update_cache: true
+      become: true
+      tags:
+        - install
+        - package
 
-  - name: python3-ujson
-    apt:
-      name:
-        - "python3-ujson=1.33"
-      update_cache: true
-    become: true
-    tags:
-      - install
-      - package
+    - name: python3-sortedcontainers
+      apt:
+        name:
+          - "python3-sortedcontainers=1.5.7"
+        update_cache: true
+      become: true
+      tags:
+        - install
+        - package
 
-  - name: python3-sortedcontainers
-    apt:
-      name:
-        - "python3-sortedcontainers=1.5.7"
-      update_cache: true
-    become: true
-    tags:
-      - install
-      - package
-
-  - name: indy-plenum
-    apt:
-      name:
-        - "indy-plenum={{ indy_plenum_pkg_version | default(indy_node_pkg_version) }}"
-      update_cache: true
-    become: true
-    tags:
-      - install
-      - package
+    - name: indy-plenum
+      apt:
+        name:
+          - "indy-plenum={{ indy_plenum_pkg_version | default(indy_node_pkg_version) }}"
+        update_cache: true
+      become: true
+      tags:
+        - install
+        - package
   when:
     - indy_node_channel == "rc"
     - distribution_codename == "focal"
@@ -160,4 +150,14 @@
   become: true
   tags:
     - install
-    - package
+    - package
+
+- name: Move libursa.so to parent dirirectory
+  shell: >
+    if [ -d /usr/lib/ursa ]; then
+      mv /usr/lib/ursa/* /usr/lib && rm -rf /usr/lib/ursa
+    fi
+  become: true
+  tags:
+    - install
+    - package

ansible/indy_node/roles/indy_node/templates/repository/hyperledger.pref.j2

@@ -0,0 +1,3 @@
+Package: *
+Pin: origin hyperledger.jfrog.io 
+Pin-Priority: 1001

ansible/indy_node/roles/indy_node_repo/tasks/main.yml

@@ -62,4 +62,10 @@
   when:
     - distribution_codename == "focal"
     - indy_repo_node_channels|d(False, True)
-# ==============================================================================================================
+
+- name: Set Hyperledger repository priority
+  template:
+    src: repository/hyperledger.pref.j2
+    dest: /etc/apt/preferences.d/hyperledger.pref
+# ==============================================================================================================
+

terraform/aws/main.tf

@@ -2,7 +2,7 @@
 #   - When using elastic IP addresses, the limit is 5 per region
 #     so, you are limited to 2 nodes using elastic IP addresses.
 module "indy-node" {
-  source = "github.com/ICCS-ISAC/terraform-aws-indy-node?ref=1.1.0"
+  source = "github.com/ICCS-ISAC/terraform-aws-indy-node?ref=1.1.1"
 
 
   count             = var.candy_instance_count
@@ -12,6 +12,7 @@ module "indy-node" {
   zone              = data.aws_availability_zones.available.names[count.index % length(data.aws_availability_zones.available.names)]
   ami_id            = data.aws_ami.ubuntu.id
   ec2_instance_type = var.candy_ec2_instance_type
+  opt_ec2_tags      = var.optional_ec2_tags
 
   root_volume_size          = var.candy_root_volume_size
   data_volume_size          = var.candy_data_volume_size
@@ -33,4 +34,5 @@ module "indy-node" {
   client_port  = var.candy_client_port
   node_port    = var.candy_node_port
   ssh_key_name = aws_key_pair.ansible.key_name
+
 }

terraform/aws/variables.tf

@@ -110,4 +110,11 @@ variable "iam_role" {
 
 variable "candy_vpc_node_cidr_block" {
   description = "VPC IP CIDR"
+}
+
+variable "optional_ec2_tags" {
+  description = "Allows to add optional tags to EC2 vm's"
+  type        = map(string)
+  default = {
+  }
 }