examples: docker-swarm-mode uses 0.3.0 features

examples/docker-swarm-mode/converge/awscli.hcl

@@ -1,16 +1,18 @@
-task "epel-install" {
-  check = "test -f /etc/yum.repos.d/epel.repo"
-  apply = "yum makecache; yum install -y epel-release"
+package.rpm "epel-install" {
+  name  = "epel-release"
+  state = "present"
 }
 
-task "pip-install" {
-  check   = "yum list installed python-pip"
-  apply   = "yum makecache; yum install -y python-pip"
-  depends = ["task.epel-install"]
+package.rpm "pip-install" {
+  name  = "python-pip"
+  state = "present"
+
+  depends = ["package.rpm.epel-install"]
 }
 
 task "awscli-install" {
-  check   = "which aws"
-  apply   = "pip install awscli"
-  depends = ["task.pip-install"]
+  check = "which aws"
+  apply = "pip install awscli"
+
+  depends = ["package.rpm.pip-install"]
 }

examples/docker-swarm-mode/converge/docker.hcl

@@ -12,29 +12,17 @@ param "docker-group" {
 
 param "user-name" {}
 
-file.content "docker-repo" {
-  destination = "/etc/yum.repos.d/docker.repo"
+package.rpm "docker-install" {
+  name  = "{{param `docker-package`}}"
+  state = "present"
 
-  content = <<EOF
-[dockerrepo]
-name=Docker Repository
-baseurl=https://yum.dockerproject.org/repo/main/centos/7/
-enabled=1
-gpgcheck=1
-gpgkey=https://yum.dockerproject.org/gpg
-EOF
-}
-
-task "docker-install" {
-  check   = "yum list installed {{param `docker-package`}}"
-  apply   = "yum makecache; yum install -y {{param `docker-package`}}"
   depends = ["file.content.docker-repo"]
 }
 
 task "docker-user-group" {
   check   = "groups {{param `user-name`}} | grep -i {{param `docker-group`}}"
   apply   = "usermod -aG {{param `docker-group`}} {{param `user-name`}}"
-  depends = ["task.docker-install"]
+  depends = ["package.rpm.docker-install"]
 }
 
 task "docker-enable" {
@@ -48,3 +36,16 @@ task "docker-start" {
   apply   = "systemctl start {{param `docker-service`}}"
   depends = ["task.docker-enable"]
 }
+
+file.content "docker-repo" {
+  destination = "/etc/yum.repos.d/docker.repo"
+
+  content = <<EOF
+[dockerrepo]
+name=Docker Repository
+baseurl=https://yum.dockerproject.org/repo/main/centos/7/
+enabled=1
+gpgcheck=1
+gpgkey=https://yum.dockerproject.org/gpg
+EOF
+}