summaryrefslogtreecommitdiffstats
path: root/roles/oso_host_monitoring
diff options
context:
space:
mode:
authorJoel Diaz <jdiaz@redhat.com>2015-12-16 15:59:26 -0500
committerJoel Diaz <jdiaz@redhat.com>2015-12-16 15:59:26 -0500
commitc607f1ba93be5e9f16723074ff97ffd27b025f8c (patch)
tree57d78b69cd526a57ad0258ba468868561626f384 /roles/oso_host_monitoring
parent4dfe16e0e567a633cedd8ee56ffaed5110ca1629 (diff)
parentf826925c8217d5c9f150ef03ca8deb718c37c157 (diff)
downloadopenshift-c607f1ba93be5e9f16723074ff97ffd27b025f8c.tar.gz
openshift-c607f1ba93be5e9f16723074ff97ffd27b025f8c.tar.bz2
openshift-c607f1ba93be5e9f16723074ff97ffd27b025f8c.tar.xz
openshift-c607f1ba93be5e9f16723074ff97ffd27b025f8c.zip
Merge pull request #1078 from joelddiaz/master
sync master -> prod
Diffstat (limited to 'roles/oso_host_monitoring')
-rw-r--r--roles/oso_host_monitoring/templates/oso-rhel7-zagg-client.service.j22
1 files changed, 1 insertions, 1 deletions
diff --git a/roles/oso_host_monitoring/templates/oso-rhel7-zagg-client.service.j2 b/roles/oso_host_monitoring/templates/oso-rhel7-zagg-client.service.j2
index 978e40b88..bcc8a5e03 100644
--- a/roles/oso_host_monitoring/templates/oso-rhel7-zagg-client.service.j2
+++ b/roles/oso_host_monitoring/templates/oso-rhel7-zagg-client.service.j2
@@ -42,7 +42,7 @@ ExecStart=/usr/bin/docker run --name {{ osohm_zagg_client }}
-v /etc/localtime:/etc/localtime \
-v /run/pcp:/run/pcp \
-v /var/run/docker.sock:/var/run/docker.sock \
- -v /var/run/openvswitch/db.sock:/var/run/openvswitch/db.sock \
+ -v /var/run/openvswitch:/var/run/openvswitch \
{% if hostvars[inventory_hostname]['ec2_tag_host-type'] == 'master' %}
-v /etc/openshift/master/admin.kubeconfig:/etc/openshift/master/admin.kubeconfig \
-v /etc/openshift/master/master.etcd-client.crt:/etc/openshift/master/master.etcd-client.crt \