Change deploy script

diff --git a/modules/role/files/cryptoportfolio/slack-notify.py b/modules/role/files/cryptoportfolio/slack-notify.py
index fe64fb68784fc22df1dc2eef9c8f9ebb12309973..dfced468f15d0c7de0725a81171663efce0e68d5 100644 (file)
--- a/modules/role/files/cryptoportfolio/slack-notify.py
+++ b/modules/role/files/cryptoportfolio/slack-notify.py
@@ -1,12 +1,18 @@
 #!/usr/bin/env python3
 
+import os
 import sys
 import json
 import urllib3
 
-project = sys.argv[1]
-url     = sys.argv[2]
-version = sys.argv[3]
+project = os.environ["P_PROJECT"]
+url     = os.environ["P_WEBHOOK"]
+version = os.environ["P_VERSION"]
+host    = os.environ["P_HOST"]
+if os.environ["P_HTTPS"] == "true":
+    scheme = "https://"
+else:
+    scheme = "http://"
 
 def post(url, data):
     urllib3.disable_warnings()
@@ -20,7 +26,12 @@ def post(url, data):
 
 data = {
         "icon_url": "https://learn.puppet.com/static/images/logos/Puppet-Logo-Mark-Amber.png",
-        "text": "Deployed {} on {}".format(version, project),
+        "text": "Deployed {} of {} on {}{}".format(
+            version,
+            project,
+            scheme,
+            host,
+            ),
         }
 
 json_data = json.dumps(data)

diff --git a/modules/role/manifests/cryptoportfolio.pp b/modules/role/manifests/cryptoportfolio.pp
index 67d88fb7b38c97e21e2c0780d1b3788e2a937c7a..bec247ee0ff6a19771f39506a63d59259a5ab7a6 100644 (file)
--- a/modules/role/manifests/cryptoportfolio.pp
+++ b/modules/role/manifests/cryptoportfolio.pp
@@ -272,7 +272,14 @@ class role::cryptoportfolio {
     unless empty($cf_webhook_url) {
       exec { "bot-slack-notify":
         refreshonly => true,
-        command     => "/usr/local/bin/slack-notify Trader '${cf_webhook_url}' '${bot_version}'",
+        environment => [
+          "P_PROJECT=Trader",
+          "P_WEBHOOK=${cf_webhook_url}",
+          "P_VERSION=${bot_version}",
+          "P_HOST=${cf_front_app_host}",
+          "P_HTTPS=${cf_front_app_ssl}",
+        ],
+        command     => "/usr/local/bin/slack-notify",
         require     => File["/usr/local/bin/slack-notify"],
         subscribe   => Exec["py-cryptoportfolio-dependencies"],
       }
@@ -407,7 +414,14 @@ class role::cryptoportfolio {
     unless empty($cf_webhook_url) {
       exec { "front-slack-notify":
         refreshonly => true,
-        command     => "/usr/local/bin/slack-notify Front '${cf_webhook_url}' '${front_version}'",
+        environment => [
+          "P_PROJECT=Front",
+          "P_WEBHOOK=${cf_webhook_url}",
+          "P_VERSION=${front_version}",
+          "P_HOST=${cf_front_app_host}",
+          "P_HTTPS=${cf_front_app_ssl}",
+        ],
+        command     => "/usr/local/bin/slack-notify",
         require     => File["/usr/local/bin/slack-notify"],
         subscribe   => [Exec["go-cryptoportfolio-app"], Exec["web-cryptoportfolio-build"]],
       }