diff --git a/README.md b/README.md index bdafa7ad..5f6e8168 100644 --- a/README.md +++ b/README.md @@ -8,10 +8,10 @@ in the demo repository, while the reusable tools live here. What tools are there? --------------------- -* disk-image-create -o filename {flavour} [{flavour} ...] : Create an image of - flavour {flavour}, optionally mixing in other flavours. +* disk-image-create -o filename {element} [{element} ...] : Create an image of + element {element}, optionally mixing in other elements. -* ramdisk-image-create -o filename {flavour} [{flavour} ...] : Create a kernel+ +* ramdisk-image-create -o filename {element} [{element} ...] : Create a kernel+ ramdisk pair for running maintenance on bare metal machines (deployment, inventory, burnin etc). @@ -20,7 +20,7 @@ What tools are there? * disk-image-get-kernel filename : Extract the appropriate kernel and ramdisk to use when doing PXE boot using filename as the image for a machine. -* flavours can be found in the top level flavours directory. +* elements can be found in the top level elements directory. Why? ---- @@ -36,12 +36,12 @@ of the image building process is to produce blank slate machines that have all the necessary bits to fulfill a specific purpose in the running of an Openstack cloud: e.g. a nova-compute node. -A flavour is a particular set of code that alters how the image is built, or -runs within the chroot to prepare the image. E.g. the local-config flavour +An element is a particular set of code that alters how the image is built, or +runs within the chroot to prepare the image. E.g. the local-config element copies in the http proxy and ssh keys of the user running the image build -process into the image, whereas the vm flavour makes the image build a regular +process into the image, whereas the vm element makes the image build a regular VM image with partition table and installed grub boot sector. The mellanox -flavour adds support for mellanox infiniband hardware to both the deploy +element adds support for mellanox infiniband hardware to both the deploy ramdisk and the built images. Images start as a base ubuntu cloud image. Other distributions may be added in @@ -71,24 +71,24 @@ the correct global content and are ready for 'last-mile' configuration by the nova metadata API, after which a configuration management system can take over (until the next deploy, when it all starts over from scratch). -Existing flavours +Existing elements ----------------- -Flavours are found in the subdirectory flavours. Each flavour is in a directory -named after the flavour itself. Flavours *should* have a README.md in the root -of the flavour directory describing what it is for. +Elements are found in the subdirectory elements. Each element is in a directory +named after the element itself. Elements *should* have a README.md in the root +of the element directory describing what it is for. -Writing a flavour +Writing an element ----------------- Make as many of the following subdirectories as you need, depending on what part of the process you need to customise: * block-device-size.d: Alter the size (in GB) of the disk image. This is useful - when a particular flavour will require a certain minimum (or maximum) size. + when a particular element will require a certain minimum (or maximum) size. You can either error and stop the build, or adjust the size to match. NB: Due to the current simple implementation, the last output value wins - so this should be used rarely - only one flavour in a mix can reliably set + so this should be used rarely - only one element in a mix can reliably set a size. * outputs: $IMAGE\_SIZE={size_in_GB} @@ -117,7 +117,7 @@ part of the process you need to customise: * first-boot.d: Runs inside the image before rc.local. Scripts from here are good for doing per-instance configuration based on cloud metadata. -Ramdisk flavours support the following files in their flavour directories: +Ramdisk elements support the following files in their element directories: * binary-deps : executables required to be fed into the ramdisk. These need to be present in your $PATH. @@ -125,10 +125,10 @@ Ramdisk flavours support the following files in their flavour directories: * init : a POSIX shell script fragment that will be appended to the default script executed as the ramdisk is booted (/init) -Third party flavours +Third party elements -------------------- -Pending implementation. The idea is to have a search path for flavours. +Pending implementation. The idea is to have a search path for elements. Installation ============ diff --git a/bin/disk-image-create b/bin/disk-image-create index a9dd943f..bddfe9f4 100755 --- a/bin/disk-image-create +++ b/bin/disk-image-create @@ -46,17 +46,17 @@ while true ; do *) echo "Internal error!" ; exit 1 ;; esac done -for arg do IMAGE_FLAVOUR="$IMAGE_FLAVOUR $arg" ; done +for arg do IMAGE_ELEMENT="$IMAGE_ELEMENT $arg" ; done source $_LIB/img-defaults source $_LIB/common-functions source $_LIB/img-functions -echo "Building flavours: $IMAGE_FLAVOUR" +echo "Building elements: $IMAGE_ELEMENT" echo "If prompted for sudo, install sudoers.d/img-build-sudoers into /etc/sudoers.d and restart the build." mkdir -p $IMG_PATH -# TODO: make a flavour. +# TODO: make an element. ensure_nbd mk_build_dir diff --git a/bin/ramdisk-image-create b/bin/ramdisk-image-create index 40dcf9b6..e7ec9f15 100755 --- a/bin/ramdisk-image-create +++ b/bin/ramdisk-image-create @@ -51,13 +51,13 @@ while true ; do *) echo "Internal error!" ; exit 1 ;; esac done -for arg do RAMDISK_FLAVOUR="$RAMDISK_FLAVOUR $arg" ; done +for arg do RAMDISK_ELEMENT="$RAMDISK_ELEMENT $arg" ; done source $_LIB/ramdisk-defaults source $_LIB/common-functions source $_LIB/ramdisk-functions -echo "Building flavour(s): ${RAMDISK_FLAVOUR}" +echo "Building element(s): ${RAMDISK_ELEMENT}" echo "Discovering binary dependencies" ensure_binaries diff --git a/flavours/base/install.d/10-cloud-init b/elements/base/install.d/10-cloud-init similarity index 100% rename from flavours/base/install.d/10-cloud-init rename to elements/base/install.d/10-cloud-init diff --git a/elements/deploy/README.md b/elements/deploy/README.md new file mode 100644 index 00000000..d163627e --- /dev/null +++ b/elements/deploy/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/flavours/deploy/binary-deps b/elements/deploy/binary-deps similarity index 100% rename from flavours/deploy/binary-deps rename to elements/deploy/binary-deps diff --git a/flavours/deploy/init b/elements/deploy/init similarity index 100% rename from flavours/deploy/init rename to elements/deploy/init diff --git a/flavours/devstack/README.md b/elements/devstack/README.md similarity index 60% rename from flavours/devstack/README.md rename to elements/devstack/README.md index 5bfadc49..b4a790f5 100644 --- a/flavours/devstack/README.md +++ b/elements/devstack/README.md @@ -1,5 +1,5 @@ Creates an image prepped to make a devstack baremetal cloud. See demo/scripts/demo within the built image. -This flavour forces a 16GB image to allow room for Swift, Cinder and instance +Forces a 16GB image to allow room for Swift, Cinder and instance disk images. diff --git a/flavours/devstack/block-device-size.d/10-size b/elements/devstack/block-device-size.d/10-size similarity index 100% rename from flavours/devstack/block-device-size.d/10-size rename to elements/devstack/block-device-size.d/10-size diff --git a/flavours/devstack/install.d/50-user b/elements/devstack/install.d/50-user similarity index 100% rename from flavours/devstack/install.d/50-user rename to elements/devstack/install.d/50-user diff --git a/flavours/devstack/install.d/51-grub b/elements/devstack/install.d/51-grub similarity index 100% rename from flavours/devstack/install.d/51-grub rename to elements/devstack/install.d/51-grub diff --git a/flavours/devstack/install.d/52-image-toolchain b/elements/devstack/install.d/52-image-toolchain similarity index 100% rename from flavours/devstack/install.d/52-image-toolchain rename to elements/devstack/install.d/52-image-toolchain diff --git a/flavours/devstack/install.d/97-haveged b/elements/devstack/install.d/97-haveged similarity index 100% rename from flavours/devstack/install.d/97-haveged rename to elements/devstack/install.d/97-haveged diff --git a/flavours/devstack/install.d/98-baremetal-network b/elements/devstack/install.d/98-baremetal-network similarity index 100% rename from flavours/devstack/install.d/98-baremetal-network rename to elements/devstack/install.d/98-baremetal-network diff --git a/flavours/devstack/install.d/99-ssh b/elements/devstack/install.d/99-ssh similarity index 100% rename from flavours/devstack/install.d/99-ssh rename to elements/devstack/install.d/99-ssh diff --git a/elements/hwburnin/README.md b/elements/hwburnin/README.md new file mode 100644 index 00000000..8465564d --- /dev/null +++ b/elements/hwburnin/README.md @@ -0,0 +1,2 @@ +A hardware test ramdisk - exercises the machine RAM and exercises the hard +disks diff --git a/flavours/hwburnin/binary-deps b/elements/hwburnin/binary-deps similarity index 100% rename from flavours/hwburnin/binary-deps rename to elements/hwburnin/binary-deps diff --git a/flavours/hwburnin/init b/elements/hwburnin/init similarity index 100% rename from flavours/hwburnin/init rename to elements/hwburnin/init diff --git a/elements/hwdiscovery/README.md b/elements/hwdiscovery/README.md new file mode 100644 index 00000000..c7853d25 --- /dev/null +++ b/elements/hwdiscovery/README.md @@ -0,0 +1 @@ +A ramdisk to report the hardware of a machine to an inventory service. diff --git a/flavours/hwdiscovery/binary-deps b/elements/hwdiscovery/binary-deps similarity index 100% rename from flavours/hwdiscovery/binary-deps rename to elements/hwdiscovery/binary-deps diff --git a/flavours/hwdiscovery/init b/elements/hwdiscovery/init similarity index 100% rename from flavours/hwdiscovery/init rename to elements/hwdiscovery/init diff --git a/flavours/hwdiscovery/install.d/10-hwinfo b/elements/hwdiscovery/install.d/10-hwinfo similarity index 100% rename from flavours/hwdiscovery/install.d/10-hwinfo rename to elements/hwdiscovery/install.d/10-hwinfo diff --git a/flavours/jenkins/README.md b/elements/jenkins/README.md similarity index 100% rename from flavours/jenkins/README.md rename to elements/jenkins/README.md diff --git a/flavours/jenkins/first-boot.d/10-jenkins b/elements/jenkins/first-boot.d/10-jenkins similarity index 100% rename from flavours/jenkins/first-boot.d/10-jenkins rename to elements/jenkins/first-boot.d/10-jenkins diff --git a/flavours/jenkins/install.d/10-jenkins b/elements/jenkins/install.d/10-jenkins similarity index 100% rename from flavours/jenkins/install.d/10-jenkins rename to elements/jenkins/install.d/10-jenkins diff --git a/flavours/jenkins/install.d/11-jenkins-plugins b/elements/jenkins/install.d/11-jenkins-plugins similarity index 100% rename from flavours/jenkins/install.d/11-jenkins-plugins rename to elements/jenkins/install.d/11-jenkins-plugins diff --git a/flavours/jenkins/install.d/defaults b/elements/jenkins/install.d/defaults similarity index 100% rename from flavours/jenkins/install.d/defaults rename to elements/jenkins/install.d/defaults diff --git a/flavours/jenkins/pre-install.d/10-jenkins b/elements/jenkins/pre-install.d/10-jenkins similarity index 100% rename from flavours/jenkins/pre-install.d/10-jenkins rename to elements/jenkins/pre-install.d/10-jenkins diff --git a/flavours/local-config/README.md b/elements/local-config/README.md similarity index 100% rename from flavours/local-config/README.md rename to elements/local-config/README.md diff --git a/flavours/local-config/extra-data.d/62-ssh-key b/elements/local-config/extra-data.d/62-ssh-key similarity index 100% rename from flavours/local-config/extra-data.d/62-ssh-key rename to elements/local-config/extra-data.d/62-ssh-key diff --git a/flavours/local-config/install.d/61-http-proxy b/elements/local-config/install.d/61-http-proxy similarity index 100% rename from flavours/local-config/install.d/61-http-proxy rename to elements/local-config/install.d/61-http-proxy diff --git a/flavours/local-config/install.d/62-ssh-key b/elements/local-config/install.d/62-ssh-key similarity index 100% rename from flavours/local-config/install.d/62-ssh-key rename to elements/local-config/install.d/62-ssh-key diff --git a/elements/mellanox/README.md b/elements/mellanox/README.md new file mode 100644 index 00000000..b1ca5a50 --- /dev/null +++ b/elements/mellanox/README.md @@ -0,0 +1 @@ +Force support for mellanox hardware diff --git a/flavours/mellanox/init b/elements/mellanox/init similarity index 100% rename from flavours/mellanox/init rename to elements/mellanox/init diff --git a/flavours/mellanox/udev/81-mellanox-drivers.rules b/elements/mellanox/udev/81-mellanox-drivers.rules similarity index 100% rename from flavours/mellanox/udev/81-mellanox-drivers.rules rename to elements/mellanox/udev/81-mellanox-drivers.rules diff --git a/flavours/mysql/README.md b/elements/mysql/README.md similarity index 100% rename from flavours/mysql/README.md rename to elements/mysql/README.md diff --git a/flavours/mysql/first-boot.d/05-ipforwarding b/elements/mysql/first-boot.d/05-ipforwarding similarity index 100% rename from flavours/mysql/first-boot.d/05-ipforwarding rename to elements/mysql/first-boot.d/05-ipforwarding diff --git a/flavours/mysql/first-boot.d/10-ntp b/elements/mysql/first-boot.d/10-ntp similarity index 100% rename from flavours/mysql/first-boot.d/10-ntp rename to elements/mysql/first-boot.d/10-ntp diff --git a/flavours/mysql/first-boot.d/50-mysql b/elements/mysql/first-boot.d/50-mysql similarity index 100% rename from flavours/mysql/first-boot.d/50-mysql rename to elements/mysql/first-boot.d/50-mysql diff --git a/flavours/mysql/first-boot.d/defaults b/elements/mysql/first-boot.d/defaults similarity index 100% rename from flavours/mysql/first-boot.d/defaults rename to elements/mysql/first-boot.d/defaults diff --git a/flavours/mysql/first-boot.d/my.cnf b/elements/mysql/first-boot.d/my.cnf similarity index 100% rename from flavours/mysql/first-boot.d/my.cnf rename to elements/mysql/first-boot.d/my.cnf diff --git a/flavours/mysql/install.d/10-mysql b/elements/mysql/install.d/10-mysql similarity index 100% rename from flavours/mysql/install.d/10-mysql rename to elements/mysql/install.d/10-mysql diff --git a/flavours/mysql/install.d/50-user b/elements/mysql/install.d/50-user similarity index 100% rename from flavours/mysql/install.d/50-user rename to elements/mysql/install.d/50-user diff --git a/flavours/mysql/install.d/97-haveged b/elements/mysql/install.d/97-haveged similarity index 100% rename from flavours/mysql/install.d/97-haveged rename to elements/mysql/install.d/97-haveged diff --git a/flavours/mysql/install.d/99-clean-apt b/elements/mysql/install.d/99-clean-apt similarity index 100% rename from flavours/mysql/install.d/99-clean-apt rename to elements/mysql/install.d/99-clean-apt diff --git a/flavours/mysql/pre-install.d/50-percona-server b/elements/mysql/pre-install.d/50-percona-server similarity index 100% rename from flavours/mysql/pre-install.d/50-percona-server rename to elements/mysql/pre-install.d/50-percona-server diff --git a/flavours/nova-vm/README.md b/elements/nova-vm/README.md similarity index 100% rename from flavours/nova-vm/README.md rename to elements/nova-vm/README.md diff --git a/flavours/nova-vm/first-boot.d/05-ipforwarding b/elements/nova-vm/first-boot.d/05-ipforwarding similarity index 100% rename from flavours/nova-vm/first-boot.d/05-ipforwarding rename to elements/nova-vm/first-boot.d/05-ipforwarding diff --git a/flavours/nova-vm/first-boot.d/10-ntp b/elements/nova-vm/first-boot.d/10-ntp similarity index 100% rename from flavours/nova-vm/first-boot.d/10-ntp rename to elements/nova-vm/first-boot.d/10-ntp diff --git a/flavours/nova-vm/first-boot.d/15-mysql b/elements/nova-vm/first-boot.d/15-mysql similarity index 100% rename from flavours/nova-vm/first-boot.d/15-mysql rename to elements/nova-vm/first-boot.d/15-mysql diff --git a/flavours/nova-vm/first-boot.d/20-rabbitmq b/elements/nova-vm/first-boot.d/20-rabbitmq similarity index 100% rename from flavours/nova-vm/first-boot.d/20-rabbitmq rename to elements/nova-vm/first-boot.d/20-rabbitmq diff --git a/flavours/nova-vm/first-boot.d/30-keystone b/elements/nova-vm/first-boot.d/30-keystone similarity index 100% rename from flavours/nova-vm/first-boot.d/30-keystone rename to elements/nova-vm/first-boot.d/30-keystone diff --git a/flavours/nova-vm/first-boot.d/31-keystone-data b/elements/nova-vm/first-boot.d/31-keystone-data similarity index 100% rename from flavours/nova-vm/first-boot.d/31-keystone-data rename to elements/nova-vm/first-boot.d/31-keystone-data diff --git a/flavours/nova-vm/first-boot.d/32-keystone-endpoints b/elements/nova-vm/first-boot.d/32-keystone-endpoints similarity index 100% rename from flavours/nova-vm/first-boot.d/32-keystone-endpoints rename to elements/nova-vm/first-boot.d/32-keystone-endpoints diff --git a/flavours/nova-vm/first-boot.d/40-glance b/elements/nova-vm/first-boot.d/40-glance similarity index 100% rename from flavours/nova-vm/first-boot.d/40-glance rename to elements/nova-vm/first-boot.d/40-glance diff --git a/flavours/nova-vm/first-boot.d/50-nova b/elements/nova-vm/first-boot.d/50-nova similarity index 100% rename from flavours/nova-vm/first-boot.d/50-nova rename to elements/nova-vm/first-boot.d/50-nova diff --git a/flavours/nova-vm/first-boot.d/defaults b/elements/nova-vm/first-boot.d/defaults similarity index 100% rename from flavours/nova-vm/first-boot.d/defaults rename to elements/nova-vm/first-boot.d/defaults diff --git a/flavours/nova-vm/install.d/05-controller-code-deps b/elements/nova-vm/install.d/05-controller-code-deps similarity index 100% rename from flavours/nova-vm/install.d/05-controller-code-deps rename to elements/nova-vm/install.d/05-controller-code-deps diff --git a/flavours/nova-vm/install.d/10-controller-openstack-deps b/elements/nova-vm/install.d/10-controller-openstack-deps similarity index 100% rename from flavours/nova-vm/install.d/10-controller-openstack-deps rename to elements/nova-vm/install.d/10-controller-openstack-deps diff --git a/flavours/nova-vm/install.d/20-dkms-iscsi b/elements/nova-vm/install.d/20-dkms-iscsi similarity index 100% rename from flavours/nova-vm/install.d/20-dkms-iscsi rename to elements/nova-vm/install.d/20-dkms-iscsi diff --git a/flavours/nova-vm/install.d/99-clean-apt b/elements/nova-vm/install.d/99-clean-apt similarity index 100% rename from flavours/nova-vm/install.d/99-clean-apt rename to elements/nova-vm/install.d/99-clean-apt diff --git a/flavours/salt-master/README.md b/elements/salt-master/README.md similarity index 100% rename from flavours/salt-master/README.md rename to elements/salt-master/README.md diff --git a/flavours/salt-master/install.d/10-salt-master b/elements/salt-master/install.d/10-salt-master similarity index 100% rename from flavours/salt-master/install.d/10-salt-master rename to elements/salt-master/install.d/10-salt-master diff --git a/flavours/salt-master/pre-install.d/10-salt-master b/elements/salt-master/pre-install.d/10-salt-master similarity index 100% rename from flavours/salt-master/pre-install.d/10-salt-master rename to elements/salt-master/pre-install.d/10-salt-master diff --git a/flavours/salt-minion/README.md b/elements/salt-minion/README.md similarity index 100% rename from flavours/salt-minion/README.md rename to elements/salt-minion/README.md diff --git a/flavours/salt-minion/install.d/10-salt-minion b/elements/salt-minion/install.d/10-salt-minion similarity index 100% rename from flavours/salt-minion/install.d/10-salt-minion rename to elements/salt-minion/install.d/10-salt-minion diff --git a/flavours/salt-minion/pre-install.d/10-salt-minion b/elements/salt-minion/pre-install.d/10-salt-minion similarity index 100% rename from flavours/salt-minion/pre-install.d/10-salt-minion rename to elements/salt-minion/pre-install.d/10-salt-minion diff --git a/flavours/swift/README.md b/elements/swift/README.md similarity index 100% rename from flavours/swift/README.md rename to elements/swift/README.md diff --git a/flavours/swift/install.d/10-swift-deps b/elements/swift/install.d/10-swift-deps similarity index 100% rename from flavours/swift/install.d/10-swift-deps rename to elements/swift/install.d/10-swift-deps diff --git a/flavours/vm/README.md b/elements/vm/README.md similarity index 100% rename from flavours/vm/README.md rename to elements/vm/README.md diff --git a/flavours/vm/block-device.d/10-partition b/elements/vm/block-device.d/10-partition similarity index 100% rename from flavours/vm/block-device.d/10-partition rename to elements/vm/block-device.d/10-partition diff --git a/flavours/deploy/README.md b/flavours/deploy/README.md deleted file mode 100644 index fa92566a..00000000 --- a/flavours/deploy/README.md +++ /dev/null @@ -1,2 +0,0 @@ -This flavour is for booting baremetal nodes. -It does some iSCSI setup and fetches a disk image diff --git a/flavours/hwburnin/README.md b/flavours/hwburnin/README.md deleted file mode 100644 index 8cb09c03..00000000 --- a/flavours/hwburnin/README.md +++ /dev/null @@ -1,2 +0,0 @@ -This flavour is intended to be used to test hardware. -It will exercise RAM and disks. diff --git a/flavours/hwdiscovery/README.md b/flavours/hwdiscovery/README.md deleted file mode 100644 index 718c26c7..00000000 --- a/flavours/hwdiscovery/README.md +++ /dev/null @@ -1 +0,0 @@ -This flavour will examing the available hardware it boots on, and report it to an inventory service. diff --git a/flavours/mellanox/README.md b/flavours/mellanox/README.md deleted file mode 100644 index c3932d57..00000000 --- a/flavours/mellanox/README.md +++ /dev/null @@ -1 +0,0 @@ -Flavour to force support for mellanox hardware diff --git a/lib/common-functions b/lib/common-functions index 74ef53fa..c123c074 100644 --- a/lib/common-functions +++ b/lib/common-functions @@ -38,14 +38,14 @@ function save_image () { function generate_hooks () { mkdir -p $TMP_HOOKS_PATH - for _FLAVOUR in $IMAGE_FLAVOUR ; do - [ -d $FLAVOURS_DIR/$_FLAVOUR ] || die "The flavour does not exist." ; - cp -t $TMP_HOOKS_PATH -a $FLAVOURS_DIR/$_FLAVOUR/* ; + for _ELEMENT in $IMAGE_ELEMENT ; do + [ -d $ELEMENTS_DIR/$_ELEMENT ] || die "The element does not exist." ; + cp -t $TMP_HOOKS_PATH -a $ELEMENTS_DIR/$_ELEMENT/* ; done } -# Check that a real flavour has been chosen (prevents foot-guns) -function check_flavour () { +# Check that a real element has been chosen (prevents foot-guns) +function check_element () { [ -d $TMP_HOOKS_PATH ] || generate_hooks } diff --git a/lib/img-defaults b/lib/img-defaults index 7ad8ff50..193ef740 100644 --- a/lib/img-defaults +++ b/lib/img-defaults @@ -24,6 +24,6 @@ IMAGE_TYPE=${IMAGE_TYPE:-qcow2} IMAGE_NAME=${IMAGE_NAME:-image} export IMAGE_SIZE=${IMAGE_SIZE:-2} # N.B. This size is in GB # Set via the CLI normally. -# IMAGE_FLAVOUR= +# IMAGE_ELEMENT= IMG_PATH=~/.cache/image-create -FLAVOURS_DIR=$(dirname $0)/../flavours +ELEMENTS_DIR=$(dirname $0)/../elements diff --git a/lib/img-functions b/lib/img-functions index a73face3..f41d4a41 100644 --- a/lib/img-functions +++ b/lib/img-functions @@ -115,7 +115,7 @@ function run_in_target() { # Helper function to run a directory of scripts inside the chroot function run_d_in_target() { - check_flavour + check_element # If we can find a directory of hooks to run in the target filesystem, bind # mount it into the target and then execute run-parts in a chroot if [ -d ${TMP_HOOKS_PATH}/$1.d ] ; then @@ -130,7 +130,7 @@ function run_d_in_target() { # Run a directory of hooks outside the target. function run_d() { - check_flavour + check_element if [ -d ${TMP_HOOKS_PATH}/$1.d ] ; then run-parts ${TMP_HOOKS_PATH}/$1.d fi @@ -220,7 +220,7 @@ function do_pre_install () { run_in_target apt-get -y update run_in_target apt-get -y install python-software-properties run_in_target add-apt-repository -y ppa:tripleo/demo - # Uncomment to get the bleeding edge - this should be a flavour thing. + # Uncomment to get the bleeding edge - this should be an element thing. # run_in_target add-apt-repository -y ppa:tripleo/demo-staging # Run pre-install scripts. These do things that prepare the chroot for package installs run_d_in_target pre-install diff --git a/lib/ramdisk-defaults b/lib/ramdisk-defaults index ce4d3a55..231d6c37 100644 --- a/lib/ramdisk-defaults +++ b/lib/ramdisk-defaults @@ -4,4 +4,4 @@ MODULE_ROOT=${MODULE_ROOT:-""} LIB_UDEV_ROOT=${LIB_UDEV_ROOT:-""} BUSYBOX=${BUSYBOX:-$(which busybox)} IMAGE_NAME=${IMAGE_NAME:-"ramdisk"} -FLAVOURS_DIR=$(dirname $0)/../flavours +ELEMENTS_DIR=$(dirname $0)/../elements diff --git a/lib/ramdisk-functions b/lib/ramdisk-functions index 046bc971..d7d6d8f1 100644 --- a/lib/ramdisk-functions +++ b/lib/ramdisk-functions @@ -13,8 +13,8 @@ function cleanup () { function ensure_binaries() { BINARY_DEPS="${BUSYBOX}" - for _FLVR in ${RAMDISK_FLAVOUR} ; do - _FILE="${FLAVOURS_DIR}/${_FLVR}/binary-deps" + for _FLVR in ${RAMDISK_ELEMENT} ; do + _FILE="${ELEMENTS_DIR}/${_FLVR}/binary-deps" if [ -a $_FILE ]; then for _LINE in $(cat $_FILE) ; do BINARY_DEPS="${BINARY_DEPS} $_LINE" @@ -119,9 +119,9 @@ function populate_init () { cp "$F" "$TMP_MOUNT_PATH" done - # Append /init with any flavour fragments that are present - for _FLVR in ${RAMDISK_FLAVOUR} ; do - _FILE="${FLAVOURS_DIR}/${_FLVR}/init" + # Append /init with any element fragments that are present + for _FLVR in ${RAMDISK_ELEMENT} ; do + _FILE="${ELEMENTS_DIR}/${_FLVR}/init" if [ -a $_FILE ]; then cat >>$TMP_MOUNT_PATH/init <