Add pull_docker_registry
Change-Id: Ic255aa0b800012c52c478dcd5228a598b4ff3b9b
diff --git a/roles/cord-profile/defaults/main.yml b/roles/cord-profile/defaults/main.yml
index 03be231..3a56694 100644
--- a/roles/cord-profile/defaults/main.yml
+++ b/roles/cord-profile/defaults/main.yml
@@ -31,8 +31,8 @@
use_vtn: True
# Docker related settings
-deploy_docker_registry: ""
-deploy_docker_tag: "candidate"
+pull_docker_registry: ""
+pull_docker_tag: "candidate"
xos_docker_networks:
- "xos"
diff --git a/roles/cord-profile/templates/Dockerfile.xos.j2 b/roles/cord-profile/templates/Dockerfile.xos.j2
index a8bfc2a..4b077e9 100644
--- a/roles/cord-profile/templates/Dockerfile.xos.j2
+++ b/roles/cord-profile/templates/Dockerfile.xos.j2
@@ -1,4 +1,4 @@
-FROM {{ deploy_docker_registry }}xosproject/xos:{{ deploy_docker_tag }}
+FROM {{ pull_docker_registry }}xosproject/xos:{{ pull_docker_tag }}
ARG XOS_GIT_COMMIT_HASH=unknown
ARG XOS_GIT_COMMIT_DATE=unknown
diff --git a/roles/cord-profile/templates/docker-compose.yml.j2 b/roles/cord-profile/templates/docker-compose.yml.j2
index 84994e1..57cc3fe 100644
--- a/roles/cord-profile/templates/docker-compose.yml.j2
+++ b/roles/cord-profile/templates/docker-compose.yml.j2
@@ -11,7 +11,7 @@
services:
consul:
- image: {{ deploy_docker_registry }}gliderlabs/consul-server:{{ deploy_docker_tag }}
+ image: {{ pull_docker_registry }}gliderlabs/consul-server:{{ pull_docker_tag }}
command: "-advertise=${MYHOST} -server -bootstrap"
ports:
- "127.0.0.1:8500:8500"
@@ -28,7 +28,7 @@
SERVICE_8600_IGNORE: "yes"
restart: unless-stopped
registrator:
- image: {{ deploy_docker_registry }}gliderlabs/registrator:{{ deploy_docker_tag }}
+ image: {{ pull_docker_registry }}gliderlabs/registrator:{{ pull_docker_tag }}
command: [
"-ip=${DOCKER_HOST_IP}",
"-internal",
@@ -47,7 +47,7 @@
- consul
restart: unless-stopped
xos_db:
- image: {{ deploy_docker_registry }}xosproject/xos-postgres:{{ deploy_docker_tag }}
+ image: {{ pull_docker_registry }}xosproject/xos-postgres:{{ pull_docker_tag }}
networks:
{% for network in xos_docker_networks %}
- {{ network }}
@@ -62,7 +62,7 @@
{% if use_redis %}
xos_redis:
- image: {{ deploy_docker_registry }}redis:{{ deploy_docker_tag }}
+ image: {{ pull_docker_registry }}redis:{{ pull_docker_tag }}
networks:
{% for network in xos_docker_networks %}
- {{ network }}
@@ -80,7 +80,7 @@
{% endif %}
xos_gui:
- image: {{ deploy_docker_registry }}xosproject/xos-gui:{{ deploy_docker_tag }}
+ image: {{ pull_docker_registry }}xosproject/xos-gui:{{ pull_docker_tag }}
networks:
{% for network in xos_docker_networks %}
- {{ network }}
@@ -111,7 +111,7 @@
restart: unless-stopped
xos_tosca:
- image: {{ deploy_docker_registry }}xosproject/xos-tosca:{{ deploy_docker_tag }}
+ image: {{ pull_docker_registry }}xosproject/xos-tosca:{{ pull_docker_tag }}
networks:
{% for network in xos_docker_networks %}
- {{ network }}
@@ -135,7 +135,7 @@
restart: unless-stopped
xos_chameleon:
- image: {{ deploy_docker_registry }}xosproject/chameleon:{{ deploy_docker_tag }}
+ image: {{ pull_docker_registry }}xosproject/chameleon:{{ pull_docker_tag }}
networks:
{% for network in xos_docker_networks %}
- {{ network }}
@@ -159,7 +159,7 @@
restart: unless-stopped
gui_extensions_store:
- image: {{ deploy_docker_registry }}node:7.9.0
+ image: {{ pull_docker_registry }}node:7.9.0
networks:
{% for network in xos_docker_networks %}
- {{ network }}
@@ -176,7 +176,7 @@
- registrator
xos_ws:
- image: {{ deploy_docker_registry }}xosproject/xos-ws:{{ deploy_docker_tag }}
+ image: {{ pull_docker_registry }}xosproject/xos-ws:{{ pull_docker_tag }}
networks:
{% for network in xos_docker_networks %}
- {{ network }}
@@ -208,7 +208,7 @@
restart: unless-stopped
xos_ui:
- image: {{ deploy_docker_registry }}xosproject/xos-ui:{{ deploy_docker_tag }}
+ image: {{ pull_docker_registry }}xosproject/xos-ui:{{ pull_docker_tag }}
networks:
{% for network in xos_docker_networks %}
- {{ network }}
@@ -244,7 +244,7 @@
restart: unless-stopped
xos_core:
- image: {{ deploy_docker_registry }}xosproject/xos-ui:{{ deploy_docker_tag }}
+ image: {{ pull_docker_registry }}xosproject/xos-ui:{{ pull_docker_tag }}
networks:
{% for network in xos_docker_networks %}
- {{ network }}
@@ -283,7 +283,7 @@
{% for ext in enabled_gui_extensions %}
gui-extension-{{ ext.name }}:
- image: {{ deploy_docker_registry }}xosproject/gui-extension-{{ ext.name }}:{{ deploy_docker_tag }}
+ image: {{ pull_docker_registry }}xosproject/gui-extension-{{ ext.name }}:{{ pull_docker_tag }}
networks:
{% for network in xos_docker_networks %}
- {{ network }}
@@ -304,7 +304,7 @@
{% for svc in xos_services %}
{% if svc.synchronizer is not defined or svc.synchronizer %}
{{ svc.name }}-synchronizer:
- image: {{ deploy_docker_registry }}xosproject/{{ svc.name }}-synchronizer:{{ deploy_docker_tag }}
+ image: {{ pull_docker_registry }}xosproject/{{ svc.name }}-synchronizer:{{ pull_docker_tag }}
networks:
{% for network in xos_docker_networks %}
- {{ network }}
diff --git a/roles/mavenrepo-install/defaults/main.yml b/roles/mavenrepo-install/defaults/main.yml
index 8fc31ac..c25d84d 100644
--- a/roles/mavenrepo-install/defaults/main.yml
+++ b/roles/mavenrepo-install/defaults/main.yml
@@ -4,6 +4,6 @@
head_mavenrepo_dir: /opt/mavenrepo
# Docker related settings
-deploy_docker_registry: ""
-deploy_docker_tag: "candidate"
+pull_docker_registry: ""
+pull_docker_tag: "candidate"
diff --git a/roles/mavenrepo-install/templates/docker-compose.yml.j2 b/roles/mavenrepo-install/templates/docker-compose.yml.j2
index 1212431..e560e38 100644
--- a/roles/mavenrepo-install/templates/docker-compose.yml.j2
+++ b/roles/mavenrepo-install/templates/docker-compose.yml.j2
@@ -4,7 +4,7 @@
services:
mavenrepo:
- image: {{ deploy_docker_registry }}opencord/mavenrepo:{{ deploy_docker_tag }}
+ image: {{ pull_docker_registry }}opencord/mavenrepo:{{ pull_docker_tag }}
container_name: mavenrepo
ports:
- "8080:80"
diff --git a/roles/onos-cord-install/defaults/main.yml b/roles/onos-cord-install/defaults/main.yml
index b6f25f0..f2c7dd1 100644
--- a/roles/onos-cord-install/defaults/main.yml
+++ b/roles/onos-cord-install/defaults/main.yml
@@ -7,9 +7,9 @@
head_onos_cord_dir: "/opt/onos_cord"
# ONOS docker image to use
-deploy_docker_registry: ""
-deploy_docker_tag: "candidate"
-onos_docker_image: "{{ deploy_docker_registry }}onosproject/onos:{{ deploy_docker_tag }}"
+pull_docker_registry: ""
+pull_docker_tag: "candidate"
+onos_docker_image: "{{ pull_docker_registry }}onosproject/onos:{{ pull_docker_tag }}"
# log level for ONOS
onos_log_level: "INFO"
diff --git a/roles/onos-cord-install/tasks/main.yml b/roles/onos-cord-install/tasks/main.yml
index 000a73a..27ef7a0 100644
--- a/roles/onos-cord-install/tasks/main.yml
+++ b/roles/onos-cord-install/tasks/main.yml
@@ -45,7 +45,7 @@
- name: Build xos/onos docker image
docker_image:
- name: "xos/onos:{{ deploy_docker_tag }}"
+ name: "xos/onos:{{ pull_docker_tag }}"
path: "{{ head_onos_cord_dir }}"
pull: False
force: True
diff --git a/roles/onos-cord-install/templates/docker-compose.yml.j2 b/roles/onos-cord-install/templates/docker-compose.yml.j2
index 704f83f..40f4665 100644
--- a/roles/onos-cord-install/templates/docker-compose.yml.j2
+++ b/roles/onos-cord-install/templates/docker-compose.yml.j2
@@ -4,7 +4,7 @@
services:
xos-onos:
- image: xos/onos:{{ deploy_docker_tag }}
+ image: xos/onos:{{ pull_docker_tag }}
ports:
- "6654:6653"
- "8102:8101"
diff --git a/roles/onos-fabric-install/defaults/main.yml b/roles/onos-fabric-install/defaults/main.yml
index 367727e..7576ddb 100644
--- a/roles/onos-fabric-install/defaults/main.yml
+++ b/roles/onos-fabric-install/defaults/main.yml
@@ -5,7 +5,7 @@
head_onos_fabric_dir: "/opt/onos_fabric/"
# ONOS docker image to use
-deploy_docker_registry: ""
-deploy_docker_tag: "candidate"
-onos_docker_image: "{{ deploy_docker_registry }}onosproject/onos:{{ deploy_docker_tag }}"
+pull_docker_registry: ""
+pull_docker_tag: "candidate"
+onos_docker_image: "{{ pull_docker_registry }}onosproject/onos:{{ pull_docker_tag }}"
diff --git a/roles/xos-core-build/defaults/main.yml b/roles/xos-core-build/defaults/main.yml
index 1114d07..8d9102a 100644
--- a/roles/xos-core-build/defaults/main.yml
+++ b/roles/xos-core-build/defaults/main.yml
@@ -4,9 +4,6 @@
build_cord_dir: "{{ playbook_dir ~ '/../..' }}"
build_docker_tag: "candidate"
-deploy_docker_registry: ""
-deploy_docker_tag: "candidate"
-
xos_libraries:
- "ng-xos-lib"