summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBruce Ashfield <bruce.ashfield@gmail.com>2019-04-02 02:42:32 -0400
committerBruce Ashfield <bruce.ashfield@gmail.com>2019-04-02 02:42:32 -0400
commitae9ff00b3f4f4772ddef33a53ba31abcf4c3b523 (patch)
tree0a3ecdb0340f15d5469a2265adb4d33b8963b654
parent106a30b756289990070068ecc18b680afee76351 (diff)
downloadmeta-cloud-services-ae9ff00b3f4f4772ddef33a53ba31abcf4c3b523.tar.gz
conf: add warrior to layer compat
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
-rw-r--r--conf/layer.conf2
-rw-r--r--meta-openstack-aio-deploy/conf/layer.conf2
-rw-r--r--meta-openstack-compute-deploy/conf/layer.conf2
-rw-r--r--meta-openstack-compute-test-config/conf/layer.conf2
-rw-r--r--meta-openstack-controller-deploy/conf/layer.conf2
-rw-r--r--meta-openstack-controller-test-config/conf/layer.conf2
-rw-r--r--meta-openstack-qemu/conf/layer.conf2
-rw-r--r--meta-openstack-swift-deploy/conf/layer.conf2
-rw-r--r--meta-openstack/conf/layer.conf2
9 files changed, 9 insertions, 9 deletions
diff --git a/conf/layer.conf b/conf/layer.conf
index 1a53886..8df9829 100644
--- a/conf/layer.conf
+++ b/conf/layer.conf
@@ -7,5 +7,5 @@ BBFILES += "${LAYERDIR}/recipes*/*/*.bb ${LAYERDIR}/recipes*/*/*.bbappend"
7BBFILE_COLLECTIONS += "cloud-services-layer" 7BBFILE_COLLECTIONS += "cloud-services-layer"
8BBFILE_PATTERN_cloud-services-layer := "^${LAYERDIR}/" 8BBFILE_PATTERN_cloud-services-layer := "^${LAYERDIR}/"
9BBFILE_PRIORITY_cloud-services-layer = "5" 9BBFILE_PRIORITY_cloud-services-layer = "5"
10LAYERSERIES_COMPAT_cloud-services-layer = "sumo thud" 10LAYERSERIES_COMPAT_cloud-services-layer = "thud warrior"
11LAYERDEPENDS_cloud-services-layer = "core" 11LAYERDEPENDS_cloud-services-layer = "core"
diff --git a/meta-openstack-aio-deploy/conf/layer.conf b/meta-openstack-aio-deploy/conf/layer.conf
index 89fede8..67a1ef0 100644
--- a/meta-openstack-aio-deploy/conf/layer.conf
+++ b/meta-openstack-aio-deploy/conf/layer.conf
@@ -7,7 +7,7 @@ BBFILES += "${LAYERDIR}/recipes*/*/*.bb ${LAYERDIR}/recipes*/*/*.bbappend"
7BBFILE_COLLECTIONS += "openstack-aio-deploy-layer" 7BBFILE_COLLECTIONS += "openstack-aio-deploy-layer"
8BBFILE_PATTERN_openstack-aio-deploy-layer := "^${LAYERDIR}/" 8BBFILE_PATTERN_openstack-aio-deploy-layer := "^${LAYERDIR}/"
9BBFILE_PRIORITY_openstack-aio-deploy-layer = "6" 9BBFILE_PRIORITY_openstack-aio-deploy-layer = "6"
10LAYERSERIES_COMPAT_openstack-aio-deploy-layer = "sumo thud" 10LAYERSERIES_COMPAT_openstack-aio-deploy-layer = "thud warrior"
11 11
12LAYERDEPENDS_openstack-aio-deploy-layer = " \ 12LAYERDEPENDS_openstack-aio-deploy-layer = " \
13 core \ 13 core \
diff --git a/meta-openstack-compute-deploy/conf/layer.conf b/meta-openstack-compute-deploy/conf/layer.conf
index 999e95e..047d006 100644
--- a/meta-openstack-compute-deploy/conf/layer.conf
+++ b/meta-openstack-compute-deploy/conf/layer.conf
@@ -7,7 +7,7 @@ BBFILES += "${LAYERDIR}/recipes*/*/*.bb ${LAYERDIR}/recipes*/*/*.bbappend"
7BBFILE_COLLECTIONS += "openstack-compute-deploy-layer" 7BBFILE_COLLECTIONS += "openstack-compute-deploy-layer"
8BBFILE_PATTERN_openstack-compute-deploy-layer := "^${LAYERDIR}/" 8BBFILE_PATTERN_openstack-compute-deploy-layer := "^${LAYERDIR}/"
9BBFILE_PRIORITY_openstack-compute-deploy-layer = "6" 9BBFILE_PRIORITY_openstack-compute-deploy-layer = "6"
10LAYERSERIES_COMPAT_openstack-compute-deploy-layer = "sumo thud" 10LAYERSERIES_COMPAT_openstack-compute-deploy-layer = "thud warrior"
11 11
12LAYERDEPENDS_openstack-compute-deploy-layer = " \ 12LAYERDEPENDS_openstack-compute-deploy-layer = " \
13 core \ 13 core \
diff --git a/meta-openstack-compute-test-config/conf/layer.conf b/meta-openstack-compute-test-config/conf/layer.conf
index a8c69d7..9525e20 100644
--- a/meta-openstack-compute-test-config/conf/layer.conf
+++ b/meta-openstack-compute-test-config/conf/layer.conf
@@ -8,7 +8,7 @@ BBFILE_COLLECTIONS += "openstack-compute-test-config-layer"
8BBFILE_PATTERN_openstack-compute-test-config-layer := "^${LAYERDIR}/" 8BBFILE_PATTERN_openstack-compute-test-config-layer := "^${LAYERDIR}/"
9# We want this layer to have higher priority than any other meta-openstack layers 9# We want this layer to have higher priority than any other meta-openstack layers
10BBFILE_PRIORITY_openstack-compute-test-config-layer = "100" 10BBFILE_PRIORITY_openstack-compute-test-config-layer = "100"
11LAYERSERIES_COMPAT_openstack-compute-test-config-layer = "sumo thud" 11LAYERSERIES_COMPAT_openstack-compute-test-config-layer = "thud warrior"
12 12
13LAYERDEPENDS_openstack-compute-test-config-layer = " \ 13LAYERDEPENDS_openstack-compute-test-config-layer = " \
14 openstack-compute-deploy-layer \ 14 openstack-compute-deploy-layer \
diff --git a/meta-openstack-controller-deploy/conf/layer.conf b/meta-openstack-controller-deploy/conf/layer.conf
index 51f510f..d1512b8 100644
--- a/meta-openstack-controller-deploy/conf/layer.conf
+++ b/meta-openstack-controller-deploy/conf/layer.conf
@@ -7,7 +7,7 @@ BBFILES += "${LAYERDIR}/recipes*/*/*.bb ${LAYERDIR}/recipes*/*/*.bbappend"
7BBFILE_COLLECTIONS += "openstack-controller-deploy-layer" 7BBFILE_COLLECTIONS += "openstack-controller-deploy-layer"
8BBFILE_PATTERN_openstack-controller-deploy-layer := "^${LAYERDIR}/" 8BBFILE_PATTERN_openstack-controller-deploy-layer := "^${LAYERDIR}/"
9BBFILE_PRIORITY_openstack-controller-deploy-layer = "6" 9BBFILE_PRIORITY_openstack-controller-deploy-layer = "6"
10LAYERSERIES_COMPAT_openstack-controller-deploy-layer = "sumo thud" 10LAYERSERIES_COMPAT_openstack-controller-deploy-layer = "thud warrior"
11 11
12LAYERDEPENDS_openstack-controller-deploy-layer = " \ 12LAYERDEPENDS_openstack-controller-deploy-layer = " \
13 core \ 13 core \
diff --git a/meta-openstack-controller-test-config/conf/layer.conf b/meta-openstack-controller-test-config/conf/layer.conf
index 507b1ed..aa8a0ee 100644
--- a/meta-openstack-controller-test-config/conf/layer.conf
+++ b/meta-openstack-controller-test-config/conf/layer.conf
@@ -8,7 +8,7 @@ BBFILE_COLLECTIONS += "openstack-controller-test-config-layer"
8BBFILE_PATTERN_openstack-controller-test-config-layer := "^${LAYERDIR}/" 8BBFILE_PATTERN_openstack-controller-test-config-layer := "^${LAYERDIR}/"
9# We want this layer to have higher priority than any other meta-openstack layers 9# We want this layer to have higher priority than any other meta-openstack layers
10BBFILE_PRIORITY_openstack-controller-test-config-layer = "100" 10BBFILE_PRIORITY_openstack-controller-test-config-layer = "100"
11LAYERSERIES_COMPAT_openstack-controller-test-config-layer = "sumo thud" 11LAYERSERIES_COMPAT_openstack-controller-test-config-layer = "thud warrior"
12 12
13LAYERDEPENDS_openstack-controller-test-config-layer = " \ 13LAYERDEPENDS_openstack-controller-test-config-layer = " \
14 openstack-controller-deploy-layer \ 14 openstack-controller-deploy-layer \
diff --git a/meta-openstack-qemu/conf/layer.conf b/meta-openstack-qemu/conf/layer.conf
index 9addb4a..bf629d0 100644
--- a/meta-openstack-qemu/conf/layer.conf
+++ b/meta-openstack-qemu/conf/layer.conf
@@ -7,7 +7,7 @@ BBFILES += "${LAYERDIR}/recipes*/*/*.bb ${LAYERDIR}/recipes*/*/*.bbappend"
7BBFILE_COLLECTIONS += "openstack-qemu-layer" 7BBFILE_COLLECTIONS += "openstack-qemu-layer"
8BBFILE_PATTERN_openstack-qemu-layer := "^${LAYERDIR}/" 8BBFILE_PATTERN_openstack-qemu-layer := "^${LAYERDIR}/"
9BBFILE_PRIORITY_openstack-qemu-layer = "6" 9BBFILE_PRIORITY_openstack-qemu-layer = "6"
10LAYERSERIES_COMPAT_openstack-qemu-layer = "sumo thud" 10LAYERSERIES_COMPAT_openstack-qemu-layer = "thud warrior"
11 11
12LAYERDEPENDS_openstack-qemu-layer = " \ 12LAYERDEPENDS_openstack-qemu-layer = " \
13 core \ 13 core \
diff --git a/meta-openstack-swift-deploy/conf/layer.conf b/meta-openstack-swift-deploy/conf/layer.conf
index bfe40fe..5f7a7fa 100644
--- a/meta-openstack-swift-deploy/conf/layer.conf
+++ b/meta-openstack-swift-deploy/conf/layer.conf
@@ -7,7 +7,7 @@ BBFILES += "${LAYERDIR}/recipes*/*/*.bb ${LAYERDIR}/recipes*/*/*.bbappend"
7BBFILE_COLLECTIONS += "openstack-swift-deploy-layer" 7BBFILE_COLLECTIONS += "openstack-swift-deploy-layer"
8BBFILE_PATTERN_openstack-swift-deploy-layer := "^${LAYERDIR}/" 8BBFILE_PATTERN_openstack-swift-deploy-layer := "^${LAYERDIR}/"
9BBFILE_PRIORITY_openstack-swift-deploy-layer = "6" 9BBFILE_PRIORITY_openstack-swift-deploy-layer = "6"
10LAYERSERIES_COMPAT_openstack-swift-deploy-layer = "sumo thud" 10LAYERSERIES_COMPAT_openstack-swift-deploy-layer = "thud warrior"
11 11
12LAYERDEPENDS_openstack-swift-deploy-layer = " \ 12LAYERDEPENDS_openstack-swift-deploy-layer = " \
13 core \ 13 core \
diff --git a/meta-openstack/conf/layer.conf b/meta-openstack/conf/layer.conf
index ebff000..d8a4db8 100644
--- a/meta-openstack/conf/layer.conf
+++ b/meta-openstack/conf/layer.conf
@@ -7,7 +7,7 @@ BBFILES += "${LAYERDIR}/recipes*/*/*.bb ${LAYERDIR}/recipes*/*/*.bbappend"
7BBFILE_COLLECTIONS += "openstack-layer" 7BBFILE_COLLECTIONS += "openstack-layer"
8BBFILE_PATTERN_openstack-layer := "^${LAYERDIR}/" 8BBFILE_PATTERN_openstack-layer := "^${LAYERDIR}/"
9BBFILE_PRIORITY_openstack-layer = "5" 9BBFILE_PRIORITY_openstack-layer = "5"
10LAYERSERIES_COMPAT_openstack-layer = "sumo thud" 10LAYERSERIES_COMPAT_openstack-layer = "thud warrior"
11BB_DANGLINGAPPENDS_WARNONLY ?= "true" 11BB_DANGLINGAPPENDS_WARNONLY ?= "true"
12 12
13LAYERDEPENDS_openstack-layer = " \ 13LAYERDEPENDS_openstack-layer = " \