CORD-2878 use xos-core instead of xos-ui
Change-Id: I604393f970e6d32bce0fc6cf345b683f549f8a12
diff --git a/docker_images.yml b/docker_images.yml
index 75c7351..f7ec2b6 100644
--- a/docker_images.yml
+++ b/docker_images.yml
@@ -68,18 +68,6 @@
dockerfile: "Dockerfile.xos-core"
context: "../.."
- - name: xosproject/xos
- repo: xos
- path: "containers/xos"
- dockerfile: "Dockerfile.xos"
- context: "../.."
-
- - name: xosproject/xos-ui
- repo: xos
- path: "containers/xos"
- dockerfile: "Dockerfile.UI"
- context: "../.."
-
- name: xosproject/xos-libraries
repo: xos
path: "containers/xos"
diff --git a/docs/install_virtual.md b/docs/install_virtual.md
index 9e58b46..27ab511 100644
--- a/docs/install_virtual.md
+++ b/docs/install_virtual.md
@@ -181,8 +181,7 @@
52e477e9b188 rcord_xos_ws_1 docker-registry:5000/xosproject/xos-ws:candidate
10a54a4a4f03 rcord_xos_chameleon_1 docker-registry:5000/xosproject/chameleon:candidate
257f4c29967d rcord_xos_tosca_1 docker-registry:5000/xosproject/xos-tosca:candidate
-b2c78cf4de7b rcord_xos_ui_1 docker-registry:5000/xosproject/xos-ui:candidate
-526a4282610d rcord_xos_core_1 docker-registry:5000/xosproject/xos-ui:candidate
+526a4282610d rcord_xos_core_1 docker-registry:5000/xosproject/xos-core:candidate
0783438bba1e rcord_vtr-synchronizer_1 docker-registry:5000/xosproject/vtr-synchronizer:candidate
e66bd071bdba rcord_vsg-synchronizer_1 docker-registry:5000/xosproject/vsg-synchronizer:candidate
961ce2793217 rcord_onos-synchronizer_1 docker-registry:5000/xosproject/onos-synchronizer:candidate
diff --git a/scenarios/controlkube/config.yml b/scenarios/controlkube/config.yml
index e51ec1d..4c0b6a2 100644
--- a/scenarios/controlkube/config.yml
+++ b/scenarios/controlkube/config.yml
@@ -99,8 +99,7 @@
# images for imagebuilder to build/pull (tagged elsewhere)
docker_image_whitelist:
- "xosproject/xos-base"
- - "xosproject/xos"
- - "xosproject/xos-ui"
+ - "xosproject/xos-core"
- "xosproject/xos-client"
- "xosproject/xos-gui"
- "xosproject/xos-gui-builder"
diff --git a/scenarios/controlpod/config.yml b/scenarios/controlpod/config.yml
index e05ecbb..bf435e4 100644
--- a/scenarios/controlpod/config.yml
+++ b/scenarios/controlpod/config.yml
@@ -64,8 +64,7 @@
# whitelist of images for imagebuilder to build/pull (tagged elsewhere)
docker_image_whitelist:
- "xosproject/xos-base"
- - "xosproject/xos"
- - "xosproject/xos-ui"
+ - "xosproject/xos-core"
- "xosproject/xos-client"
- "xosproject/xos-gui"
- "xosproject/xos-gui-builder"
diff --git a/scenarios/cord/config.yml b/scenarios/cord/config.yml
index 3ce28cf..63fe3b4 100644
--- a/scenarios/cord/config.yml
+++ b/scenarios/cord/config.yml
@@ -128,8 +128,7 @@
# images for imagebuilder to build/pull (tagged elsewhere)
docker_image_whitelist:
- "xosproject/xos-base"
- - "xosproject/xos"
- - "xosproject/xos-ui"
+ - "xosproject/xos-core"
- "xosproject/xos-client"
- "xosproject/xos-gui"
- "xosproject/xos-gui-builder"
diff --git a/scenarios/local/config.yml b/scenarios/local/config.yml
index cdbcc13..7e2d915 100644
--- a/scenarios/local/config.yml
+++ b/scenarios/local/config.yml
@@ -41,8 +41,7 @@
# images for imagebuilder to build/pull (tagged elsewhere)
docker_image_whitelist:
- "xosproject/xos-base"
- - "xosproject/xos"
- - "xosproject/xos-ui"
+ - "xosproject/xos-core"
- "xosproject/xos-client"
- "xosproject/xos-gui"
- "xosproject/xos-gui-builder"
diff --git a/scenarios/mock/config.yml b/scenarios/mock/config.yml
index 1bb7146..ce0d91b 100644
--- a/scenarios/mock/config.yml
+++ b/scenarios/mock/config.yml
@@ -61,8 +61,7 @@
# whitelist of images for imagebuilder to build/pull (tagged elsewhere)
docker_image_whitelist:
- "xosproject/xos-base"
- - "xosproject/xos"
- - "xosproject/xos-ui"
+ - "xosproject/xos-core"
- "xosproject/xos-client"
- "xosproject/xos-gui"
- "xosproject/xos-gui-builder"
diff --git a/scenarios/preppedkube/config.yml b/scenarios/preppedkube/config.yml
index aabb966..db04ae2 100644
--- a/scenarios/preppedkube/config.yml
+++ b/scenarios/preppedkube/config.yml
@@ -100,8 +100,7 @@
# images for imagebuilder to build/pull (tagged elsewhere)
docker_image_whitelist:
- "xosproject/xos-base"
- - "xosproject/xos"
- - "xosproject/xos-ui"
+ - "xosproject/xos-core"
- "xosproject/xos-client"
- "xosproject/xos-gui"
- "xosproject/xos-gui-builder"
diff --git a/scenarios/preppedpod/config.yml b/scenarios/preppedpod/config.yml
index 1238d2c..f04eff6 100644
--- a/scenarios/preppedpod/config.yml
+++ b/scenarios/preppedpod/config.yml
@@ -96,8 +96,7 @@
# images for imagebuilder to build/pull (tagged elsewhere)
docker_image_whitelist:
- "xosproject/xos-base"
- - "xosproject/xos"
- - "xosproject/xos-ui"
+ - "xosproject/xos-core"
- "xosproject/xos-client"
- "xosproject/xos-gui"
- "xosproject/xos-gui-builder"
diff --git a/scenarios/single/config.yml b/scenarios/single/config.yml
index 4298642..007aba8 100644
--- a/scenarios/single/config.yml
+++ b/scenarios/single/config.yml
@@ -66,8 +66,7 @@
# whitelist of images for imagebuilder to build/pull (tagged elsewhere)
docker_image_whitelist:
- "xosproject/xos-base"
- - "xosproject/xos"
- - "xosproject/xos-ui"
+ - "xosproject/xos-core"
- "xosproject/xos-client"
- "xosproject/xos-gui"
- "xosproject/xos-gui-builder"