From 0f12d45a505c93562548b0ddbe088546518403db Mon Sep 17 00:00:00 2001 From: Jon-Paul Sullivan Date: Wed, 9 Apr 2014 14:36:14 +0100 Subject: [PATCH] Use provides to note an element provides deploy Use "deploy" to denote that an element provides the deploy capability for a ramdisk for tripleo installation purposes. This will be a 3-part change to enable renaming deploy to deploy-baremetal so that the generic "deploy" capability can be used for the provides file, as a dependant change will have to be made in tripleo-incubator. The tripleo-incubator change is I1ff4bb98c99dfe87ccc4fb19767b93e27707d3a7 and that swaps to using deploy-baremetal in place of deploy for ramdisk creation when using baremetal. Change-Id: Ibb4026e8fc8ba6378061461c4796a91ab2fa991f --- elements/deploy-baremetal/README.md | 2 ++ elements/{deploy => deploy-baremetal}/binary-deps.d/deploy | 0 elements/{deploy => deploy-baremetal}/init.d/80-deploy | 0 elements/{deploy => deploy-baremetal}/install.d/51-install-tgt | 0 .../{deploy => deploy-baremetal}/install.d/52-install-busybox | 0 elements/deploy-ironic/element-provides | 1 + elements/deploy-kexec/element-deps | 2 +- elements/deploy/README.md | 3 +-- elements/deploy/element-deps | 1 + 9 files changed, 6 insertions(+), 3 deletions(-) create mode 100644 elements/deploy-baremetal/README.md rename elements/{deploy => deploy-baremetal}/binary-deps.d/deploy (100%) rename elements/{deploy => deploy-baremetal}/init.d/80-deploy (100%) rename elements/{deploy => deploy-baremetal}/install.d/51-install-tgt (100%) rename elements/{deploy => deploy-baremetal}/install.d/52-install-busybox (100%) create mode 100644 elements/deploy-ironic/element-provides create mode 100644 elements/deploy/element-deps diff --git a/elements/deploy-baremetal/README.md b/elements/deploy-baremetal/README.md new file mode 100644 index 00000000..d163627e --- /dev/null +++ b/elements/deploy-baremetal/README.md @@ -0,0 +1,2 @@ +A ramdisk that will expose the machine primary disk over iSCSI and reboot +once baremetal-deploy-helper signals it is finished. diff --git a/elements/deploy/binary-deps.d/deploy b/elements/deploy-baremetal/binary-deps.d/deploy similarity index 100% rename from elements/deploy/binary-deps.d/deploy rename to elements/deploy-baremetal/binary-deps.d/deploy diff --git a/elements/deploy/init.d/80-deploy b/elements/deploy-baremetal/init.d/80-deploy similarity index 100% rename from elements/deploy/init.d/80-deploy rename to elements/deploy-baremetal/init.d/80-deploy diff --git a/elements/deploy/install.d/51-install-tgt b/elements/deploy-baremetal/install.d/51-install-tgt similarity index 100% rename from elements/deploy/install.d/51-install-tgt rename to elements/deploy-baremetal/install.d/51-install-tgt diff --git a/elements/deploy/install.d/52-install-busybox b/elements/deploy-baremetal/install.d/52-install-busybox similarity index 100% rename from elements/deploy/install.d/52-install-busybox rename to elements/deploy-baremetal/install.d/52-install-busybox diff --git a/elements/deploy-ironic/element-provides b/elements/deploy-ironic/element-provides new file mode 100644 index 00000000..8541464a --- /dev/null +++ b/elements/deploy-ironic/element-provides @@ -0,0 +1 @@ +deploy diff --git a/elements/deploy-kexec/element-deps b/elements/deploy-kexec/element-deps index 8541464a..b30556c6 100644 --- a/elements/deploy-kexec/element-deps +++ b/elements/deploy-kexec/element-deps @@ -1 +1 @@ -deploy +deploy-baremetal diff --git a/elements/deploy/README.md b/elements/deploy/README.md index d163627e..2310eaf3 100644 --- a/elements/deploy/README.md +++ b/elements/deploy/README.md @@ -1,2 +1 @@ -A ramdisk that will expose the machine primary disk over iSCSI and reboot -once baremetal-deploy-helper signals it is finished. +Temporary element to include deploy-baremetal from the name deploy whilst renaming the element. diff --git a/elements/deploy/element-deps b/elements/deploy/element-deps new file mode 100644 index 00000000..b30556c6 --- /dev/null +++ b/elements/deploy/element-deps @@ -0,0 +1 @@ +deploy-baremetal