summaryrefslogtreecommitdiffstats
path: root/roles
diff options
context:
space:
mode:
authorThomas Wiest <twiest@users.noreply.github.com>2016-02-23 10:08:59 -0500
committerThomas Wiest <twiest@users.noreply.github.com>2016-02-23 10:08:59 -0500
commitdbf8570d9fd6d3a0c065c1e5fb7d38f3b4e8d605 (patch)
tree48b4a45a185a06ba5f600c01aa799a5352a1c6b8 /roles
parentdc8938e01202db0464e54becf4812c3191ce2d51 (diff)
parent0f7d54211ad73c6e4fe849978766c70bda8dc8e7 (diff)
downloadopenshift-dbf8570d9fd6d3a0c065c1e5fb7d38f3b4e8d605.tar.gz
openshift-dbf8570d9fd6d3a0c065c1e5fb7d38f3b4e8d605.tar.bz2
openshift-dbf8570d9fd6d3a0c065c1e5fb7d38f3b4e8d605.tar.xz
openshift-dbf8570d9fd6d3a0c065c1e5fb7d38f3b4e8d605.zip
Merge pull request #1471 from twiest/pr
changed oso_host_monitoring to use the oo_ vars
Diffstat (limited to 'roles')
-rw-r--r--roles/oso_host_monitoring/templates/oso-rhel7-host-monitoring.service.j26
1 files changed, 3 insertions, 3 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 d85d8b94e..e17092202 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
@@ -43,13 +43,13 @@ ExecStart=/usr/bin/docker run --name {{ osohm_host_monitoring }}
-e ZAGG_URL={{ osohm_zagg_web_url }} \
-e ZAGG_USER={{ osohm_default_zagg_server_user }} \
-e ZAGG_PASSWORD={{ osohm_default_zagg_server_password }} \
- -e ZAGG_CLIENT_HOSTNAME={{ ec2_tag_Name }} \
+ -e ZAGG_CLIENT_HOSTNAME={{ oo_name }} \
-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'] }} \
+ -e OSO_HOST_TYPE={{ hostvars[inventory_hostname]['oo_hosttype'] }} \
+ -e OSO_SUB_HOST_TYPE={{ hostvars[inventory_hostname]['oo_subhosttype'] }} \
-e OSO_MASTER_HA={{ osohm_master_ha }} \
-v /etc/localtime:/etc/localtime \
-v /sys:/sys:ro \