Merge pull request #34 from cloudstruct/release/v1.7.0

Update smartnode-install to v1.7.0

.github/workflows/ansible-tests.yml

@@ -62,4 +62,4 @@ jobs:
 
       - name: Run playbook
         id: ansible-playbook
-        run: ansible-playbook site.yml -e "POOL=mainnet-00" --skip-tags 'skipci' -vvv
+        run: ansible-playbook site.yml -e "POOL=mainnet-00" --skip-tags 'skipci' 

README.md

@@ -21,7 +21,7 @@
 Automation to deploy/manage a Rocketpool Ethereum staking pool node
 
 ### Why?
-You may be asking why does this repo exist?  Rocketpool already has a fantastic install guide, docker containers, docker-compose setup, etc.
+You may be asking why does this repo exist?  Rocketpool already has a fantastic install guide, docker containers, etc.
 The reasons someone might want to use this repo are:
 * Production level deployment (Things like uptime, self-healing, monitoring, notifications for monitoring, and repeatability)
 * You do not want to put the effort in to doing it manually.

ansible/roles/base/tasks/firewall.yml

@@ -35,7 +35,7 @@
   when: node.ufw.enabled | default(True)
 
 - name: Base-Firewall | Add fail2ban sshd configuration
-  ini_file:
+  community.general.ini_file:
     path: /etc/fail2ban/jail.d/ssh.conf
     section: "sshd"
     option: "{{ ssh_config.option }}"

ansible/roles/base/tasks/main.yml

@@ -1,12 +1,12 @@
 ---
 - name: Main | Include preflight tasks
-  include_tasks: preflight.yml
+  ansible.builtin.include_tasks: preflight.yml
 
 - name: Main | Include system tasks
-  include_tasks: system.yml
+  ansible.builtin.include_tasks: system.yml
 
 - name: Main | Include Firewall tasks
-  include_tasks:
+  ansible.builtin.include_tasks:
     file: firewall.yml
     apply:
       tags:

ansible/roles/base/tasks/system.yml

@@ -24,7 +24,7 @@
   tags: ['skipci']
 
 - name: System | Secure shared memory
-  ansible.builtin.mount:
+  ansible.posix.mount:
     src: none
     path: /run/shm
     fstype: tmpfs

ansible/roles/rocketpool/tasks/main.yml

@@ -11,7 +11,7 @@
     - rocketpool_arch is not defined or rocketpool_version is not defined
   tags: ['always']
 
-- name: "Rocketpool Main | Download rocketpool binary '{{ rocketpool_version }}'"
+- name: "Rocketpool Main | Download rocketpool binary {{ rocketpool_version }}"
   ansible.builtin.get_url:
     url: "https://github.com/rocket-pool/smartnode-install/releases/download/{{ rocketpool_version }}/rocketpool-cli-linux-{{ rocketpool_arch }}"
     dest: '/usr/local/bin/rocketpool'
@@ -20,7 +20,7 @@
     group: 'root'
 
 - name: Main | Include rocketpool install tasks
-  include_tasks: install.yml
+  ansible.builtin.include_tasks: install.yml
 
 - name: Main | Include rocketpool post install tasks
-  include_tasks: post_install.yml
+  ansible.builtin.include_tasks: post_install.yml

ansible/setup-system.yml

@@ -70,7 +70,10 @@
         name: geerlingguy.docker
       vars:
         docker_apt_arch: "{{ rocketpool_arch }}"
-        docker_compose_arch: "{{ ansible_architecture }}"
-        docker_compose_version: "v{{ node.docker.compose.version | default(node.docker.compose.version) }}"
         docker_users: "{{ node.docker.users | default(node.docker.users) | default(['rp']) }}"
         docker_daemon_options: "{{ node.docker.daemon_options }}"
+
+    - name: Playbook | Install docker-compose-plugin
+      ansible.builtin.package:
+        state: present
+        name: docker-compose-plugin

terraform/rocketpool/bundle.tf

@@ -4,39 +4,25 @@ locals {
     "${path.module}/../../vars",
     "${path.module}/../../requirements.txt"
   ]
-}
-
-# Template local-update.sh file
-data "template_file" "local_update" {
-  template = file("${path.module}/templates/local-update.sh.tpl")
-  vars = {
+  bundle_vars = {
     rocketpool_pool = local.pool
     region          = local.aws_vars.region
   }
 }
 
 resource "local_file" "local_update" {
-  content  = data.template_file.local_update.rendered
+  content  = templatefile("${path.module}/templates/local-update.sh.tpl", local.bundle_vars)
   filename = "${path.module}/../../ansible/local-update.sh"
 }
 
-# Generate script which will create tarball for upload
-data "template_file" "tar_sh" {
-  template = <<EOF
-#!/bin/bash
-tar $* %1>/dev/null %2>/dev/null
-echo '{"result":"success"}'
-EOF
-}
-
 resource "local_file" "tar_sh" {
-  filename = "${path.module}/../scripts/tar.sh"
-  content  = data.template_file.tar_sh.rendered
+  filename       = "${path.module}/../scripts/tar.sh"
+  content_base64 = "IyEvYmluL2Jhc2gKdGFyICQqICUxPi9kZXYvbnVsbCAlMj4vZGV2L251bGwKZWNobyAneyJyZXN1bHQiOiJzdWNjZXNzIn0nCg=="
 }
 
 data "external" "tar_sh" {
   program    = [local_file.tar_sh.filename, "-cvzf", "${path.module}/ansible-${local.rp_vars.rocketpool.version}.tar.gz", join(" ", local.bundle_files)]
-  depends_on = [data.template_file.tar_sh, local_file.local_update]
+  depends_on = [local_file.local_update]
 }
 
 resource "aws_s3_object" "ansible_tar_gz" {

terraform/rocketpool/cloudwatch.tf

@@ -1,6 +1,6 @@
 module "cloudwatch_metric_alarms" {
   source  = "terraform-aws-modules/cloudwatch/aws//modules/metric-alarm"
-  version = "3.3.0"
+  version = "4.0.0"
 
   for_each = {
     for key, val in try(local.aws_vars.cloudwatch, {}) :