From dad3c0ccf1d95111630362f6b022c2cb2e1c6885 Mon Sep 17 00:00:00 2001 From: Gregory Haynes Date: Tue, 9 Sep 2014 17:59:35 -0700 Subject: [PATCH] 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 --- elements/apache2/element-deps | 1 + elements/apache2/install.d/15-apache2 | 2 -- elements/apache2/install.d/package-installs-apache2 | 1 + elements/bm-dnsmasq/element-deps | 1 + elements/bm-dnsmasq/install.d/81-bm-dnsmasq | 2 -- .../bm-dnsmasq/install.d/package-installs-bm-dnsmasq | 2 ++ elements/boot-stack/element-deps | 1 + elements/boot-stack/install.d/01-boot-stack | 2 -- .../boot-stack/install.d/package-installs-boot-stack | 4 ++++ .../69-ceilometer-agent-compute | 1 - .../package-installs-ceilometer-agent-compute | 1 + .../install.d/ceilometer-source-install/68-ceilometer | 1 - .../ceilometer/install.d/package-installs-ceilometer | 2 ++ elements/check_mk-agent/element-deps | 1 + elements/check_mk-agent/install.d/05-check_mk-agent | 1 - .../install.d/package-installs-check_mk-agent | 3 +++ elements/cinder-lio/element-deps | 3 ++- elements/cinder-lio/install.d/72-cinder-lio | 5 ----- .../cinder-lio/install.d/package-installs-cinder-lio | 1 + elements/cinder-tgt/element-deps | 1 + elements/cinder-tgt/install.d/72-cinder-tgt | 2 -- .../cinder-tgt/install.d/package-installs-cinder-tgt | 1 + elements/corosync/element-deps | 1 + elements/corosync/install.d/14-corosync | 5 ----- elements/corosync/install.d/package-installs-corosync | 1 + elements/haproxy/element-deps | 3 ++- elements/haproxy/install.d/76-haproxy | 2 -- elements/haproxy/install.d/package-installs-haproxy | 1 + elements/heat-cfntools/element-deps | 1 + elements/heat-cfntools/install.d/05-heat-cfntools | 2 -- .../install.d/package-installs-heat-cfntools | 3 +++ elements/heat-engine/element-deps | 1 + .../install.d/heat-package-install/10-heat-engine | 5 ----- .../heat-package-install/package-installs-heat-engine | 1 + .../install.d/heat-source-install/10-heat-engine | 2 -- .../heat-source-install/package-installs-heat-engine | 1 + .../ironic/install.d/ironic-source-install/68-ironic | 3 --- elements/ironic/install.d/package-installs-ironic | 2 ++ elements/keepalived/element-deps | 1 + elements/keepalived/install.d/76-keepalived | 2 -- .../keepalived/install.d/package-installs-keepalived | 2 ++ elements/mariadb-dev-rpm/install.d/03-mariadb-rpm-dev | 5 ----- .../install.d/package-installs-mariadb-dev-rpm | 1 + elements/mariadb-dev/install.d/03-mariadb-dev | 2 -- .../mariadb-dev/install.d/package-installs-mariadb-dev | 1 + elements/memcached/element-deps | 1 + elements/memcached/install.d/74-memcached | 2 -- .../memcached/install.d/package-installs-memcached | 1 + elements/mysql-common/element-deps | 1 + elements/mysql-common/install.d/11-python-mysqldb | 7 ------- .../install.d/package-installs-mysql-common | 1 + elements/mysql/element-deps | 1 + elements/mysql/install.d/package-installs-mysql | 4 ++++ elements/nagios3/element-deps | 1 + elements/nagios3/install.d/17-nagios | 2 -- elements/nagios3/install.d/package-installs-nagios | 1 + elements/neutron-server/element-deps | 1 + .../install.d/neutron-package-install/76-neutron | 2 -- .../package-installs-neutron-server | 2 ++ elements/nova-api/element-deps | 1 + .../install.d/nova-package-install/80-nova-api | 10 ---------- .../nova-package-install/package-installs-nova-api | 5 +++++ elements/nova-kvm/element-deps | 1 + .../nova-kvm/install.d/nova-source-install/80-nova-kvm | 3 --- .../nova-source-install/package-installs-nova-kvm | 5 +++++ elements/nova-novncproxy/element-deps | 1 + .../install.d/novnc-package-install/50-install-novnc | 7 ------- .../package-installs-nova-novncproxy | 2 ++ elements/os-apply-config/element-deps | 1 + .../os-apply-config-package-install/10-os-apply-config | 5 ----- .../package-installs-os-apply-config | 1 + elements/os-collect-config/element-deps | 1 + .../10-os-collect-config | 7 ------- .../package-installs-os-collect-config | 1 + .../10-os-collect-config | 2 -- .../package-installs-os-collect-config | 5 +++++ elements/os-refresh-config/element-deps | 1 + .../10-os-refresh-config | 5 ----- .../package-installs-os-refresh-config | 1 + elements/pacemaker/element-deps | 1 + elements/pacemaker/install.d/15-pacemaker | 5 ----- .../pacemaker/install.d/package-installs-pacemaker | 1 + elements/pip-and-virtualenv/element-deps | 1 + .../get-pip-py-package-install/01-install-pip | 5 ----- .../package-installs-pip-and-virtualenv | 2 ++ elements/postfix/element-deps | 1 + elements/postfix/install.d/59-postfix | 4 ---- elements/postfix/install.d/package-installs-postfix | 1 + elements/rabbitmq-server/element-deps | 1 + .../install.d/package-installs-rabbitmq-server | 1 + elements/swift-storage/element-deps | 1 + .../swift-storage/install.d/76-swift-storage-common | 2 -- .../install.d/package-installs-swift-storage | 1 + .../install.d/swift-package-install/76-swift-storage | 9 --------- .../package-installs-swift-storage | 4 ++++ elements/swift/element-deps | 3 ++- .../swift/install.d/swift-package-install/75-swift | 5 ----- .../swift-package-install/package-installs-swift | 1 + elements/swift/install.d/swift-source-install/75-swift | 2 -- .../swift-source-install/package-installs-swift | 1 + elements/tempest/element-deps | 1 + elements/tempest/install.d/51-tempest | 2 -- elements/tempest/install.d/package-installs-tempest | 3 +++ elements/tuskar/install.d/package-installs-tuskar | 1 + 104 files changed, 105 insertions(+), 133 deletions(-) create mode 100644 elements/apache2/install.d/package-installs-apache2 create mode 100644 elements/bm-dnsmasq/install.d/package-installs-bm-dnsmasq create mode 100644 elements/boot-stack/install.d/package-installs-boot-stack create mode 100644 elements/ceilometer-agent-compute/install.d/package-installs-ceilometer-agent-compute create mode 100644 elements/ceilometer/install.d/package-installs-ceilometer create mode 100644 elements/check_mk-agent/install.d/package-installs-check_mk-agent delete mode 100755 elements/cinder-lio/install.d/72-cinder-lio create mode 100644 elements/cinder-lio/install.d/package-installs-cinder-lio create mode 100644 elements/cinder-tgt/install.d/package-installs-cinder-tgt delete mode 100755 elements/corosync/install.d/14-corosync create mode 100644 elements/corosync/install.d/package-installs-corosync create mode 100644 elements/haproxy/install.d/package-installs-haproxy create mode 100644 elements/heat-cfntools/install.d/package-installs-heat-cfntools delete mode 100755 elements/heat-engine/install.d/heat-package-install/10-heat-engine create mode 100644 elements/heat-engine/install.d/heat-package-install/package-installs-heat-engine create mode 100644 elements/heat-engine/install.d/heat-source-install/package-installs-heat-engine create mode 100644 elements/ironic/install.d/package-installs-ironic create mode 100644 elements/keepalived/install.d/package-installs-keepalived delete mode 100755 elements/mariadb-dev-rpm/install.d/03-mariadb-rpm-dev create mode 100644 elements/mariadb-dev-rpm/install.d/package-installs-mariadb-dev-rpm create mode 100644 elements/mariadb-dev/install.d/package-installs-mariadb-dev create mode 100644 elements/memcached/install.d/package-installs-memcached delete mode 100755 elements/mysql-common/install.d/11-python-mysqldb create mode 100644 elements/mysql-common/install.d/package-installs-mysql-common create mode 100644 elements/mysql/install.d/package-installs-mysql create mode 100644 elements/nagios3/install.d/package-installs-nagios create mode 100644 elements/neutron-server/install.d/neutron-package-install/package-installs-neutron-server delete mode 100755 elements/nova-api/install.d/nova-package-install/80-nova-api create mode 100644 elements/nova-api/install.d/nova-package-install/package-installs-nova-api create mode 100644 elements/nova-kvm/install.d/nova-source-install/package-installs-nova-kvm delete mode 100755 elements/nova-novncproxy/install.d/novnc-package-install/50-install-novnc create mode 100644 elements/nova-novncproxy/install.d/novnc-package-install/package-installs-nova-novncproxy delete mode 100755 elements/os-apply-config/install.d/os-apply-config-package-install/10-os-apply-config create mode 100644 elements/os-apply-config/install.d/os-apply-config-package-install/package-installs-os-apply-config delete mode 100755 elements/os-collect-config/install.d/os-collect-config-package-install/10-os-collect-config create mode 100644 elements/os-collect-config/install.d/os-collect-config-package-install/package-installs-os-collect-config create mode 100644 elements/os-collect-config/install.d/os-collect-config-source-install/package-installs-os-collect-config delete mode 100755 elements/os-refresh-config/install.d/os-refresh-config-package-install/10-os-refresh-config create mode 100644 elements/os-refresh-config/install.d/os-refresh-config-package-install/package-installs-os-refresh-config delete mode 100755 elements/pacemaker/install.d/15-pacemaker create mode 100644 elements/pacemaker/install.d/package-installs-pacemaker delete mode 100755 elements/pip-and-virtualenv/install.d/get-pip-py-package-install/01-install-pip create mode 100644 elements/pip-and-virtualenv/install.d/get-pip-py-package-install/package-installs-pip-and-virtualenv delete mode 100755 elements/postfix/install.d/59-postfix create mode 100644 elements/postfix/install.d/package-installs-postfix create mode 100644 elements/rabbitmq-server/install.d/package-installs-rabbitmq-server create mode 100644 elements/swift-storage/install.d/package-installs-swift-storage delete mode 100755 elements/swift-storage/install.d/swift-package-install/76-swift-storage create mode 100644 elements/swift-storage/install.d/swift-package-install/package-installs-swift-storage delete mode 100755 elements/swift/install.d/swift-package-install/75-swift create mode 100644 elements/swift/install.d/swift-package-install/package-installs-swift create mode 100644 elements/swift/install.d/swift-source-install/package-installs-swift create mode 100644 elements/tempest/install.d/package-installs-tempest create mode 100644 elements/tuskar/install.d/package-installs-tuskar diff --git a/elements/apache2/element-deps b/elements/apache2/element-deps index 3675865b2..269283a41 100644 --- a/elements/apache2/element-deps +++ b/elements/apache2/element-deps @@ -1,3 +1,4 @@ os-apply-config os-refresh-config os-svc-install +package-installs diff --git a/elements/apache2/install.d/15-apache2 b/elements/apache2/install.d/15-apache2 index d7d0a0b72..a539f45f8 100755 --- a/elements/apache2/install.d/15-apache2 +++ b/elements/apache2/install.d/15-apache2 @@ -3,8 +3,6 @@ set -eux -install-packages apache2 - if [ -f /etc/debian_version ]; then install-packages ssl-cert fi diff --git a/elements/apache2/install.d/package-installs-apache2 b/elements/apache2/install.d/package-installs-apache2 new file mode 100644 index 000000000..5bd8e213a --- /dev/null +++ b/elements/apache2/install.d/package-installs-apache2 @@ -0,0 +1 @@ +apache2 diff --git a/elements/bm-dnsmasq/element-deps b/elements/bm-dnsmasq/element-deps index 61e96da1d..72968011b 100644 --- a/elements/bm-dnsmasq/element-deps +++ b/elements/bm-dnsmasq/element-deps @@ -1,3 +1,4 @@ nova-compute os-refresh-config os-svc-install +package-installs diff --git a/elements/bm-dnsmasq/install.d/81-bm-dnsmasq b/elements/bm-dnsmasq/install.d/81-bm-dnsmasq index e7c5ed84e..5a4e17b25 100755 --- a/elements/bm-dnsmasq/install.d/81-bm-dnsmasq +++ b/elements/bm-dnsmasq/install.d/81-bm-dnsmasq @@ -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] diff --git a/elements/bm-dnsmasq/install.d/package-installs-bm-dnsmasq b/elements/bm-dnsmasq/install.d/package-installs-bm-dnsmasq new file mode 100644 index 000000000..d5e02a666 --- /dev/null +++ b/elements/bm-dnsmasq/install.d/package-installs-bm-dnsmasq @@ -0,0 +1,2 @@ +dnsmasq +dnsmasq-utils diff --git a/elements/boot-stack/element-deps b/elements/boot-stack/element-deps index 81bf46ea0..56e78ca38 100644 --- a/elements/boot-stack/element-deps +++ b/elements/boot-stack/element-deps @@ -11,4 +11,5 @@ openstack-clients os-apply-config os-refresh-config os-svc-install +package-installs sysctl diff --git a/elements/boot-stack/install.d/01-boot-stack b/elements/boot-stack/install.d/01-boot-stack index dc5ea63a4..2624ee89c 100755 --- a/elements/boot-stack/install.d/01-boot-stack +++ b/elements/boot-stack/install.d/01-boot-stack @@ -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 diff --git a/elements/boot-stack/install.d/package-installs-boot-stack b/elements/boot-stack/install.d/package-installs-boot-stack new file mode 100644 index 000000000..81e4f96a4 --- /dev/null +++ b/elements/boot-stack/install.d/package-installs-boot-stack @@ -0,0 +1,4 @@ +build-essential +git +libssl-dev +python-dev diff --git a/elements/ceilometer-agent-compute/install.d/ceilometer-source-install/69-ceilometer-agent-compute b/elements/ceilometer-agent-compute/install.d/ceilometer-source-install/69-ceilometer-agent-compute index 4e10d6809..7e7a38f04 100755 --- a/elements/ceilometer-agent-compute/install.d/ceilometer-source-install/69-ceilometer-agent-compute +++ b/elements/ceilometer-agent-compute/install.d/ceilometer-source-install/69-ceilometer-agent-compute @@ -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 diff --git a/elements/ceilometer-agent-compute/install.d/package-installs-ceilometer-agent-compute b/elements/ceilometer-agent-compute/install.d/package-installs-ceilometer-agent-compute new file mode 100644 index 000000000..92c7bd22f --- /dev/null +++ b/elements/ceilometer-agent-compute/install.d/package-installs-ceilometer-agent-compute @@ -0,0 +1 @@ +libvirt-dev diff --git a/elements/ceilometer/install.d/ceilometer-source-install/68-ceilometer b/elements/ceilometer/install.d/ceilometer-source-install/68-ceilometer index a78baba86..bc654004b 100755 --- a/elements/ceilometer/install.d/ceilometer-source-install/68-ceilometer +++ b/elements/ceilometer/install.d/ceilometer-source-install/68-ceilometer @@ -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 diff --git a/elements/ceilometer/install.d/package-installs-ceilometer b/elements/ceilometer/install.d/package-installs-ceilometer new file mode 100644 index 000000000..4d0ca236a --- /dev/null +++ b/elements/ceilometer/install.d/package-installs-ceilometer @@ -0,0 +1,2 @@ +libffi-dev +libssl-dev diff --git a/elements/check_mk-agent/element-deps b/elements/check_mk-agent/element-deps index e5828dec9..dd833d170 100644 --- a/elements/check_mk-agent/element-deps +++ b/elements/check_mk-agent/element-deps @@ -1,3 +1,4 @@ iptables os-refresh-config os-svc-install +package-installs diff --git a/elements/check_mk-agent/install.d/05-check_mk-agent b/elements/check_mk-agent/install.d/05-check_mk-agent index 17b8b64f8..299e2418c 100755 --- a/elements/check_mk-agent/install.d/05-check_mk-agent +++ b/elements/check_mk-agent/install.d/05-check_mk-agent @@ -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 diff --git a/elements/check_mk-agent/install.d/package-installs-check_mk-agent b/elements/check_mk-agent/install.d/package-installs-check_mk-agent new file mode 100644 index 000000000..535a33bce --- /dev/null +++ b/elements/check_mk-agent/install.d/package-installs-check_mk-agent @@ -0,0 +1,3 @@ +check-mk-agent +check-mk-agent-logwatch +xinetd diff --git a/elements/cinder-lio/element-deps b/elements/cinder-lio/element-deps index 571cffb9b..66fa8dae2 100644 --- a/elements/cinder-lio/element-deps +++ b/elements/cinder-lio/element-deps @@ -1 +1,2 @@ -cinder-volume \ No newline at end of file +cinder-volume +package-installs diff --git a/elements/cinder-lio/install.d/72-cinder-lio b/elements/cinder-lio/install.d/72-cinder-lio deleted file mode 100755 index d803de9bc..000000000 --- a/elements/cinder-lio/install.d/72-cinder-lio +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/bash - -set -eux - -install-packages python-rtslib diff --git a/elements/cinder-lio/install.d/package-installs-cinder-lio b/elements/cinder-lio/install.d/package-installs-cinder-lio new file mode 100644 index 000000000..4a837e0be --- /dev/null +++ b/elements/cinder-lio/install.d/package-installs-cinder-lio @@ -0,0 +1 @@ +python-rtslib diff --git a/elements/cinder-tgt/element-deps b/elements/cinder-tgt/element-deps index 0e19b74c0..66fa8dae2 100644 --- a/elements/cinder-tgt/element-deps +++ b/elements/cinder-tgt/element-deps @@ -1 +1,2 @@ cinder-volume +package-installs diff --git a/elements/cinder-tgt/install.d/72-cinder-tgt b/elements/cinder-tgt/install.d/72-cinder-tgt index e18fc9e6e..532e9c879 100755 --- a/elements/cinder-tgt/install.d/72-cinder-tgt +++ b/elements/cinder-tgt/install.d/72-cinder-tgt @@ -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 diff --git a/elements/cinder-tgt/install.d/package-installs-cinder-tgt b/elements/cinder-tgt/install.d/package-installs-cinder-tgt new file mode 100644 index 000000000..786509cab --- /dev/null +++ b/elements/cinder-tgt/install.d/package-installs-cinder-tgt @@ -0,0 +1 @@ +tgt diff --git a/elements/corosync/element-deps b/elements/corosync/element-deps index 3675865b2..269283a41 100644 --- a/elements/corosync/element-deps +++ b/elements/corosync/element-deps @@ -1,3 +1,4 @@ os-apply-config os-refresh-config os-svc-install +package-installs diff --git a/elements/corosync/install.d/14-corosync b/elements/corosync/install.d/14-corosync deleted file mode 100755 index 44c67f181..000000000 --- a/elements/corosync/install.d/14-corosync +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/bash - -set -eux - -install-packages corosync diff --git a/elements/corosync/install.d/package-installs-corosync b/elements/corosync/install.d/package-installs-corosync new file mode 100644 index 000000000..d746f1833 --- /dev/null +++ b/elements/corosync/install.d/package-installs-corosync @@ -0,0 +1 @@ +corosync diff --git a/elements/haproxy/element-deps b/elements/haproxy/element-deps index b53fb9060..80570ab87 100644 --- a/elements/haproxy/element-deps +++ b/elements/haproxy/element-deps @@ -1,2 +1,3 @@ -sysctl os-svc-install +package-installs +sysctl diff --git a/elements/haproxy/install.d/76-haproxy b/elements/haproxy/install.d/76-haproxy index f4ec84305..f0650ca54 100755 --- a/elements/haproxy/install.d/76-haproxy +++ b/elements/haproxy/install.d/76-haproxy @@ -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 diff --git a/elements/haproxy/install.d/package-installs-haproxy b/elements/haproxy/install.d/package-installs-haproxy new file mode 100644 index 000000000..6968bada4 --- /dev/null +++ b/elements/haproxy/install.d/package-installs-haproxy @@ -0,0 +1 @@ +haproxy diff --git a/elements/heat-cfntools/element-deps b/elements/heat-cfntools/element-deps index 7c8922a0b..d397eed2a 100644 --- a/elements/heat-cfntools/element-deps +++ b/elements/heat-cfntools/element-deps @@ -1 +1,2 @@ +package-installs pip-and-virtualenv diff --git a/elements/heat-cfntools/install.d/05-heat-cfntools b/elements/heat-cfntools/install.d/05-heat-cfntools index f1c71b036..c281170ca 100755 --- a/elements/heat-cfntools/install.d/05-heat-cfntools +++ b/elements/heat-cfntools/install.d/05-heat-cfntools @@ -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 diff --git a/elements/heat-cfntools/install.d/package-installs-heat-cfntools b/elements/heat-cfntools/install.d/package-installs-heat-cfntools new file mode 100644 index 000000000..193294490 --- /dev/null +++ b/elements/heat-cfntools/install.d/package-installs-heat-cfntools @@ -0,0 +1,3 @@ +gcc +python-dev +python-psutil diff --git a/elements/heat-engine/element-deps b/elements/heat-engine/element-deps index 7e67542b9..955a0a676 100644 --- a/elements/heat-engine/element-deps +++ b/elements/heat-engine/element-deps @@ -1,3 +1,4 @@ heat os-apply-config os-is-bootstrap-host +package-installs diff --git a/elements/heat-engine/install.d/heat-package-install/10-heat-engine b/elements/heat-engine/install.d/heat-package-install/10-heat-engine deleted file mode 100755 index 9f5483c6c..000000000 --- a/elements/heat-engine/install.d/heat-package-install/10-heat-engine +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/bash - -set -eux - -install-packages openstack-heat-engine diff --git a/elements/heat-engine/install.d/heat-package-install/package-installs-heat-engine b/elements/heat-engine/install.d/heat-package-install/package-installs-heat-engine new file mode 100644 index 000000000..bcc9069f4 --- /dev/null +++ b/elements/heat-engine/install.d/heat-package-install/package-installs-heat-engine @@ -0,0 +1 @@ +openstack-heat-engine diff --git a/elements/heat-engine/install.d/heat-source-install/10-heat-engine b/elements/heat-engine/install.d/heat-source-install/10-heat-engine index 4a3b17ef5..2b3a1b059 100755 --- a/elements/heat-engine/install.d/heat-source-install/10-heat-engine +++ b/elements/heat-engine/install.d/heat-source-install/10-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 diff --git a/elements/heat-engine/install.d/heat-source-install/package-installs-heat-engine b/elements/heat-engine/install.d/heat-source-install/package-installs-heat-engine new file mode 100644 index 000000000..1829850df --- /dev/null +++ b/elements/heat-engine/install.d/heat-source-install/package-installs-heat-engine @@ -0,0 +1 @@ +python-mysqldb diff --git a/elements/ironic/install.d/ironic-source-install/68-ironic b/elements/ironic/install.d/ironic-source-install/68-ironic index 83c91b288..239d4eec7 100755 --- a/elements/ironic/install.d/ironic-source-install/68-ironic +++ b/elements/ironic/install.d/ironic-source-install/68-ironic @@ -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 diff --git a/elements/ironic/install.d/package-installs-ironic b/elements/ironic/install.d/package-installs-ironic new file mode 100644 index 000000000..7c992e22d --- /dev/null +++ b/elements/ironic/install.d/package-installs-ironic @@ -0,0 +1,2 @@ +# need the libssl header files +libssl-dev diff --git a/elements/keepalived/element-deps b/elements/keepalived/element-deps index 2167c86fb..29e4e2426 100644 --- a/elements/keepalived/element-deps +++ b/elements/keepalived/element-deps @@ -1 +1,2 @@ os-svc-install +package-installs diff --git a/elements/keepalived/install.d/76-keepalived b/elements/keepalived/install.d/76-keepalived index 21e53a39b..b291e3ae8 100755 --- a/elements/keepalived/install.d/76-keepalived +++ b/elements/keepalived/install.d/76-keepalived @@ -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 diff --git a/elements/keepalived/install.d/package-installs-keepalived b/elements/keepalived/install.d/package-installs-keepalived new file mode 100644 index 000000000..01ba2e0f8 --- /dev/null +++ b/elements/keepalived/install.d/package-installs-keepalived @@ -0,0 +1,2 @@ +keepalived +psmisc diff --git a/elements/mariadb-dev-rpm/install.d/03-mariadb-rpm-dev b/elements/mariadb-dev-rpm/install.d/03-mariadb-rpm-dev deleted file mode 100755 index 84937ce5c..000000000 --- a/elements/mariadb-dev-rpm/install.d/03-mariadb-rpm-dev +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/bash - -set -eux - -install-packages libmariadb-dev diff --git a/elements/mariadb-dev-rpm/install.d/package-installs-mariadb-dev-rpm b/elements/mariadb-dev-rpm/install.d/package-installs-mariadb-dev-rpm new file mode 100644 index 000000000..f0bf73fc1 --- /dev/null +++ b/elements/mariadb-dev-rpm/install.d/package-installs-mariadb-dev-rpm @@ -0,0 +1 @@ +libmariadb-dev diff --git a/elements/mariadb-dev/install.d/03-mariadb-dev b/elements/mariadb-dev/install.d/03-mariadb-dev index 6728d6370..047019d71 100755 --- a/elements/mariadb-dev/install.d/03-mariadb-dev +++ b/elements/mariadb-dev/install.d/03-mariadb-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) diff --git a/elements/mariadb-dev/install.d/package-installs-mariadb-dev b/elements/mariadb-dev/install.d/package-installs-mariadb-dev new file mode 100644 index 000000000..f0bf73fc1 --- /dev/null +++ b/elements/mariadb-dev/install.d/package-installs-mariadb-dev @@ -0,0 +1 @@ +libmariadb-dev diff --git a/elements/memcached/element-deps b/elements/memcached/element-deps index 2167c86fb..29e4e2426 100644 --- a/elements/memcached/element-deps +++ b/elements/memcached/element-deps @@ -1 +1,2 @@ os-svc-install +package-installs diff --git a/elements/memcached/install.d/74-memcached b/elements/memcached/install.d/74-memcached index 55ec1e025..3b4bd5f66 100755 --- a/elements/memcached/install.d/74-memcached +++ b/elements/memcached/install.d/74-memcached @@ -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 diff --git a/elements/memcached/install.d/package-installs-memcached b/elements/memcached/install.d/package-installs-memcached new file mode 100644 index 000000000..51b7e42eb --- /dev/null +++ b/elements/memcached/install.d/package-installs-memcached @@ -0,0 +1 @@ +memcached diff --git a/elements/mysql-common/element-deps b/elements/mysql-common/element-deps index 84d4a339b..d05a42aea 100644 --- a/elements/mysql-common/element-deps +++ b/elements/mysql-common/element-deps @@ -2,4 +2,5 @@ iptables os-apply-config os-is-bootstrap-host os-refresh-config +package-installs use-ephemeral diff --git a/elements/mysql-common/install.d/11-python-mysqldb b/elements/mysql-common/install.d/11-python-mysqldb deleted file mode 100755 index 6fbbaf3b4..000000000 --- a/elements/mysql-common/install.d/11-python-mysqldb +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/bash - -# Install python-mysqldb - Needed by 50-mysql-users -set -e -set -o xtrace - -install-packages python-mysqldb diff --git a/elements/mysql-common/install.d/package-installs-mysql-common b/elements/mysql-common/install.d/package-installs-mysql-common new file mode 100644 index 000000000..1829850df --- /dev/null +++ b/elements/mysql-common/install.d/package-installs-mysql-common @@ -0,0 +1 @@ +python-mysqldb diff --git a/elements/mysql/element-deps b/elements/mysql/element-deps index 274f752fc..10b8d4f68 100644 --- a/elements/mysql/element-deps +++ b/elements/mysql/element-deps @@ -1,3 +1,4 @@ mysql-common os-svc-install +package-installs use-ephemeral diff --git a/elements/mysql/install.d/package-installs-mysql b/elements/mysql/install.d/package-installs-mysql new file mode 100644 index 000000000..00071f96e --- /dev/null +++ b/elements/mysql/install.d/package-installs-mysql @@ -0,0 +1,4 @@ +libaio1 +lsof +pv +rsync diff --git a/elements/nagios3/element-deps b/elements/nagios3/element-deps index 583462c41..a1e52aaa7 100644 --- a/elements/nagios3/element-deps +++ b/elements/nagios3/element-deps @@ -1,4 +1,5 @@ apache2 os-apply-config os-refresh-config +package-installs postfix diff --git a/elements/nagios3/install.d/17-nagios b/elements/nagios3/install.d/17-nagios index a5e17066a..dc641ce56 100755 --- a/elements/nagios3/install.d/17-nagios +++ b/elements/nagios3/install.d/17-nagios @@ -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 diff --git a/elements/nagios3/install.d/package-installs-nagios b/elements/nagios3/install.d/package-installs-nagios new file mode 100644 index 000000000..816179c04 --- /dev/null +++ b/elements/nagios3/install.d/package-installs-nagios @@ -0,0 +1 @@ +nagios3 diff --git a/elements/neutron-server/element-deps b/elements/neutron-server/element-deps index 99d73a448..fe76d2a9b 100644 --- a/elements/neutron-server/element-deps +++ b/elements/neutron-server/element-deps @@ -1 +1,2 @@ neutron +package-installs diff --git a/elements/neutron-server/install.d/neutron-package-install/76-neutron b/elements/neutron-server/install.d/neutron-package-install/76-neutron index d8d297d64..81ac882f9 100755 --- a/elements/neutron-server/install.d/neutron-package-install/76-neutron +++ b/elements/neutron-server/install.d/neutron-package-install/76-neutron @@ -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 diff --git a/elements/neutron-server/install.d/neutron-package-install/package-installs-neutron-server b/elements/neutron-server/install.d/neutron-package-install/package-installs-neutron-server new file mode 100644 index 000000000..e464570ae --- /dev/null +++ b/elements/neutron-server/install.d/neutron-package-install/package-installs-neutron-server @@ -0,0 +1,2 @@ +openstack-neutron +openstack-neutron-ml2 diff --git a/elements/nova-api/element-deps b/elements/nova-api/element-deps index 03a7de334..d9f6094b0 100644 --- a/elements/nova-api/element-deps +++ b/elements/nova-api/element-deps @@ -2,3 +2,4 @@ iptables nova nova-novncproxy os-is-bootstrap-host +package-installs diff --git a/elements/nova-api/install.d/nova-package-install/80-nova-api b/elements/nova-api/install.d/nova-package-install/80-nova-api deleted file mode 100755 index b406d1001..000000000 --- a/elements/nova-api/install.d/nova-package-install/80-nova-api +++ /dev/null @@ -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 diff --git a/elements/nova-api/install.d/nova-package-install/package-installs-nova-api b/elements/nova-api/install.d/nova-package-install/package-installs-nova-api new file mode 100644 index 000000000..cab77ea00 --- /dev/null +++ b/elements/nova-api/install.d/nova-package-install/package-installs-nova-api @@ -0,0 +1,5 @@ +openstack-nova-api +openstack-nova-cert +openstack-nova-conductor +openstack-nova-console +openstack-nova-scheduler diff --git a/elements/nova-kvm/element-deps b/elements/nova-kvm/element-deps index 46e946858..a6d8a3628 100644 --- a/elements/nova-kvm/element-deps +++ b/elements/nova-kvm/element-deps @@ -2,4 +2,5 @@ nova-compute os-apply-config os-refresh-config os-svc-install +package-installs use-ephemeral diff --git a/elements/nova-kvm/install.d/nova-source-install/80-nova-kvm b/elements/nova-kvm/install.d/nova-source-install/80-nova-kvm index 829fd196a..405d31973 100755 --- a/elements/nova-kvm/install.d/nova-source-install/80-nova-kvm +++ b/elements/nova-kvm/install.d/nova-source-install/80-nova-kvm @@ -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 diff --git a/elements/nova-kvm/install.d/nova-source-install/package-installs-nova-kvm b/elements/nova-kvm/install.d/nova-source-install/package-installs-nova-kvm new file mode 100644 index 000000000..b87ba50e1 --- /dev/null +++ b/elements/nova-kvm/install.d/nova-source-install/package-installs-nova-kvm @@ -0,0 +1,5 @@ +kpartx +kvm +libvirt-bin +python-libvirt +pm-utils diff --git a/elements/nova-novncproxy/element-deps b/elements/nova-novncproxy/element-deps index 31c787fdd..d492ce3ca 100644 --- a/elements/nova-novncproxy/element-deps +++ b/elements/nova-novncproxy/element-deps @@ -1 +1,2 @@ nova +package-installs diff --git a/elements/nova-novncproxy/install.d/novnc-package-install/50-install-novnc b/elements/nova-novncproxy/install.d/novnc-package-install/50-install-novnc deleted file mode 100755 index 6f0fc6e6b..000000000 --- a/elements/nova-novncproxy/install.d/novnc-package-install/50-install-novnc +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/bash - -set -eux - -install-packages openstack-nova-novncproxy - -install-packages novnc diff --git a/elements/nova-novncproxy/install.d/novnc-package-install/package-installs-nova-novncproxy b/elements/nova-novncproxy/install.d/novnc-package-install/package-installs-nova-novncproxy new file mode 100644 index 000000000..6830660ed --- /dev/null +++ b/elements/nova-novncproxy/install.d/novnc-package-install/package-installs-nova-novncproxy @@ -0,0 +1,2 @@ +novnc +openstack-nova-novncproxy diff --git a/elements/os-apply-config/element-deps b/elements/os-apply-config/element-deps index b8e381391..90daf3f98 100644 --- a/elements/os-apply-config/element-deps +++ b/elements/os-apply-config/element-deps @@ -1,2 +1,3 @@ os-refresh-config +package-installs pip-manifest diff --git a/elements/os-apply-config/install.d/os-apply-config-package-install/10-os-apply-config b/elements/os-apply-config/install.d/os-apply-config-package-install/10-os-apply-config deleted file mode 100755 index 920512fe6..000000000 --- a/elements/os-apply-config/install.d/os-apply-config-package-install/10-os-apply-config +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/bash - -set -eux - -install-packages os-apply-config diff --git a/elements/os-apply-config/install.d/os-apply-config-package-install/package-installs-os-apply-config b/elements/os-apply-config/install.d/os-apply-config-package-install/package-installs-os-apply-config new file mode 100644 index 000000000..b0a0c5d7d --- /dev/null +++ b/elements/os-apply-config/install.d/os-apply-config-package-install/package-installs-os-apply-config @@ -0,0 +1 @@ +os-apply-config diff --git a/elements/os-collect-config/element-deps b/elements/os-collect-config/element-deps index d40fe09f0..1d282ac40 100644 --- a/elements/os-collect-config/element-deps +++ b/elements/os-collect-config/element-deps @@ -1,5 +1,6 @@ os-apply-config os-refresh-config os-svc-install +package-installs pip-manifest source-repositories diff --git a/elements/os-collect-config/install.d/os-collect-config-package-install/10-os-collect-config b/elements/os-collect-config/install.d/os-collect-config-package-install/10-os-collect-config deleted file mode 100755 index 99cbad784..000000000 --- a/elements/os-collect-config/install.d/os-collect-config-package-install/10-os-collect-config +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/bash - -set -eux - -install-packages os-collect-config - -os-svc-enable -n os-collect-config diff --git a/elements/os-collect-config/install.d/os-collect-config-package-install/package-installs-os-collect-config b/elements/os-collect-config/install.d/os-collect-config-package-install/package-installs-os-collect-config new file mode 100644 index 000000000..651d8919a --- /dev/null +++ b/elements/os-collect-config/install.d/os-collect-config-package-install/package-installs-os-collect-config @@ -0,0 +1 @@ +os-collect-config diff --git a/elements/os-collect-config/install.d/os-collect-config-source-install/10-os-collect-config b/elements/os-collect-config/install.d/os-collect-config-source-install/10-os-collect-config index 3e2c723d6..408292b25 100755 --- a/elements/os-collect-config/install.d/os-collect-config-source-install/10-os-collect-config +++ b/elements/os-collect-config/install.d/os-collect-config-source-install/10-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 diff --git a/elements/os-collect-config/install.d/os-collect-config-source-install/package-installs-os-collect-config b/elements/os-collect-config/install.d/os-collect-config-source-install/package-installs-os-collect-config new file mode 100644 index 000000000..c57518b4e --- /dev/null +++ b/elements/os-collect-config/install.d/os-collect-config-source-install/package-installs-os-collect-config @@ -0,0 +1,5 @@ +build-essential +libxml2-dev +libz-dev +libxslt-dev +python-dev diff --git a/elements/os-refresh-config/element-deps b/elements/os-refresh-config/element-deps index fb9e815e0..c00df3cf8 100644 --- a/elements/os-refresh-config/element-deps +++ b/elements/os-refresh-config/element-deps @@ -1,5 +1,6 @@ os-apply-config os-collect-config +package-installs pip-and-virtualenv pip-manifest source-repositories diff --git a/elements/os-refresh-config/install.d/os-refresh-config-package-install/10-os-refresh-config b/elements/os-refresh-config/install.d/os-refresh-config-package-install/10-os-refresh-config deleted file mode 100755 index 3541947d6..000000000 --- a/elements/os-refresh-config/install.d/os-refresh-config-package-install/10-os-refresh-config +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/bash - -set -eux - -install-packages os-refresh-config diff --git a/elements/os-refresh-config/install.d/os-refresh-config-package-install/package-installs-os-refresh-config b/elements/os-refresh-config/install.d/os-refresh-config-package-install/package-installs-os-refresh-config new file mode 100644 index 000000000..33d7e82b2 --- /dev/null +++ b/elements/os-refresh-config/install.d/os-refresh-config-package-install/package-installs-os-refresh-config @@ -0,0 +1 @@ +os-refresh-config diff --git a/elements/pacemaker/element-deps b/elements/pacemaker/element-deps index afeac05a7..059231047 100644 --- a/elements/pacemaker/element-deps +++ b/elements/pacemaker/element-deps @@ -3,3 +3,4 @@ os-apply-config os-is-bootstrap-host os-refresh-config os-svc-install +package-installs diff --git a/elements/pacemaker/install.d/15-pacemaker b/elements/pacemaker/install.d/15-pacemaker deleted file mode 100755 index 38651a9c8..000000000 --- a/elements/pacemaker/install.d/15-pacemaker +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/bash - -set -eux - -install-packages pacemaker diff --git a/elements/pacemaker/install.d/package-installs-pacemaker b/elements/pacemaker/install.d/package-installs-pacemaker new file mode 100644 index 000000000..73aa0aada --- /dev/null +++ b/elements/pacemaker/install.d/package-installs-pacemaker @@ -0,0 +1 @@ +pacemaker diff --git a/elements/pip-and-virtualenv/element-deps b/elements/pip-and-virtualenv/element-deps index 715c11e2f..73d637d49 100644 --- a/elements/pip-and-virtualenv/element-deps +++ b/elements/pip-and-virtualenv/element-deps @@ -1 +1,2 @@ +package-installs source-repositories diff --git a/elements/pip-and-virtualenv/install.d/get-pip-py-package-install/01-install-pip b/elements/pip-and-virtualenv/install.d/get-pip-py-package-install/01-install-pip deleted file mode 100755 index 744e49db8..000000000 --- a/elements/pip-and-virtualenv/install.d/get-pip-py-package-install/01-install-pip +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/bash - -set -eux - -install-packages python-pip python-virtualenv diff --git a/elements/pip-and-virtualenv/install.d/get-pip-py-package-install/package-installs-pip-and-virtualenv b/elements/pip-and-virtualenv/install.d/get-pip-py-package-install/package-installs-pip-and-virtualenv new file mode 100644 index 000000000..534d20431 --- /dev/null +++ b/elements/pip-and-virtualenv/install.d/get-pip-py-package-install/package-installs-pip-and-virtualenv @@ -0,0 +1,2 @@ +python-pip +python-virtualenv diff --git a/elements/postfix/element-deps b/elements/postfix/element-deps index 9d8b6b7a5..d339fa5eb 100644 --- a/elements/postfix/element-deps +++ b/elements/postfix/element-deps @@ -1,2 +1,3 @@ os-apply-config os-refresh-config +package-installs diff --git a/elements/postfix/install.d/59-postfix b/elements/postfix/install.d/59-postfix deleted file mode 100755 index c15d17c17..000000000 --- a/elements/postfix/install.d/59-postfix +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/bash -set -eux - -install-packages postfix diff --git a/elements/postfix/install.d/package-installs-postfix b/elements/postfix/install.d/package-installs-postfix new file mode 100644 index 000000000..f6dc9c5c9 --- /dev/null +++ b/elements/postfix/install.d/package-installs-postfix @@ -0,0 +1 @@ +postfix diff --git a/elements/rabbitmq-server/element-deps b/elements/rabbitmq-server/element-deps index a2ba69110..8b0805b9b 100644 --- a/elements/rabbitmq-server/element-deps +++ b/elements/rabbitmq-server/element-deps @@ -3,5 +3,6 @@ os-apply-config os-is-bootstrap-host os-refresh-config os-svc-install +package-installs sysctl use-ephemeral diff --git a/elements/rabbitmq-server/install.d/package-installs-rabbitmq-server b/elements/rabbitmq-server/install.d/package-installs-rabbitmq-server new file mode 100644 index 000000000..f8d6ed52a --- /dev/null +++ b/elements/rabbitmq-server/install.d/package-installs-rabbitmq-server @@ -0,0 +1 @@ +rabbitmq-server diff --git a/elements/swift-storage/element-deps b/elements/swift-storage/element-deps index b9a60a0f9..76a4880eb 100644 --- a/elements/swift-storage/element-deps +++ b/elements/swift-storage/element-deps @@ -1,2 +1,3 @@ +package-installs swift use-ephemeral diff --git a/elements/swift-storage/install.d/76-swift-storage-common b/elements/swift-storage/install.d/76-swift-storage-common index 191d53a7a..f342c0624 100755 --- a/elements/swift-storage/install.d/76-swift-storage-common +++ b/elements/swift-storage/install.d/76-swift-storage-common @@ -2,8 +2,6 @@ set -eux -install-packages rsync - cat > /etc/cron.d/swift-recon <