openstack/fuel-main
Code Issues Proposed changes

1. Script bootstrap_admin_node.sh added. It will run once at first startup of admin node.

Browse Source 
2. Kickstart and make process modified to work with bootstrap_admin_node.sh
This commit is contained in:
Alwex 2012-10-15 15:36:27 +00:00 committed by default
parent 4392fbb204
commit f7d0c06660
3 changed files with 35 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
iso/bootstrap_admin_node.sh Normal file
View File

@ -0,0 +1,5 @@
#!/bin/bash
puppet apply /tmp/site.pp
sed -i "/bootstrap_admin_node.sh/d" /etc/rc.local

28
iso/ks.cfg
View File

@ -109,4 +109,32 @@ else
done done
fi fi
# Mounting cd
echo
mkdir /tmp/cdrom
mount /dev/cdrom /tmp/cdrom
# Copying Repo to the nailgun /var/www directory
repodir="/var/www"
mkdir -p ${repodir}/centos
mkdir -p ${repodir}/eggs
mkdir -p ${repodir}/gems
cp -r /tmp/cdrom/images ${repodir}/centos
cp -r /tmp/cdrom/isolinux ${repodir}/centos
cp -r /tmp/cdrom/repodata ${repodir}/centos
cp -r /tmp/cdrom/Packages ${repodir}/centos
cp -r /tmp/cdrom/eggs ${repodir}/eggs
cp -r /tmp/cdrom/gems ${repodir}/gems
# Copying bootstrap_admin_node.sh , chmod it and adding to the rc.local to run it once
cp /tmp/cdrom/bootstrap_admin_node.sh /tmp
chmod 0777 /tmp/bootstrap_admin_node.sh
echo "/tmp/bootstrap_admin_node.sh" >> /etc/rc.local
# Unmounting cd to succesfull eject
umount -f /dev/cdrom
sleep 1000000
/bin/bash
rm -rf /tmp/cdrom
%end %end

2
iso/module.mk
View File

@ -72,6 +72,7 @@ $/isoroot.done: \
$/isoroot-gpg.done \ $/isoroot-gpg.done \
$/isoroot-isolinux.done \ $/isoroot-isolinux.done \
$(ISOROOT)/ks.cfg \ $(ISOROOT)/ks.cfg \
$(ISOROOT)/bootstrap_admin_node.sh \
$(ISOROOT)/sync \ $(ISOROOT)/sync \
$(addprefix $(ISOROOT)/sync/,$(call find-files,iso/sync)) \ $(addprefix $(ISOROOT)/sync/,$(call find-files,iso/sync)) \
# $(ISOROOT)/EFI \ # $(ISOROOT)/EFI \
@ -90,6 +91,7 @@ $(ISOROOT)/sync/%: iso/sync/% ; $(ACTION.COPY)
# mkdir -p $@ # mkdir -p $@
#$(ISOROOT)/EFI/%: iso/EFI/% ; $(ACTION.COPY) #$(ISOROOT)/EFI/%: iso/EFI/% ; $(ACTION.COPY)
$(ISOROOT)/ks.cfg: iso/ks.cfg ; $(ACTION.COPY) $(ISOROOT)/ks.cfg: iso/ks.cfg ; $(ACTION.COPY)
$(ISOROOT)/bootstrap_admin_node.sh: iso/bootstrap_admin_node.sh ; $(ACTION.COPY)
$(ISOROOT)/nailgun/openstack-essex.json: scripts/release/openstack-essex.json ; $(ACTION.COPY) $(ISOROOT)/nailgun/openstack-essex.json: scripts/release/openstack-essex.json ; $(ACTION.COPY)
$(ISOROOT)/nailgun/bin/%: bin/% ; $(ACTION.COPY) $(ISOROOT)/nailgun/bin/%: bin/% ; $(ACTION.COPY)