Merge pull request #108 from Jahia/PAAS-959-upgrade-to-haproxy-214

PAAS-959: fixig oversight with haproxy onAfterRedeploy actions
Jahia · Jun 8, 2020 · b72d182 · b72d182
2 parents 1c6956b + 82adcb3
commit b72d182
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 0 deletions.
diff --git a/install.yml b/install.yml
@@ -258,9 +258,21 @@ onAfterRedeployContainer[proc]:
 
 onAfterRedeployContainer[bl]:
   - if ('${event.params.nodeGroup.print()}' != ''):
+      - setSudoer: ${event.params.nodeGroup}
       - splitHaproxyConf: ${event.params.nodeGroup}
+      - setupDatadogAgentHaproxy: ${event.params.nodeGroup}
+      - environment.control.ApplyNodeGroupData [bl]:
+          data:
+            productName: haproxy
+            productVersion: ${nodes.bl.first.version}
   - elif ('${event.params.nodeId.print()}' != ''):
+      - setSudoer: ${event.params.nodeId}
       - splitHaproxyConf: ${event.params.nodeId}
+      - setupDatadogAgentHaproxy: ${event.params.nodeId}
+      - environment.control.ApplyNodeGroupData [bl]:
+          data:
+            productName: haproxy
+            productVersion: ${nodes.bl.first.version}
 
 onBeforeStop:
   - stopJahia: cp, proc

diff --git a/update.yml b/update.yml
@@ -125,9 +125,21 @@ onAfterRedeployContainer[proc]:
 
 onAfterRedeployContainer[bl]:
   - if ('${event.params.nodeGroup.print()}' != ''):
+      - setSudoer: ${event.params.nodeGroup}
       - splitHaproxyConf: ${event.params.nodeGroup}
+      - setupDatadogAgentHaproxy: ${event.params.nodeGroup}
+      - environment.control.ApplyNodeGroupData [bl]:
+          data:
+            productName: haproxy
+            productVersion: ${nodes.bl.first.version}
   - elif ('${event.params.nodeId.print()}' != ''):
+      - setSudoer: ${event.params.nodeId}
       - splitHaproxyConf: ${event.params.nodeId}
+      - setupDatadogAgentHaproxy: ${event.params.nodeId}
+      - environment.control.ApplyNodeGroupData [bl]:
+          data:
+            productName: haproxy
+            productVersion: ${nodes.bl.first.version}
 
 onBeforeStop:
   - stopJahia: cp, proc