summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatt Woodson <mwoodson@gmail.com>2016-01-20 14:59:40 -0500
committerMatt Woodson <mwoodson@gmail.com>2016-01-20 14:59:40 -0500
commitf9f6d96c55050e3b1fe5d4cdad3f087f2c0305f3 (patch)
tree5cd08b553bdca0f24111d9cd9277acc2952f22e3
parent88ce89f8be5cb4ad43760a0921ea4635eac77a1c (diff)
parentd59f6d9a9890187090b51bc675496f98a09c2dac (diff)
downloadopenshift-f9f6d96c55050e3b1fe5d4cdad3f087f2c0305f3.tar.gz
openshift-f9f6d96c55050e3b1fe5d4cdad3f087f2c0305f3.tar.bz2
openshift-f9f6d96c55050e3b1fe5d4cdad3f087f2c0305f3.tar.xz
openshift-f9f6d96c55050e3b1fe5d4cdad3f087f2c0305f3.zip
Merge pull request #1246 from mwoodson/env_hostgroups
oso_host_monitoring: added environment as a var to the host monitoring systemd script
-rw-r--r--roles/oso_host_monitoring/templates/oso-rhel7-host-monitoring.service.j21
1 files changed, 1 insertions, 0 deletions
diff --git a/roles/oso_host_monitoring/templates/oso-rhel7-host-monitoring.service.j2 b/roles/oso_host_monitoring/templates/oso-rhel7-host-monitoring.service.j2
index 753cad69f..31f7d4caa 100644
--- a/roles/oso_host_monitoring/templates/oso-rhel7-host-monitoring.service.j2
+++ b/roles/oso_host_monitoring/templates/oso-rhel7-host-monitoring.service.j2
@@ -47,6 +47,7 @@ ExecStart=/usr/bin/docker run --name {{ osohm_host_monitoring }}
-e ZAGG_SSL_VERIFY={{ osohm_zagg_verify_ssl }} \
-e OSO_CLUSTER_GROUP={{ cluster_group }} \
-e OSO_CLUSTER_ID={{ oo_clusterid }} \
+ -e OSO_ENVIRONMENT={{ oo_environment }} \
-e OSO_HOST_TYPE={{ hostvars[inventory_hostname]['ec2_tag_host-type'] }} \
-e OSO_SUB_HOST_TYPE={{ hostvars[inventory_hostname]['ec2_tag_sub-host-type'] }} \
-v /etc/localtime:/etc/localtime \