Merge pull request #419 from asteris-llc/feature/examples-0.3.0

Tested successfully.

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
+}

examples/elk/converge/docker.hcl

@@ -42,29 +42,18 @@ EOF
   depends = ["file.directory.service-directory"]
 }
 
-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"]
+  check = "groups {{param `user-name`}} | grep -i {{param `docker-group`}}"
+  apply = "usermod -aG {{param `docker-group`}} {{param `user-name`}}"
+
+  depends = ["package.rpm.docker-install"]
 }
 
 task "docker-enable" {
@@ -78,3 +67,16 @@ task "docker-start" {
   apply   = "systemctl daemon-reload; 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
+}

examples/elk/converge/elk.hcl

@@ -8,49 +8,14 @@ module "docker.hcl" "docker" {
   params = {
     user-name = "{{param `user-name`}}"
   }
-
-  depends = ["module.packages"]
 }
 
+module "filebeat.hcl" "filebeat" {}
+
 param "elasticsearch-data-directory" {
   default = "/data/elasticsearch"
 }
 
-param "filebeat-service" {
-  default = "filebeat"
-}
-
-task "filebeat-install" {
-  check   = "yum list installed filebeat"
-  apply   = "rpm -ivh https://download.elastic.co/beats/filebeat/filebeat-1.3.0-x86_64.rpm"
-  depends = ["module.docker"]
-}
-
-file.content "filebeat-yml" {
-  destination = "/etc/filebeat/filebeat.yml"
-
-  content = <<EOF
-filebeat:
-  prospectors:
-    - paths:
-        - /var/log/*.log
-        - /var/log/messages
-      input_type: log
-  registry_file: /var/lib/filebeat/registry
-output:
-  elasticsearch:
-    hosts: ["localhost:9200"]
-EOF
-
-  depends = ["task.filebeat-install"]
-}
-
-task "filebeat-enable" {
-  check   = "systemctl is-enabled {{param `filebeat-service`}}"
-  apply   = "systemctl enable {{param `filebeat-service`}}"
-  depends = ["file.content.filebeat-yml"]
-}
-
 wait.query "elasticsearch-wait" {
   check = <<EOF
 status=$(curl -s 'http://localhost:9200/_cluster/health' 2>/dev/null | jq -r .status)
@@ -66,13 +31,7 @@ EOF
 task "filebeat-elasticsearch-template" {
   check   = "[[  \"$(curl 'http://localhost:9200/_template/filebeat' 2>/dev/null)\" != \"{}\" ]] || exit 1"
   apply   = "curl -XPUT 'http://localhost:9200/_template/filebeat' -d@/etc/filebeat/filebeat.template.json 2>/dev/null"
-  depends = ["task.filebeat-enable", "docker.container.elasticsearch-container", "wait.query.elasticsearch-wait"]
-}
-
-task "filebeat-start" {
-  check   = "systemctl is-active {{param `filebeat-service`}}"
-  apply   = "systemctl start {{param `filebeat-service`}}"
-  depends = ["task.filebeat-enable", "docker.container.elasticsearch-container"]
+  depends = ["module.filebeat", "docker.container.elasticsearch-container", "wait.query.elasticsearch-wait"]
 }
 
 file.directory "elasticsearch-data-directory" {

examples/elk/converge/filebeat.hcl

@@ -0,0 +1,60 @@
+param "filebeat-service" {
+  default = "filebeat"
+}
+
+task.query "beats-repo-key" {
+  query = "rpm --import https://packages.elastic.co/GPG-KEY-elasticsearch"
+}
+
+file.content "beats-repo" {
+  destination = "/etc/yum.repos.d/beats.repo"
+
+  content = <<EOF
+[beats]
+name=Elastic Beats Repository
+baseurl=https://packages.elastic.co/beats/yum/el/$basearch
+enabled=1
+gpgkey=https://packages.elastic.co/GPG-KEY-elasticsearch
+gpgcheck=1
+EOF
+
+  depends = ["task.query.beats-repo-key"]
+}
+
+package.rpm "filebeat-install" {
+  name  = "filebeat"
+  state = "present"
+
+  depends = ["file.content.beats-repo"]
+}
+
+file.content "filebeat-yml" {
+  destination = "/etc/filebeat/filebeat.yml"
+
+  content = <<EOF
+filebeat:
+  prospectors:
+    - paths:
+        - /var/log/*.log
+        - /var/log/messages
+      input_type: log
+  registry_file: /var/lib/filebeat/registry
+output:
+  elasticsearch:
+    hosts: ["localhost:9200"]
+EOF
+
+  depends = ["package.rpm.filebeat-install"]
+}
+
+task "filebeat-enable" {
+  check   = "systemctl is-enabled {{param `filebeat-service`}}"
+  apply   = "systemctl enable {{param `filebeat-service`}}"
+  depends = ["file.content.filebeat-yml"]
+}
+
+task "filebeat-start" {
+  check   = "systemctl is-active {{param `filebeat-service`}}"
+  apply   = "systemctl start {{param `filebeat-service`}}"
+  depends = ["task.filebeat-enable"]
+}

examples/elk/converge/packages.hcl

@@ -1,10 +1,11 @@
-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 "jq-install" {
-  check   = "yum list installed jq"
-  apply   = "yum makecache; yum install -y jq"
-  depends = ["task.epel-install"]
+package.rpm "jq-install" {
+  name  = "jq"
+  state = "present"
+
+  depends = ["package.rpm.epel-install"]
 }