enea-nfv-access-openstack: Drop image

And remove layer dependency on meta-openstack.

Signed-off-by: Adrian Dudau <adrian.dudau@enea.com>
Signed-off-by: Martin Borg <martin.borg@enea.com>

4 files changed, 1 insertions, 20 deletions

diff --git a/conf/layer.conf b/conf/layer.conf
index 04b8042..1a85b93 100644
--- a/conf/layer.conf
+++ b/conf/layer.conf
@@ -10,5 +10,5 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \
 BBFILE_COLLECTIONS += "el-nfv-access"
 BBFILE_PATTERN_el-nfv-access = "^${LAYERDIR}/"
 BBFILE_PRIORITY_el-nfv-access = "7"
-LAYERDEPENDS_el-nfv-access = "el-common enea-virtualization openstack-layer"
+LAYERDEPENDS_el-nfv-access = "el-common enea-virtualization"
 BBMASK += "/meta-cloud-services/meta-openstack/recipes-kernel/linux/"
diff --git a/conf/template.atom-c3000/conf-notes.txt b/conf/template.atom-c3000/conf-notes.txt
index e97942f..ebd6162 100644
--- a/conf/template.atom-c3000/conf-notes.txt
+++ b/conf/template.atom-c3000/conf-notes.txt
@@ -1,3 +1,2 @@
 Common targets are:
     enea-nfv-access
-    enea-nfv-access-openstack
diff --git a/conf/template.xeon-d/conf-notes.txt b/conf/template.xeon-d/conf-notes.txt
index e97942f..ebd6162 100644
--- a/conf/template.xeon-d/conf-notes.txt
+++ b/conf/template.xeon-d/conf-notes.txt
@@ -1,3 +1,2 @@
 Common targets are:
     enea-nfv-access
-    enea-nfv-access-openstack
diff --git a/images/enea-nfv-access-openstack.bb b/images/enea-nfv-access-openstack.bb
deleted file mode 100644
index 5672d60..0000000
--- a/images/enea-nfv-access-openstack.bb
+++ /dev/null
@@ -1,17 +0,0 @@
-DESCRIPTION = "Image for the host side of the Enea NFV Access Platform that provides Oopenstack support"
-
-require images/enea-nfv-access-host-common.inc
-
-IMAGE_INSTALL = " \
-    packagegroup-core-boot \
-    packagegroup-cloud-compute \
-    packagegroup-cloud-debug \
-    packagegroup-cloud-extras \
-    "
-
-IMAGE_FEATURES += "ssh-server-openssh"
-
-inherit openstack-base
-inherit monitor
-
-IMAGE_ROOTFS_EXTRA_SPACE_append += "+ 3000000"