aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMustapha Lansana <Mustapha.Lansana@windriver.com>2014-07-30 20:38:33 -0400
committerBruce Ashfield <bruce.ashfield@windriver.com>2014-09-26 09:09:21 -0400
commit2b726dacf1d2213c0a5ebc01f1db4f0caa8d06d5 (patch)
treed0655b0e9afe320b86a5de7b27e9e6225d23b95a
parentcaf76c8322f247d0829dc9a18009bee0b1195a06 (diff)
downloadmeta-cloud-services-2b726dacf1d2213c0a5ebc01f1db4f0caa8d06d5.tar.gz
meta-cloud-services-2b726dacf1d2213c0a5ebc01f1db4f0caa8d06d5.tar.bz2
meta-cloud-services-2b726dacf1d2213c0a5ebc01f1db4f0caa8d06d5.zip
openstack-base: support for openstackchef to hook into rootfs creation
Openstack-base class is inheriting openstackchef class Since we want openstackchef post-rootfs function to be called after rootfs creation for all openstack images, openstack-base class need to inherit openstackchef class. In addition, we want the node names; compute/controller to be reconfigurable to other variables beside compute/controller in /etc/hosts file at run-time, and be consistent with node names used for compute/controller in all openstack installation. Signed-off-by: Mustapha Lansana <Mustapha.Lansana@windriver.com>
-rw-r--r--meta-openstack/classes/openstack-base.bbclass6
1 files changed, 3 insertions, 3 deletions
diff --git a/meta-openstack/classes/openstack-base.bbclass b/meta-openstack/classes/openstack-base.bbclass
index 565470b..718aa1c 100644
--- a/meta-openstack/classes/openstack-base.bbclass
+++ b/meta-openstack/classes/openstack-base.bbclass
@@ -1,12 +1,12 @@
-inherit hosts
+inherit hosts openstackchef
ROOTFS_POSTPROCESS_COMMAND += "openstack_configure_hosts ; "
openstack_configure_hosts() {
bbnote "openstack: identifying hosts"
- echo "${CONTROLLER_IP} controller" >> ${IMAGE_ROOTFS}/etc/hosts
- echo "${COMPUTE_IP} compute" >> ${IMAGE_ROOTFS}/etc/hosts
+ echo "${CONTROLLER_IP} ${CONTROLLER_HOST}" >> ${IMAGE_ROOTFS}/etc/hosts
+ echo "${COMPUTE_IP} ${COMPUTE_HOST}" >> ${IMAGE_ROOTFS}/etc/hosts
echo "${MY_HOST}" > ${IMAGE_ROOTFS}/etc/hostname
}