[CORD-2720] Removing consul and registrator as they're not used
Change-Id: I7c41499a34748cecece592b8f1c580893fe4e08d
diff --git a/roles/cord-profile/templates/docker-compose.yml.j2 b/roles/cord-profile/templates/docker-compose.yml.j2
index a845551..825bc35 100644
--- a/roles/cord-profile/templates/docker-compose.yml.j2
+++ b/roles/cord-profile/templates/docker-compose.yml.j2
@@ -39,42 +39,6 @@
- {{ network }}
{% endfor %}
{% endif %}
- consul:
- image: {{ pull_docker_registry }}gliderlabs/consul-server:{{ pull_docker_tag }}
- command: "-advertise=${MYHOST} -server -bootstrap"
- ports:
- - "127.0.0.1:8500:8500"
- networks:
-{% for network in xos_docker_networks %}
- - {{ network }}
-{% endfor %}
- environment:
- SERVICE_8300_IGNORE: "yes"
- SERVICE_8301_IGNORE: "yes"
- SERVICE_8302_IGNORE: "yes"
- SERVICE_8400_IGNORE: "yes"
- SERVICE_8500_NAME: "consul-rest"
- SERVICE_8600_IGNORE: "yes"
- restart: unless-stopped
- registrator:
- image: {{ pull_docker_registry }}gliderlabs/registrator:{{ pull_docker_tag }}
- command: [
- "-ip=${DOCKER_HOST_IP}",
- "-internal",
- "-retry-attempts", "100",
- "consul://consul:8500"
- ]
- networks:
-{% for network in xos_docker_networks %}
- - {{ network }}
-{% endfor %}
- links:
- - consul
- volumes:
- - /var/run/docker.sock:/tmp/docker.sock
- depends_on:
- - consul
- restart: unless-stopped
xos_db:
image: {{ pull_docker_registry }}xosproject/xos-postgres:{{ pull_docker_tag }}
networks:
@@ -83,10 +47,6 @@
{% endfor %}
expose:
- "5432"
- depends_on:
- - registrator
- environment:
- SERVICE_5432_NAME: "xos-db"
restart: unless-stopped
{% if use_redis %}
@@ -101,10 +61,6 @@
options:
max-size: "1000k"
max-file: "5"
- depends_on:
- - registrator
- environment:
- SERVICE_NAME: "redis"
restart: unless-stopped
{% endif %}
@@ -132,11 +88,6 @@
options:
max-size: "1000k"
max-file: "5"
- depends_on:
- - registrator
- environment:
- SERVICE_4000_NAME: "xos-gui"
- SERVICE_80_IGNORE: "yes"
restart: unless-stopped
xos_tosca:
@@ -154,14 +105,11 @@
- {{ head_cord_profile_dir }}/im_cert_chain.pem:/usr/local/share/ca-certificates/local_certs.crt:ro
depends_on:
- xos_core
- - registrator
logging:
driver: "json-file"
options:
max-size: "1000k"
max-file: "5"
- environment:
- SERVICE_9102_NAME: "xos-tosca"
restart: unless-stopped
xos_chameleon:
@@ -182,10 +130,6 @@
options:
max-size: "1000k"
max-file: "5"
- depends_on:
- - registrator
- environment:
- SERVICE_9101_NAME: "xos-rest"
restart: unless-stopped
gui_extensions_store:
@@ -202,8 +146,6 @@
options:
max-size: "1000k"
max-file: "5"
- depends_on:
- - registrator
xos_ws:
image: {{ pull_docker_registry }}xosproject/xos-ws:{{ pull_docker_tag }}
@@ -231,10 +173,6 @@
options:
max-size: "1000k"
max-file: "5"
- depends_on:
- - registrator
- environment:
- SERVICE_3000_NAME: "xos-ws"
restart: unless-stopped
xos_core:
@@ -249,13 +187,11 @@
- "50055:50055"
links:
- xos_db:xos-db
- - consul:consul
{% if use_redis %}
- xos_redis:redis
{% endif %}
depends_on:
- xos_db
- - registrator
{% if use_redis %}
- xos_redis
{% endif %}
@@ -270,9 +206,6 @@
options:
max-size: "1000k"
max-file: "5"
- environment:
- SERVICE_50051_NAME: "xos-grpc-secure"
- SERVICE_50055_NAME: "xos-grpc-insecure"
restart: unless-stopped
{% for ext in enabled_gui_extensions %}
@@ -290,8 +223,6 @@
options:
max-size: "1000k"
max-file: "5"
- depends_on:
- - registrator
{% endfor %}
{% for svc in xos_services %}
@@ -302,13 +233,11 @@
{% for network in xos_docker_networks %}
- {{ network }}
{% endfor %}
- depends_on:
- - registrator
{% if use_redis %}
+ depends_on:
- xos_redis
{% endif %}
links:
- - consul:consul
- xos_core:xos-core
{% if use_redis %}
- xos_redis:redis
@@ -329,8 +258,6 @@
options:
max-size: "1000k"
max-file: "5"
- environment:
- SERVICE_NAME: "xos-{{ svc.name }}-synchronizer"
restart: on-failure
{% endif %}
diff --git a/roles/dev-env/tasks/main.yml b/roles/dev-env/tasks/main.yml
index 5174b92..87882fb 100644
--- a/roles/dev-env/tasks/main.yml
+++ b/roles/dev-env/tasks/main.yml
@@ -73,4 +73,3 @@
- "127.0.0.1 xos-chameleon"
- "127.0.0.1 xos-core"
- "127.0.0.1 xos-tosca"
- - "127.0.0.1 consul"
diff --git a/roles/dns-configure/defaults/main.yml b/roles/dns-configure/defaults/main.yml
index b58fdbd..47b3e72 100644
--- a/roles/dns-configure/defaults/main.yml
+++ b/roles/dns-configure/defaults/main.yml
@@ -56,7 +56,6 @@
aliases:
- { name: "apt-cache", dest: "{{ headnode_dns }}" }
- { name: "cordloghost", dest: "{{ headnode_dns }}" }
- - { name: "consul", dest: "{{ headnode_dns }}" }
- { name: "docker", dest: "{{ headnode_dns }}" }
- { name: "mavenrepo", dest: "{{ headnode_dns }}" }
- { name: "ns", dest: "{{ headnode_dns }}" }
@@ -65,7 +64,6 @@
- { name: "onos-fabric", dest: "{{ headnode_dns }}" }
- { name: "xos", dest: "{{ headnode_dns }}" }
- { name: "xos-chameleon", dest: "{{ headnode_dns }}" }
- - { name: "xos-consul", dest: "{{ headnode_dns }}" }
- { name: "xos-core", dest: "{{ headnode_dns }}" }
- { name: "xos-gui", dest: "{{ headnode_dns }}" }
- { name: "xos-tosca", dest: "{{ headnode_dns }}" }
diff --git a/roles/dns-nsd/defaults/main.yml b/roles/dns-nsd/defaults/main.yml
index fc5319b..c75c84d 100644
--- a/roles/dns-nsd/defaults/main.yml
+++ b/roles/dns-nsd/defaults/main.yml
@@ -52,7 +52,6 @@
aliases:
- { name: "apt-cache", dest: "{{ headnode_dns }}" }
- { name: "cordloghost", dest: "{{ headnode_dns }}" }
- - { name: "consul", dest: "{{ headnode_dns }}" }
- { name: "docker", dest: "{{ headnode_dns }}" }
- { name: "docker-registry", dest: "{{ headnode_dns }}" }
- { name: "mavenrepo", dest: "{{ headnode_dns }}" }
@@ -62,7 +61,6 @@
- { name: "onos-fabric", dest: "{{ headnode_dns }}" }
- { name: "xos", dest: "{{ headnode_dns }}" }
- { name: "xos-chameleon", dest: "{{ headnode_dns }}" }
- - { name: "xos-consul", dest: "{{ headnode_dns }}" }
- { name: "xos-core", dest: "{{ headnode_dns }}" }
- { name: "xos-gui", dest: "{{ headnode_dns }}" }
- { name: "xos-tosca", dest: "{{ headnode_dns }}" }
diff --git a/roles/dns-unbound/defaults/main.yml b/roles/dns-unbound/defaults/main.yml
index 99f5ae8..d2d171f 100644
--- a/roles/dns-unbound/defaults/main.yml
+++ b/roles/dns-unbound/defaults/main.yml
@@ -52,7 +52,6 @@
aliases:
- { name: "apt-cache", dest: "{{ headnode_dns }}" }
- { name: "cordloghost", dest: "{{ headnode_dns }}" }
- - { name: "consul", dest: "{{ headnode_dns }}" }
- { name: "docker", dest: "{{ headnode_dns }}" }
- { name: "mavenrepo", dest: "{{ headnode_dns }}" }
- { name: "ns", dest: "{{ headnode_dns }}" }
@@ -61,7 +60,6 @@
- { name: "onos-fabric", dest: "{{ headnode_dns }}" }
- { name: "xos", dest: "{{ headnode_dns }}" }
- { name: "xos-chameleon", dest: "{{ headnode_dns }}" }
- - { name: "xos-consul", dest: "{{ headnode_dns }}" }
- { name: "xos-core", dest: "{{ headnode_dns }}" }
- { name: "xos-gui", dest: "{{ headnode_dns }}" }
- { name: "xos-tosca", dest: "{{ headnode_dns }}" }