diff options
author | Joel Diaz <jdiaz@redhat.com> | 2016-02-17 10:52:36 -0500 |
---|---|---|
committer | Joel Diaz <jdiaz@redhat.com> | 2016-02-17 10:52:36 -0500 |
commit | 365cbaeac0f02d7050822672201db65b00f52fdd (patch) | |
tree | b9c81ee9fe043d91cdc69a515de4f15fa7666716 | |
parent | 6c50caca03a6d17aa40923bee12da31c163a0189 (diff) | |
parent | 7218097c20796839e0ab57043edd1e999b660eb8 (diff) | |
download | openshift-365cbaeac0f02d7050822672201db65b00f52fdd.tar.gz openshift-365cbaeac0f02d7050822672201db65b00f52fdd.tar.bz2 openshift-365cbaeac0f02d7050822672201db65b00f52fdd.tar.xz openshift-365cbaeac0f02d7050822672201db65b00f52fdd.zip |
Merge pull request #1415 from joelddiaz/host-mon-registry
bind in /etc/origin/node for non-master monitoring to be able to talkā¦
-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 }} |