diff options
author | Adrian Dudau <adrian.dudau@enea.com> | 2018-05-04 10:28:49 +0200 |
---|---|---|
committer | Martin Borg <martin.borg@enea.com> | 2018-05-07 09:44:10 +0200 |
commit | a2d29048afd7a619d3049193cade3d4c6cdd4fa9 (patch) | |
tree | d8a9394ce12f26f3547cee239049e6a34a60e1c2 | |
parent | 9ef70423503654f613db4a86dbd2b831e256e9cc (diff) | |
download | meta-el-nfv-access-a2d29048afd7a619d3049193cade3d4c6cdd4fa9.tar.gz |
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>
-rw-r--r-- | conf/layer.conf | 2 | ||||
-rw-r--r-- | conf/template.atom-c3000/conf-notes.txt | 1 | ||||
-rw-r--r-- | conf/template.xeon-d/conf-notes.txt | 1 | ||||
-rw-r--r-- | images/enea-nfv-access-openstack.bb | 17 |
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 \ | |||
10 | BBFILE_COLLECTIONS += "el-nfv-access" | 10 | BBFILE_COLLECTIONS += "el-nfv-access" |
11 | BBFILE_PATTERN_el-nfv-access = "^${LAYERDIR}/" | 11 | BBFILE_PATTERN_el-nfv-access = "^${LAYERDIR}/" |
12 | BBFILE_PRIORITY_el-nfv-access = "7" | 12 | BBFILE_PRIORITY_el-nfv-access = "7" |
13 | LAYERDEPENDS_el-nfv-access = "el-common enea-virtualization openstack-layer" | 13 | LAYERDEPENDS_el-nfv-access = "el-common enea-virtualization" |
14 | BBMASK += "/meta-cloud-services/meta-openstack/recipes-kernel/linux/" | 14 | 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 @@ | |||
1 | Common targets are: | 1 | Common targets are: |
2 | enea-nfv-access | 2 | enea-nfv-access |
3 | 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 @@ | |||
1 | Common targets are: | 1 | Common targets are: |
2 | enea-nfv-access | 2 | enea-nfv-access |
3 | 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 @@ | |||
1 | DESCRIPTION = "Image for the host side of the Enea NFV Access Platform that provides Oopenstack support" | ||
2 | |||
3 | require images/enea-nfv-access-host-common.inc | ||
4 | |||
5 | IMAGE_INSTALL = " \ | ||
6 | packagegroup-core-boot \ | ||
7 | packagegroup-cloud-compute \ | ||
8 | packagegroup-cloud-debug \ | ||
9 | packagegroup-cloud-extras \ | ||
10 | " | ||
11 | |||
12 | IMAGE_FEATURES += "ssh-server-openssh" | ||
13 | |||
14 | inherit openstack-base | ||
15 | inherit monitor | ||
16 | |||
17 | IMAGE_ROOTFS_EXTRA_SPACE_append += "+ 3000000" | ||