Jelajahi Sumber

Merge pull request #1415 from joelddiaz/host-mon-registry

bind in /etc/origin/node for non-master monitoring to be able to talk…
Joel Diaz 9 tahun lalu
induk
melakukan
365cbaeac0

+ 3 - 1
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 }}