97c01e48ed
Currently we have all our elements and library files in a top-level directory and install them into <root>/share/diskimage-builder/[elements|lib] (where root is either / or the root of a virtualenv). The problem with this is that editable/development installs (pip -e) do *not* install data_files. Thus we have no canonical location to look for elements -- leading to the various odd things we do such as a whole bunch of guessing at the top of disk-image-create and having a special test-loader in tests/test_elements.py so we can run python unit tests on those elements that have it. data_files is really the wrong thing to use for what are essentially assets of the program. data_files install works well for things like config-files, init.d files or dropping documentation files. By moving the elements under the diskimage_builder package, we always know where they are relative to where we import from. In fact, pkg_resources has an api for this which we wrap in the new diskimage_builder/paths.py helper [1]. We use this helper to find the correct path in the couple of places we need to find the base-elements dir, and for the paths to import the library shell functions. Elements such as svc-map and pkg-map include python unit-tests, which we do not need tests/test_elements.py to special-case load any more. They just get found automatically by the normal subunit loader. I have a follow-on change (I69ca3d26fede0506a6353c077c69f735c8d84d28) to move disk-image-create to a regular python entry-point. Unfortunately, this has to move to work with setuptools. You'd think a symlink under diskimage_builder/[elements|lib] would work, but it doesn't. [1] this API handles stuff like getting files out of .zip archive modules, which we don't do. Essentially for us it's returning __file__. Change-Id: I5e3e3c97f385b1a4ff2031a161a55b231895df5b
138 lines
3.2 KiB
Bash
Executable file
138 lines
3.2 KiB
Bash
Executable file
#!/bin/bash
|
|
# Copyright (c) 2014 Hewlett-Packard Development Company, L.P.
|
|
#
|
|
# Licensed under the Apache License, Version 2.0 (the "License");
|
|
# you may not use this file except in compliance with the License.
|
|
# You may obtain a copy of the License at
|
|
#
|
|
# http://www.apache.org/licenses/LICENSE-2.0
|
|
#
|
|
# Unless required by applicable law or agreed to in writing, software
|
|
# distributed under the License is distributed on an "AS IS" BASIS,
|
|
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
|
|
# implied.
|
|
#
|
|
# See the License for the specific language governing permissions and
|
|
# limitations under the License.
|
|
|
|
if [ ${DIB_DEBUG_TRACE:-0} -gt 0 ]; then
|
|
set -x
|
|
fi
|
|
set -eu
|
|
set -o pipefail
|
|
|
|
cd /tmp/nova-agent
|
|
./installer.sh
|
|
|
|
cat > /etc/cloud/cloud.cfg.d/80_restart_network.cfg <<'EOF'
|
|
# Restart networking if it's got no IP. This is to catch if we're on RAX
|
|
# and the baked in dhcp config didn't work, but is now probably reconfigured
|
|
# by nova-agent
|
|
runcmd:
|
|
- ip addr show eth0 | grep inet || ( ifdown -a ; ifup -a )
|
|
EOF
|
|
|
|
case "$DISTRO_NAME" in
|
|
'ubuntu'|'debian')
|
|
|
|
# cloud-init / nova-agent sad panda hacks
|
|
cat > /etc/init/nova-agent.conf <<'EOF'
|
|
# nova-agent - start before cloud-init and hup network interfaces
|
|
start on starting cloud-init-local
|
|
|
|
task
|
|
|
|
console output
|
|
|
|
script
|
|
/etc/init.d/nova-agent start
|
|
sleep 13
|
|
ifdown -a
|
|
ifup -a
|
|
end script
|
|
EOF
|
|
|
|
cat > /etc/init/xe-linux-distribution.conf <<'EOF'
|
|
# xe-linux-distribution - start the xentools before nova-agent runs
|
|
start on starting nova-agent
|
|
|
|
task
|
|
|
|
console output
|
|
|
|
script
|
|
/etc/init.d/xe-linux-distribution start
|
|
sleep 2
|
|
end script
|
|
EOF
|
|
|
|
# stop nova-agent from starting twice since we start it from upstart now
|
|
update-rc.d -f nova-agent remove
|
|
update-rc.d -f xe-linux-distribution remove
|
|
|
|
# console fix for PV Ubuntus
|
|
cat > /etc/init/hvc0.conf <<'EOF'
|
|
|
|
# hvc0 - getty
|
|
#
|
|
# This service maintains a getty on hvc0 from the point the system is
|
|
# started until it is shut down again.
|
|
|
|
start on stopped rc RUNLEVEL=[2345]
|
|
stop on runlevel [!2345]
|
|
|
|
respawn
|
|
exec /sbin/getty -L 115200 hvc0 vt102
|
|
EOF
|
|
;;
|
|
'fedora'|'centos'|'centos7'|'opensuse')
|
|
|
|
cat > /usr/local/bin/run-nova-agent.sh <<'EOF'
|
|
#!/bin/bash
|
|
/etc/init.d/nova-agent start
|
|
sleep 13
|
|
ifdown -a
|
|
ifup -a
|
|
EOF
|
|
chmod 0755 /usr/local/bin/run-nova-agent.sh
|
|
|
|
cat > /usr/local/bin/run-xe-linux-distribution.sh <<'EOF'
|
|
#!/bin/bash
|
|
/etc/init.d/xe-linux-distribution start
|
|
sleep 2
|
|
EOF
|
|
chmod 0755 /usr/local/bin/run-xe-linux-distribution.sh
|
|
|
|
cat > /etc/systemd/system/nova-agent.service <<EOF
|
|
[Unit]
|
|
Description=Rackspace nova-agent
|
|
Before=cloud-init-local
|
|
Wants=cloud-init-local
|
|
|
|
[Service]
|
|
ExecStart=/usr/local/bin/run-nova-agent.sh
|
|
|
|
[Install]
|
|
WantedBy=multi-user.target
|
|
EOF
|
|
|
|
cat > /etc/systemd/system/xe-linux-distribution.service <<'EOF'
|
|
[Unit]
|
|
Description=xentools agent
|
|
Before=nova-agent
|
|
Wants=nova-agent
|
|
|
|
[Service]
|
|
ExecStart=/usr/local/bin/run-xe-linux-distribution.sh
|
|
|
|
[Install]
|
|
WantedBy=multi-user.target
|
|
EOF
|
|
# stop nova-agent from starting twice since we start it from systemd now
|
|
chkconfig nova-agent off
|
|
chkconfig xe-linux-distribution off
|
|
|
|
systemctl enable nova-agent
|
|
systemctl enable xe-linux-distribution
|
|
;;
|
|
esac
|