From 106487af8f1d02f556d69f5274cf10a6c04c73dc Mon Sep 17 00:00:00 2001
From: Bruce Ashfield <bruce.ashfield@windriver.com>
Date: Sun, 11 Aug 2013 00:04:39 -0400
Subject: openstack: rename and clarify image names

Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
---
 .../recipes-extended/images/nova-image-compute.bb        | 16 ----------------
 .../recipes-extended/images/nova-image-controller.bb     | 16 ----------------
 .../recipes-extended/images/openstack-image-compute.bb   | 16 ++++++++++++++++
 .../images/openstack-image-controller.bb                 | 16 ++++++++++++++++
 .../recipes-extended/images/openstack-image-network.bb   | 16 ++++++++++++++++
 5 files changed, 48 insertions(+), 32 deletions(-)
 delete mode 100644 meta-openstack/recipes-extended/images/nova-image-compute.bb
 delete mode 100644 meta-openstack/recipes-extended/images/nova-image-controller.bb
 create mode 100644 meta-openstack/recipes-extended/images/openstack-image-compute.bb
 create mode 100644 meta-openstack/recipes-extended/images/openstack-image-controller.bb
 create mode 100644 meta-openstack/recipes-extended/images/openstack-image-network.bb

(limited to 'meta-openstack/recipes-extended/images')

diff --git a/meta-openstack/recipes-extended/images/nova-image-compute.bb b/meta-openstack/recipes-extended/images/nova-image-compute.bb
deleted file mode 100644
index 632b21b..0000000
--- a/meta-openstack/recipes-extended/images/nova-image-compute.bb
+++ /dev/null
@@ -1,16 +0,0 @@
-DESCRIPTION = "Openstack compute node image"
-LICENSE = "MIT"
-
-IMAGE_INSTALL = " \
-    packagegroup-core-boot \
-    ${ROOTFS_PKGMANAGE_BOOTSTRAP} \
-    packagegroup-cloud-compute \
-    "
-
-IMAGE_FEATURES += "ssh-server-openssh"
-
-inherit core-image
-
-#IMAGE_ROOTFS_EXTRA_SPACE = "41943040"
-
-ROOTFS_POSTPROCESS_COMMAND += "remove_packaging_data_files ; "
diff --git a/meta-openstack/recipes-extended/images/nova-image-controller.bb b/meta-openstack/recipes-extended/images/nova-image-controller.bb
deleted file mode 100644
index b4bba86..0000000
--- a/meta-openstack/recipes-extended/images/nova-image-controller.bb
+++ /dev/null
@@ -1,16 +0,0 @@
-DESCRIPTION = "Openstack controller node image"
-LICENSE = "MIT"
-
-IMAGE_INSTALL = "\
-    ${CORE_IMAGE_BASE_INSTALL} \
-    ${ROOTFS_PKGMANAGE_BOOTSTRAP} \
-    packagegroup-core-basic \
-    packagegroup-cloud-controller \
-    "
-
-IMAGE_FEATURES += " ssh-server-openssh"
-
-inherit core-image
-
-# Ensure extra space for guest images
-IMAGE_ROOTFS_EXTRA_SPACE = "2000000"
diff --git a/meta-openstack/recipes-extended/images/openstack-image-compute.bb b/meta-openstack/recipes-extended/images/openstack-image-compute.bb
new file mode 100644
index 0000000..632b21b
--- /dev/null
+++ b/meta-openstack/recipes-extended/images/openstack-image-compute.bb
@@ -0,0 +1,16 @@
+DESCRIPTION = "Openstack compute node image"
+LICENSE = "MIT"
+
+IMAGE_INSTALL = " \
+    packagegroup-core-boot \
+    ${ROOTFS_PKGMANAGE_BOOTSTRAP} \
+    packagegroup-cloud-compute \
+    "
+
+IMAGE_FEATURES += "ssh-server-openssh"
+
+inherit core-image
+
+#IMAGE_ROOTFS_EXTRA_SPACE = "41943040"
+
+ROOTFS_POSTPROCESS_COMMAND += "remove_packaging_data_files ; "
diff --git a/meta-openstack/recipes-extended/images/openstack-image-controller.bb b/meta-openstack/recipes-extended/images/openstack-image-controller.bb
new file mode 100644
index 0000000..b4bba86
--- /dev/null
+++ b/meta-openstack/recipes-extended/images/openstack-image-controller.bb
@@ -0,0 +1,16 @@
+DESCRIPTION = "Openstack controller node image"
+LICENSE = "MIT"
+
+IMAGE_INSTALL = "\
+    ${CORE_IMAGE_BASE_INSTALL} \
+    ${ROOTFS_PKGMANAGE_BOOTSTRAP} \
+    packagegroup-core-basic \
+    packagegroup-cloud-controller \
+    "
+
+IMAGE_FEATURES += " ssh-server-openssh"
+
+inherit core-image
+
+# Ensure extra space for guest images
+IMAGE_ROOTFS_EXTRA_SPACE = "2000000"
diff --git a/meta-openstack/recipes-extended/images/openstack-image-network.bb b/meta-openstack/recipes-extended/images/openstack-image-network.bb
new file mode 100644
index 0000000..e4dfa29
--- /dev/null
+++ b/meta-openstack/recipes-extended/images/openstack-image-network.bb
@@ -0,0 +1,16 @@
+DESCRIPTION = "Openstack network node image"
+LICENSE = "MIT"
+
+IMAGE_INSTALL = "\
+    ${CORE_IMAGE_BASE_INSTALL} \
+    ${ROOTFS_PKGMANAGE_BOOTSTRAP} \
+    packagegroup-core-basic \
+    packagegroup-cloud-network \
+    "
+
+IMAGE_FEATURES += " ssh-server-openssh"
+
+inherit core-image
+
+# Ensure extra space for guest images
+IMAGE_ROOTFS_EXTRA_SPACE = "2000000"
-- 
cgit v1.2.3-54-g00ecf