Updated to fix networking, volumes_from and scaling

This commit is contained in:
Bill Maxwell 2016-04-13 11:19:08 -07:00
parent a45179fa86
commit 05a3322c43
2 changed files with 15 additions and 6 deletions

View File

@ -1,8 +1,10 @@
elasticsearch-masters: elasticsearch-masters:
image: rancher/elasticsearch-conf:v0.4.0 image: rancher/elasticsearch-conf:v0.5.0
labels: labels:
io.rancher.container.hostname_override: container_name io.rancher.container.hostname_override: container_name
io.rancher.sidekicks: elasticsearch-base-master,elasticsearch-datavolume-masters io.rancher.sidekicks: elasticsearch-base-master,elasticsearch-datavolume-masters
volumes_from:
- elasticsearch-datavolume-masters
elasticsearch-datavolume-masters: elasticsearch-datavolume-masters:
labels: labels:
elasticsearch.datanode.config.version: '0' elasticsearch.datanode.config.version: '0'
@ -11,6 +13,7 @@ elasticsearch-datavolume-masters:
volumes: volumes:
- /usr/share/elasticsearch/data - /usr/share/elasticsearch/data
- /usr/share/elasticsearch/config - /usr/share/elasticsearch/config
- /opt/rancher/bin
entrypoint: /bin/true entrypoint: /bin/true
image: elasticsearch:2.2.1 image: elasticsearch:2.2.1
elasticsearch-base-master: elasticsearch-base-master:
@ -20,20 +23,21 @@ elasticsearch-base-master:
image: elasticsearch:2.2.1 image: elasticsearch:2.2.1
net: "container:elasticsearch-masters" net: "container:elasticsearch-masters"
volumes_from: volumes_from:
- elasticsearch-masters
- elasticsearch-datavolume-masters - elasticsearch-datavolume-masters
entrypoint: entrypoint:
- /opt/rancher/bin/run.sh - /opt/rancher/bin/run.sh
elasticsearch-datanodes: elasticsearch-datanodes:
image: rancher/elasticsearch-conf:v0.4.0 image: rancher/elasticsearch-conf:v0.5.0
labels: labels:
io.rancher.container.hostname_override: container_name io.rancher.container.hostname_override: container_name
io.rancher.sidekicks: elasticsearch-base-datanode,elasticsearch-datavolume-datanode io.rancher.sidekicks: elasticsearch-base-datanode,elasticsearch-datavolume-datanode
io.rancher.scheduler.affinity:container_label_ne: io.rancher.stack_service.name=$${stack_name}/$${service_name} io.rancher.scheduler.affinity:container_label_ne: io.rancher.stack_service.name=$${stack_name}/$${service_name}
links: links:
- elasticsearch-masters:es-masters - elasticsearch-masters:es-masters
volumes_from:
- elasticsearch-datavolume-datanode
elasticsearch-datavolume-datanode: elasticsearch-datavolume-datanode:
labels: labels:
elasticsearch.datanode.config.version: '0' elasticsearch.datanode.config.version: '0'
@ -42,6 +46,7 @@ elasticsearch-datavolume-datanode:
volumes: volumes:
- /usr/share/elasticsearch/data - /usr/share/elasticsearch/data
- /usr/share/elasticsearch/config - /usr/share/elasticsearch/config
- /opt/rancher/bin
entrypoint: /bin/true entrypoint: /bin/true
image: elasticsearch:2.2.1 image: elasticsearch:2.2.1
elasticsearch-base-datanode: elasticsearch-base-datanode:
@ -54,18 +59,19 @@ elasticsearch-base-datanode:
entrypoint: entrypoint:
- /opt/rancher/bin/run.sh - /opt/rancher/bin/run.sh
volumes_from: volumes_from:
- elasticsearch-datanodes
- elasticsearch-datavolume-datanode - elasticsearch-datavolume-datanode
net: "container:elasticsearch-datanodes" net: "container:elasticsearch-datanodes"
elasticsearch-clients: elasticsearch-clients:
image: rancher/elasticsearch-conf:v0.4.0 image: rancher/elasticsearch-conf:v0.5.0
labels: labels:
io.rancher.container.hostname_override: container_name io.rancher.container.hostname_override: container_name
io.rancher.sidekicks: elasticsearch-base-clients,elasticsearch-datavolume-clients io.rancher.sidekicks: elasticsearch-base-clients,elasticsearch-datavolume-clients
links: links:
- elasticsearch-masters:es-masters - elasticsearch-masters:es-masters
volumes_from:
- elasticsearch-datavolume-clients
elasticsearch-datavolume-clients: elasticsearch-datavolume-clients:
labels: labels:
elasticsearch.datanode.config.version: '0' elasticsearch.datanode.config.version: '0'
@ -74,6 +80,7 @@ elasticsearch-datavolume-clients:
volumes: volumes:
- /usr/share/elasticsearch/data - /usr/share/elasticsearch/data
- /usr/share/elasticsearch/config - /usr/share/elasticsearch/config
- /opt/rancher/bin
entrypoint: /bin/true entrypoint: /bin/true
image: elasticsearch:2.2.1 image: elasticsearch:2.2.1
elasticsearch-base-clients: elasticsearch-base-clients:
@ -82,7 +89,6 @@ elasticsearch-base-clients:
io.rancher.container.hostname_override: container_name io.rancher.container.hostname_override: container_name
image: elasticsearch:2.2.1 image: elasticsearch:2.2.1
volumes_from: volumes_from:
- elasticsearch-clients
- elasticsearch-datavolume-clients - elasticsearch-datavolume-clients
net: "container:elasticsearch-clients" net: "container:elasticsearch-clients"
entrypoint: entrypoint:

View File

@ -17,6 +17,7 @@ elasticsearch-masters:
node.name: "$${HOSTNAME}" node.name: "$${HOSTNAME}"
node.data: "false" node.data: "false"
node.master: "true" node.master: "true"
network.host: "_site_"
elasticsearch-datanodes: elasticsearch-datanodes:
metadata: metadata:
elasticsearch: elasticsearch:
@ -26,6 +27,7 @@ elasticsearch-datanodes:
node.data: "true" node.data: "true"
node.master: "false" node.master: "false"
http.enabled: "false" http.enabled: "false"
network.host: "_site_"
elasticsearch-clients: elasticsearch-clients:
metadata: metadata:
elasticsearch: elasticsearch:
@ -34,3 +36,4 @@ elasticsearch-clients:
node.name: "$${HOSTNAME}" node.name: "$${HOSTNAME}"
node.data: "false" node.data: "false"
node.master: "false" node.master: "false"
network.host: "_site_"