CORD-1111 use prebuilt xosproject/xos image
Change-Id: Id689415b8919765284b12af6c4cfc977801876f4
diff --git a/profile_manifests/ecord-global.yml b/profile_manifests/ecord-global.yml
index 9511aac..c3fa2f3 100644
--- a/profile_manifests/ecord-global.yml
+++ b/profile_manifests/ecord-global.yml
@@ -130,6 +130,9 @@
# Pull ONOS from local Docker registry rather than Docker Hub
onos_docker_image: "docker-registry:5000/opencord/onos:candidate"
+# Pull XOS from local Docker registry
+xos_docker_image: "docker-registry:5000/xosproject/xos:candidate"
+
keystone_admin_password: "{{ lookup('password', 'credentials/cord_keystone_admin chars=ascii_letters,digits') }}"
deployment_flavors:
diff --git a/profile_manifests/ecord.yml b/profile_manifests/ecord.yml
index f968997..d11f447 100644
--- a/profile_manifests/ecord.yml
+++ b/profile_manifests/ecord.yml
@@ -142,6 +142,9 @@
# Pull ONOS from local Docker registry rather than Docker Hub
onos_docker_image: "docker-registry:5000/opencord/onos:candidate"
+# Pull XOS from local Docker registry
+xos_docker_image: "docker-registry:5000/xosproject/xos:candidate"
+
keystone_admin_password: "{{ lookup('password', 'credentials/cord_keystone_admin chars=ascii_letters,digits') }}"
deployment_flavors:
diff --git a/profile_manifests/frontend.yml b/profile_manifests/frontend.yml
index af0daf6..19d4d46 100644
--- a/profile_manifests/frontend.yml
+++ b/profile_manifests/frontend.yml
@@ -32,3 +32,6 @@
enabled_gui_extensions:
- name: sample
path: orchestration/xos-sample-gui-extension
+
+# Frontend's XOS does not use docker registry
+xos_docker_image: "xosproject/xos:candidate"
diff --git a/profile_manifests/rcord.yml b/profile_manifests/rcord.yml
index e46ca1f..ccff817 100644
--- a/profile_manifests/rcord.yml
+++ b/profile_manifests/rcord.yml
@@ -165,6 +165,9 @@
# Pull ONOS from local Docker registry rather than Docker Hub
onos_docker_image: "docker-registry:5000/opencord/onos:candidate"
+# Pull XOS from local Docker registry
+xos_docker_image: "docker-registry:5000/xosproject/xos:candidate"
+
keystone_admin_password: "{{ lookup('password', 'credentials/cord_keystone_admin chars=ascii_letters,digits') }}"
deployment_flavors:
diff --git a/roles/cord-profile/templates/xos.yaml.j2 b/roles/cord-profile/templates/xos.yaml.j2
index 626660c..b886d87 100644
--- a/roles/cord-profile/templates/xos.yaml.j2
+++ b/roles/cord-profile/templates/xos.yaml.j2
@@ -15,6 +15,7 @@
bootstrap_ui_port: {{ xos_bootstrap_ui_port }}
docker_project_name: {{ cord_profile | regex_replace('\W','') }}
db_container_name: {{ cord_profile | regex_replace('\W','') }}bs_xos_db_1
+ source_ui_image: {{ xos_docker_image }}
{% if use_redis %}
redis_container_name: {{ cord_profile | regex_replace('\W','') }}bs_xos_redis_1
{% endif %}
diff --git a/roles/xos-bootstrap/tasks/main.yml b/roles/xos-bootstrap/tasks/main.yml
index 9c503fa..d962165 100644
--- a/roles/xos-bootstrap/tasks/main.yml
+++ b/roles/xos-bootstrap/tasks/main.yml
@@ -6,16 +6,6 @@
name: "{{ item }}"
with_items: "{{ xos_docker_networks }}"
-# Customized version of xosproject/xos with local cert baked in
-# Used by the onboarding synchronizer, soon this will go away
-- name: Build xosproject/xos bootstrap image (temporary, for onboarding)
- docker_image:
- name: "xosproject/xos"
- path: "{{ cord_profile_dir }}"
- dockerfile: "Dockerfile.xos"
- pull: False
- force: True
-
- name: Start XOS bootstrap containers
docker_service:
project_name: "{{ cord_profile | regex_replace('\\W','') }}bs"