diff options
| author | Joel Diaz <jdiaz@redhat.com> | 2016-02-16 12:30:21 -0500 |
|---|---|---|
| committer | Joel Diaz <jdiaz@redhat.com> | 2016-02-16 15:19:33 -0500 |
| commit | 7218097c20796839e0ab57043edd1e999b660eb8 (patch) | |
| tree | fc2d9c5423bc6fb42e4e0dea57722dc67b99e8d7 /roles | |
| parent | ea215cdd994717a4c07e4610e4c8b836a5b98b35 (diff) | |
| download | openshift-7218097c20796839e0ab57043edd1e999b660eb8.tar.gz openshift-7218097c20796839e0ab57043edd1e999b660eb8.tar.bz2 openshift-7218097c20796839e0ab57043edd1e999b660eb8.tar.xz openshift-7218097c20796839e0ab57043edd1e999b660eb8.zip | |
bind in /etc/origin/node for non-master monitoring to be able to talk with master
Diffstat (limited to 'roles')
| -rw-r--r-- | roles/oso_host_monitoring/templates/oso-rhel7-host-monitoring.service.j2 | 4 |
1 files changed, 3 insertions, 1 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 453a9a3b4..d85d8b94e 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 @@ -57,11 +57,13 @@ ExecStart=/usr/bin/docker run --name {{ osohm_host_monitoring }} -v /var/lib/docker:/var/lib/docker:ro \ -v /var/run/docker.sock:/var/run/docker.sock \ -v /var/run/openvswitch:/var/run/openvswitch \ -{% if hostvars[inventory_hostname]['ec2_tag_host-type'] == 'master' %} +{% if hostvars[inventory_hostname]['oo_hosttype'] == 'master' %} -v /etc/origin/master/admin.kubeconfig:/etc/origin/master/admin.kubeconfig \ -v /etc/origin/master/master.etcd-client.crt:/etc/origin/master/master.etcd-client.crt \ -v /etc/origin/master/master.etcd-client.key:/etc/origin/master/master.etcd-client.key \ -v /etc/origin/master/master-config.yaml:/etc/origin/master/master-config.yaml \ +{% elif hostvars[inventory_hostname]['oo_hosttype'] == 'node' %} + -v /etc/origin/node:/etc/origin/node \ {% endif %} {{ osohm_docker_registry_url }}{{ osohm_host_monitoring }} |