Migrate to package-installs scripts
Migrating install-packages commands to package-installs-* scripts where possible. This patch is broken up into multiple parts to minimize impact and review overhead. Change-Id: Idd1be32149e7238d53d04a34170c5029dda83f1f
This commit is contained in:
Gregory Haynes
parent
2a656d8c88
commit
dad3c0ccf1
|
|
@ -1,3 +1,4 @@
|
|||
os-apply-config
|
||||
os-refresh-config
|
||||
os-svc-install
|
||||
package-installs
|
||||
|
|
|
|||
|
|
@ -3,8 +3,6 @@
|
|||
|
||||
set -eux
|
||||
|
||||
install-packages apache2
|
||||
|
||||
if [ -f /etc/debian_version ]; then
|
||||
install-packages ssl-cert
|
||||
fi
|
||||
|
|
|
|||
|
|
@ -0,0 +1 @@
|
|||
apache2
|
||||
|
|
@ -1,3 +1,4 @@
|
|||
nova-compute
|
||||
os-refresh-config
|
||||
os-svc-install
|
||||
package-installs
|
||||
|
|
|
|||
|
|
@ -1,8 +1,6 @@
|
|||
#!/bin/bash
|
||||
set -eux
|
||||
|
||||
install-packages dnsmasq dnsmasq-utils
|
||||
|
||||
function install_dnsmasq_upstart() {
|
||||
cat > /etc/init/nova-bm-dnsmasq.conf << eof
|
||||
start on runlevel [2345]
|
||||
|
|
|
|||
|
|
@ -0,0 +1,2 @@
|
|||
dnsmasq
|
||||
dnsmasq-utils
|
||||
|
|
@ -11,4 +11,5 @@ openstack-clients
|
|||
os-apply-config
|
||||
os-refresh-config
|
||||
os-svc-install
|
||||
package-installs
|
||||
sysctl
|
||||
|
|
|
|||
|
|
@ -1,8 +1,6 @@
|
|||
#!/bin/bash
|
||||
set -eux
|
||||
|
||||
install-packages git build-essential python-dev libssl-dev
|
||||
|
||||
install -m 0755 -o root -g root -d /opt/stack/boot-stack
|
||||
|
||||
# tools
|
||||
|
|
|
|||
|
|
@ -0,0 +1,4 @@
|
|||
build-essential
|
||||
git
|
||||
libssl-dev
|
||||
python-dev
|
||||
|
|
@ -1,7 +1,6 @@
|
|||
#!/bin/bash
|
||||
set -eux
|
||||
|
||||
install-packages libvirt-dev
|
||||
$CEILOMETER_VENV_DIR/bin/pip install libvirt-python
|
||||
|
||||
os-svc-daemon -i "$CEILOMETER_VENV_DIR" ceilometer-agent-compute ceilometer ceilometer-agent-compute --config-dir /etc/ceilometer
|
||||
|
|
|
|||
|
|
@ -0,0 +1 @@
|
|||
libvirt-dev
|
||||
|
|
@ -1,7 +1,6 @@
|
|||
#!/bin/bash
|
||||
set -eux
|
||||
|
||||
install-packages libffi-dev libssl-dev
|
||||
os-svc-install $CEILOMETER_EXTRA_INSTALL_OPTS -i "$CEILOMETER_VENV_DIR" -u ceilometer -r /opt/stack/ceilometer
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -0,0 +1,2 @@
|
|||
libffi-dev
|
||||
libssl-dev
|
||||
|
|
@ -1,3 +1,4 @@
|
|||
iptables
|
||||
os-refresh-config
|
||||
os-svc-install
|
||||
package-installs
|
||||
|
|
|
|||
|
|
@ -5,7 +5,6 @@
|
|||
set -eux
|
||||
set -o pipefail
|
||||
|
||||
install-packages xinetd check-mk-agent check-mk-agent-logwatch
|
||||
# check_mk is disabled by default so we need to enable it here
|
||||
sed -i "s/\tdisable = yes/\tdisable = no/g" /etc/xinetd.d/check_mk
|
||||
|
||||
|
|
|
|||
|
|
@ -0,0 +1,3 @@
|
|||
check-mk-agent
|
||||
check-mk-agent-logwatch
|
||||
xinetd
|
||||
|
|
@ -1 +1,2 @@
|
|||
cinder-volume
|
||||
cinder-volume
|
||||
package-installs
|
||||
|
|
|
|||
|
|
@ -1,5 +0,0 @@
|
|||
#!/bin/bash
|
||||
|
||||
set -eux
|
||||
|
||||
install-packages python-rtslib
|
||||
|
|
@ -0,0 +1 @@
|
|||
python-rtslib
|
||||
|
|
@ -1 +1,2 @@
|
|||
cinder-volume
|
||||
package-installs
|
||||
|
|
|
|||
|
|
@ -2,7 +2,5 @@
|
|||
|
||||
set -eux
|
||||
|
||||
install-packages tgt
|
||||
|
||||
mkdir -p /etc/tgt/conf.d
|
||||
echo 'include /mnt/state/var/lib/cinder/volumes/*' > /etc/tgt/conf.d/cinder.conf
|
||||
|
|
|
|||
|
|
@ -0,0 +1 @@
|
|||
tgt
|
||||
|
|
@ -1,3 +1,4 @@
|
|||
os-apply-config
|
||||
os-refresh-config
|
||||
os-svc-install
|
||||
package-installs
|
||||
|
|
|
|||
|
|
@ -1,5 +0,0 @@
|
|||
#!/bin/bash
|
||||
|
||||
set -eux
|
||||
|
||||
install-packages corosync
|
||||
|
|
@ -0,0 +1 @@
|
|||
corosync
|
||||
|
|
@ -1,2 +1,3 @@
|
|||
sysctl
|
||||
os-svc-install
|
||||
package-installs
|
||||
sysctl
|
||||
|
|
|
|||
|
|
@ -2,8 +2,6 @@
|
|||
|
||||
set -eux
|
||||
|
||||
install-packages haproxy
|
||||
|
||||
[ -d /var/lib/haproxy ] || install -d -D -m 0755 -o root -g root /var/lib/haproxy
|
||||
|
||||
# haproxy service has to be explicitly enabled in /etc/default/haproxy on ubuntu/debian systems
|
||||
|
|
|
|||
|
|
@ -0,0 +1 @@
|
|||
haproxy
|
||||
|
|
@ -1 +1,2 @@
|
|||
package-installs
|
||||
pip-and-virtualenv
|
||||
|
|
|
|||
|
|
@ -2,8 +2,6 @@
|
|||
|
||||
set -uex
|
||||
|
||||
install-packages python-psutil gcc python-dev
|
||||
|
||||
if [[ "fedora" = "$DISTRO_NAME" ]]; then
|
||||
# Remove the pre-installed package version of heat-cfntools
|
||||
yum remove -y heat-cfntools
|
||||
|
|
|
|||
|
|
@ -0,0 +1,3 @@
|
|||
gcc
|
||||
python-dev
|
||||
python-psutil
|
||||
|
|
@ -1,3 +1,4 @@
|
|||
heat
|
||||
os-apply-config
|
||||
os-is-bootstrap-host
|
||||
package-installs
|
||||
|
|
|
|||
|
|
@ -1,5 +0,0 @@
|
|||
#!/bin/bash
|
||||
|
||||
set -eux
|
||||
|
||||
install-packages openstack-heat-engine
|
||||
|
|
@ -0,0 +1 @@
|
|||
openstack-heat-engine
|
||||
|
|
@ -1,8 +1,6 @@
|
|||
#!/bin/bash
|
||||
set -eu
|
||||
|
||||
install-packages python-mysqldb
|
||||
|
||||
cp -r /opt/stack/heat/etc/heat/environment.d /etc/heat
|
||||
cp -r /opt/stack/heat/etc/heat/templates /etc/heat
|
||||
|
||||
|
|
|
|||
|
|
@ -0,0 +1 @@
|
|||
python-mysqldb
|
||||
|
|
@ -1,9 +1,6 @@
|
|||
#!/bin/bash
|
||||
set -eux
|
||||
|
||||
# need the libssl header files
|
||||
install-packages libssl-dev
|
||||
|
||||
os-svc-install $IRONIC_EXTRA_INSTALL_OPTS -i "$IRONIC_VENV_DIR" -u ironic -r /opt/stack/ironic
|
||||
|
||||
install -d -m 0750 -o ironic -g ironic /etc/ironic
|
||||
|
|
|
|||
|
|
@ -0,0 +1,2 @@
|
|||
# need the libssl header files
|
||||
libssl-dev
|
||||
|
|
@ -1 +1,2 @@
|
|||
os-svc-install
|
||||
package-installs
|
||||
|
|
|
|||
|
|
@ -2,8 +2,6 @@
|
|||
|
||||
set -eux
|
||||
|
||||
install-packages keepalived psmisc
|
||||
|
||||
[ -d /var/log/keepalived ] || install -d -o root -g root -m 0775 /var/log/keepalived
|
||||
register-state-path --leave-symlink /var/log/keepalived
|
||||
|
||||
|
|
|
|||
|
|
@ -0,0 +1,2 @@
|
|||
keepalived
|
||||
psmisc
|
||||
|
|
@ -1,5 +0,0 @@
|
|||
#!/bin/bash
|
||||
|
||||
set -eux
|
||||
|
||||
install-packages libmariadb-dev
|
||||
|
|
@ -0,0 +1 @@
|
|||
libmariadb-dev
|
||||
|
|
@ -2,8 +2,6 @@
|
|||
|
||||
set -eux
|
||||
|
||||
install-packages libmariadb-dev
|
||||
|
||||
# TODO: fedora mysql_config has to be tweaked to exclude probes_mysql lib
|
||||
# https://mariadb.atlassian.net/browse/MDEV-5793
|
||||
FILE=$(which mysql_config)
|
||||
|
|
|
|||
|
|
@ -0,0 +1 @@
|
|||
libmariadb-dev
|
||||
|
|
@ -1 +1,2 @@
|
|||
os-svc-install
|
||||
package-installs
|
||||
|
|
|
|||
|
|
@ -2,8 +2,6 @@
|
|||
|
||||
set -eux
|
||||
|
||||
install-packages memcached
|
||||
|
||||
# On debian-based distros set memcached daemon to listen on port 0.0.0.0
|
||||
# This is the default on RedHat-based distros.
|
||||
# Without this setting the memcached daemon will suffer connection errors
|
||||
|
|
|
|||
|
|
@ -0,0 +1 @@
|
|||
memcached
|
||||
|
|
@ -2,4 +2,5 @@ iptables
|
|||
os-apply-config
|
||||
os-is-bootstrap-host
|
||||
os-refresh-config
|
||||
package-installs
|
||||
use-ephemeral
|
||||
|
|
|
|||
|
|
@ -1,7 +0,0 @@
|
|||
#!/bin/bash
|
||||
|
||||
# Install python-mysqldb - Needed by 50-mysql-users
|
||||
set -e
|
||||
set -o xtrace
|
||||
|
||||
install-packages python-mysqldb
|
||||
|
|
@ -0,0 +1 @@
|
|||
python-mysqldb
|
||||
|
|
@ -1,3 +1,4 @@
|
|||
mysql-common
|
||||
os-svc-install
|
||||
package-installs
|
||||
use-ephemeral
|
||||
|
|
|
|||
|
|
@ -0,0 +1,4 @@
|
|||
libaio1
|
||||
lsof
|
||||
pv
|
||||
rsync
|
||||
|
|
@ -1,4 +1,5 @@
|
|||
apache2
|
||||
os-apply-config
|
||||
os-refresh-config
|
||||
package-installs
|
||||
postfix
|
||||
|
|
|
|||
|
|
@ -1,8 +1,6 @@
|
|||
#!/bin/bash
|
||||
set -eux
|
||||
|
||||
install-packages nagios3
|
||||
|
||||
# set check_external_commands
|
||||
sed -i "s/check_external_commands=0/check_external_commands=1/" /etc/nagios3/nagios.cfg
|
||||
# fix a minior display issue
|
||||
|
|
|
|||
|
|
@ -0,0 +1 @@
|
|||
nagios3
|
||||
|
|
@ -1 +1,2 @@
|
|||
neutron
|
||||
package-installs
|
||||
|
|
|
|||
|
|
@ -2,8 +2,6 @@
|
|||
|
||||
set -eux
|
||||
|
||||
install-packages openstack-neutron openstack-neutron-ml2
|
||||
|
||||
if [[ "rhel rhel7 centos7 fedora" =~ "$DISTRO_NAME" ]]; then
|
||||
ln -s /etc/neutron/plugins/ml2/ml2_conf.ini /etc/neutron/plugin.ini
|
||||
|
||||
|
|
|
|||
|
|
@ -0,0 +1,2 @@
|
|||
openstack-neutron
|
||||
openstack-neutron-ml2
|
||||
|
|
@ -2,3 +2,4 @@ iptables
|
|||
nova
|
||||
nova-novncproxy
|
||||
os-is-bootstrap-host
|
||||
package-installs
|
||||
|
|
|
|||
|
|
@ -1,10 +0,0 @@
|
|||
#!/bin/bash
|
||||
|
||||
set -eux
|
||||
|
||||
install-packages \
|
||||
openstack-nova-api \
|
||||
openstack-nova-scheduler \
|
||||
openstack-nova-conductor \
|
||||
openstack-nova-console \
|
||||
openstack-nova-cert
|
||||
|
|
@ -0,0 +1,5 @@
|
|||
openstack-nova-api
|
||||
openstack-nova-cert
|
||||
openstack-nova-conductor
|
||||
openstack-nova-console
|
||||
openstack-nova-scheduler
|
||||
|
|
@ -2,4 +2,5 @@ nova-compute
|
|||
os-apply-config
|
||||
os-refresh-config
|
||||
os-svc-install
|
||||
package-installs
|
||||
use-ephemeral
|
||||
|
|
|
|||
|
|
@ -1,9 +1,6 @@
|
|||
#!/bin/bash
|
||||
set -eux
|
||||
|
||||
# for libvirt clouds only
|
||||
install-packages libvirt-bin python-libvirt kvm pm-utils kpartx
|
||||
|
||||
# Fedora don't always have the libvirtd group created
|
||||
if ! grep ^libvirtd /etc/group > /dev/null 2>&1; then
|
||||
groupadd -f libvirtd
|
||||
|
|
|
|||
|
|
@ -0,0 +1,5 @@
|
|||
kpartx
|
||||
kvm
|
||||
libvirt-bin
|
||||
python-libvirt
|
||||
pm-utils
|
||||
|
|
@ -1 +1,2 @@
|
|||
nova
|
||||
package-installs
|
||||
|
|
|
|||
|
|
@ -1,7 +0,0 @@
|
|||
#!/bin/bash
|
||||
|
||||
set -eux
|
||||
|
||||
install-packages openstack-nova-novncproxy
|
||||
|
||||
install-packages novnc
|
||||
|
|
@ -0,0 +1,2 @@
|
|||
novnc
|
||||
openstack-nova-novncproxy
|
||||
|
|
@ -1,2 +1,3 @@
|
|||
os-refresh-config
|
||||
package-installs
|
||||
pip-manifest
|
||||
|
|
|
|||
|
|
@ -1,5 +0,0 @@
|
|||
#!/bin/bash
|
||||
|
||||
set -eux
|
||||
|
||||
install-packages os-apply-config
|
||||
|
|
@ -0,0 +1 @@
|
|||
os-apply-config
|
||||
|
|
@ -1,5 +1,6 @@
|
|||
os-apply-config
|
||||
os-refresh-config
|
||||
os-svc-install
|
||||
package-installs
|
||||
pip-manifest
|
||||
source-repositories
|
||||
|
|
|
|||
|
|
@ -1,7 +0,0 @@
|
|||
#!/bin/bash
|
||||
|
||||
set -eux
|
||||
|
||||
install-packages os-collect-config
|
||||
|
||||
os-svc-enable -n os-collect-config
|
||||
|
|
@ -0,0 +1 @@
|
|||
os-collect-config
|
||||
|
|
@ -3,8 +3,6 @@ set -eux
|
|||
|
||||
manifest=$(get-pip-manifest os-collect-config)
|
||||
|
||||
install-packages build-essential libz-dev libxslt-dev libxml2-dev python-dev
|
||||
|
||||
virtualenv --setuptools /opt/stack/venvs/os-collect-config
|
||||
set +u
|
||||
source /opt/stack/venvs/os-collect-config/bin/activate
|
||||
|
|
|
|||
|
|
@ -0,0 +1,5 @@
|
|||
build-essential
|
||||
libxml2-dev
|
||||
libz-dev
|
||||
libxslt-dev
|
||||
python-dev
|
||||
|
|
@ -1,5 +1,6 @@
|
|||
os-apply-config
|
||||
os-collect-config
|
||||
package-installs
|
||||
pip-and-virtualenv
|
||||
pip-manifest
|
||||
source-repositories
|
||||
|
|
|
|||
|
|
@ -1,5 +0,0 @@
|
|||
#!/bin/bash
|
||||
|
||||
set -eux
|
||||
|
||||
install-packages os-refresh-config
|
||||
|
|
@ -0,0 +1 @@
|
|||
os-refresh-config
|
||||
|
|
@ -3,3 +3,4 @@ os-apply-config
|
|||
os-is-bootstrap-host
|
||||
os-refresh-config
|
||||
os-svc-install
|
||||
package-installs
|
||||
|
|
|
|||
|
|
@ -1,5 +0,0 @@
|
|||
#!/bin/bash
|
||||
|
||||
set -eux
|
||||
|
||||
install-packages pacemaker
|
||||
|
|
@ -0,0 +1 @@
|
|||
pacemaker
|
||||
|
|
@ -1 +1,2 @@
|
|||
package-installs
|
||||
source-repositories
|
||||
|
|
|
|||
|
|
@ -1,5 +0,0 @@
|
|||
#!/bin/bash
|
||||
|
||||
set -eux
|
||||
|
||||
install-packages python-pip python-virtualenv
|
||||
|
|
@ -0,0 +1,2 @@
|
|||
python-pip
|
||||
python-virtualenv
|
||||
|
|
@ -1,2 +1,3 @@
|
|||
os-apply-config
|
||||
os-refresh-config
|
||||
package-installs
|
||||
|
|
|
|||
|
|
@ -1,4 +0,0 @@
|
|||
#!/bin/bash
|
||||
set -eux
|
||||
|
||||
install-packages postfix
|
||||
|
|
@ -0,0 +1 @@
|
|||
postfix
|
||||
|
|
@ -3,5 +3,6 @@ os-apply-config
|
|||
os-is-bootstrap-host
|
||||
os-refresh-config
|
||||
os-svc-install
|
||||
package-installs
|
||||
sysctl
|
||||
use-ephemeral
|
||||
|
|
|
|||
|
|
@ -0,0 +1 @@
|
|||
rabbitmq-server
|
||||
|
|
@ -1,2 +1,3 @@
|
|||
package-installs
|
||||
swift
|
||||
use-ephemeral
|
||||
|
|
|
|||
|
|
@ -2,8 +2,6 @@
|
|||
|
||||
set -eux
|
||||
|
||||
install-packages rsync
|
||||
|
||||
cat > /etc/cron.d/swift-recon <<EOF
|
||||
# Cronjob to track async pending on the object server.
|
||||
SHELL=/bin/sh
|
||||
|
|
|
|||
|
|
@ -0,0 +1 @@
|
|||
rsync
|
||||
|
|
@ -1,9 +0,0 @@
|
|||
#!/bin/bash
|
||||
|
||||
set -eux
|
||||
|
||||
install-packages \
|
||||
openstack-swift-storage \
|
||||
openstack-swift-account \
|
||||
openstack-swift-container \
|
||||
openstack-swift-object
|
||||
|
|
@ -0,0 +1,4 @@
|
|||
openstack-swift-account
|
||||
openstack-swift-container
|
||||
openstack-swift-object
|
||||
openstack-swift-storage
|
||||
|
|
@ -1,2 +1,3 @@
|
|||
os-svc-install
|
||||
selinux
|
||||
package-installs
|
||||
selinux
|
||||
|
|
|
|||
|
|
@ -1,5 +0,0 @@
|
|||
#!/bin/bash
|
||||
|
||||
set -eux
|
||||
|
||||
install-packages openstack-swift
|
||||
|
|
@ -0,0 +1 @@
|
|||
openstack-swift
|
||||
|
|
@ -2,8 +2,6 @@
|
|||
|
||||
set -eux
|
||||
|
||||
install-packages libffi-dev
|
||||
|
||||
os-svc-install $SWIFT_EXTRA_INSTALL_OPTS -i "$SWIFT_VENV_DIR" -u swift -r /opt/stack/swift
|
||||
|
||||
ln -s $SWIFT_VENV_DIR/bin/swift-ring-builder /usr/local/bin/swift-ring-builder
|
||||
|
|
|
|||
|
|
@ -0,0 +1 @@
|
|||
libffi-dev
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue