[accumulo-testing] branch main updated: Only install & enable Docker on manager node (#252)

[dl...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

dlmarion pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/accumulo-testing.git


The following commit(s) were added to refs/heads/main by this push:
     new 87404f1  Only install & enable Docker on manager node (#252)
87404f1 is described below

commit 87404f12142c5007c1cd01f496da0c56ccb31454
Author: Dave Marion <dl...@apache.org>
AuthorDate: Thu Oct 27 15:47:45 2022 -0400

    Only install & enable Docker on manager node (#252)
---
 .../modules/cloud-init-config/templates/cloud-init.tftpl         | 7 +------
 .../modules/config-files/templates/initialize_accumulo.sh.tftpl  | 9 +++++++++
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/contrib/terraform-testing-infrastructure/modules/cloud-init-config/templates/cloud-init.tftpl b/contrib/terraform-testing-infrastructure/modules/cloud-init-config/templates/cloud-init.tftpl
index 0593b10..d560ed1 100644
--- a/contrib/terraform-testing-infrastructure/modules/cloud-init-config/templates/cloud-init.tftpl
+++ b/contrib/terraform-testing-infrastructure/modules/cloud-init-config/templates/cloud-init.tftpl
@@ -36,7 +36,7 @@ yum_repos:
   docker:
     name: Docker CE Stable - $basearch
     baseurl: https://download.docker.com/linux/centos/$releasever/$basearch/stable
-    enabled: true
+    enabled: false
     gpgcheck: true
     gpgkey: https://download.docker.com/linux/centos/gpg
 %{ endif ~}
@@ -68,9 +68,6 @@ packages:
   - make
 %{ endif ~}
   - openssl
-  - docker-ce
-  - docker-ce-cli
-  - containerd.io
   - wget
 
 #
@@ -82,8 +79,6 @@ runcmd:
 %{ endif ~}
   - mkdir -p ${software_root} ${zookeeper_dir} ${hadoop_dir} ${accumulo_dir}
   - chown hadoop.hadoop ${software_root} ${zookeeper_dir} ${hadoop_dir} ${accumulo_dir}
-  - systemctl enable docker
-  - systemctl start docker
 %{ if os_type == "ubuntu" ~}
   # Use bash instead of dash for the default shell
   - ln -s bash /bin/sh.bash
diff --git a/contrib/terraform-testing-infrastructure/modules/config-files/templates/initialize_accumulo.sh.tftpl b/contrib/terraform-testing-infrastructure/modules/config-files/templates/initialize_accumulo.sh.tftpl
index 89e9c2a..02bb323 100755
--- a/contrib/terraform-testing-infrastructure/modules/config-files/templates/initialize_accumulo.sh.tftpl
+++ b/contrib/terraform-testing-infrastructure/modules/config-files/templates/initialize_accumulo.sh.tftpl
@@ -33,6 +33,15 @@ accumulo init --instance-name "$1" --password "$2"
 #
 # Launch jaegertracing and telegraf containers
 #
+%{ if os_type == "centos" ~}
+sudo yum install -y docker-ce docker-ce-cli containerd.io --enablerepo=docker
+%{ endif ~}
+%{ if os_type == "ubuntu" ~}
+sudo apt-get install -y docker-ce docker-ce-cli containerd.io
+%{ endif ~}
+sudo systemctl enable docker
+sudo systemctl start docker
+
 docker run -d --name jaeger \
     --restart always \
     -e COLLECTOR_ZIPKIN_HOST_PORT=:9411 \