| commit | 75e1712fe34a870f558b2e309d74a3117de29261 | [log] [tgz] |
|---|---|---|
| author | Andy Bavier <andy@onlab.us> | Wed Jul 26 09:07:19 2017 -0700 |
| committer | Andy Bavier <andy@onlab.us> | Wed Jul 26 12:00:26 2017 -0700 |
| tree | 5a239174abcc6065e8e2068e84095b098eab87b6 | |
| parent | 9cea13ed345743832417e0c03cfa08abec333bff [diff] |
Add pull_docker_registry Change-Id: Ic255aa0b800012c52c478dcd5228a598b4ff3b9b
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"