openstack/tripleo-image-elements
Code Issues Proposed changes

Merge "Update elements to use os-svc-install -i."

Browse Source
This commit is contained in:
Jenkins 2014-03-27 08:34:16 +00:00 committed by Gerrit Code Review
commit 4fbe6c4201
13 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
elements/ceilometer/install.d/68-ceilometer
View File

@ -1,7 +1,7 @@
#!/bin/bash
set -eux
os-svc-install -u ceilometer -r /opt/stack/ceilometer
os-svc-install -i "$CEILOMETER_VENV_DIR" -u ceilometer -r /opt/stack/ceilometer
install -m 640 -o ceilometer -g ceilometer /opt/stack/ceilometer/etc/ceilometer/pipeline.yaml /etc/ceilometer

2
elements/cinder/install.d/cinder-source-install/72-cinder
View File

@ -3,7 +3,7 @@ set -eux
install-packages lvm2 libssl-dev tgt libffi-dev nfs-common
echo "qpid-python" | tee -a /opt/stack/cinder/requirements.txt
os-svc-install -u cinder -r /opt/stack/cinder
os-svc-install -i "$CINDER_VENV_DIR" -u cinder -r /opt/stack/cinder
cp -a /opt/stack/cinder/etc/cinder/rootwrap* /etc/cinder
cp /opt/stack/cinder/etc/cinder/api-paste.ini /etc/cinder/api-paste.ini

2
elements/glance/install.d/glance-source-install/75-glance
View File

@ -3,7 +3,7 @@ set -eux
install-packages python-mysqldb libssl-dev
os-svc-install -u glance -r /opt/stack/glance
os-svc-install -i "$GLANCE_VENV_DIR" -u glance -r /opt/stack/glance
ln -s $GLANCE_VENV_DIR/bin/glance-manage /usr/local/bin/glance-manage

2
elements/heat/install.d/heat-source-install/05-heat
View File

@ -4,7 +4,7 @@ install-packages python-setuptools python-eventlet python-greenlet \
python-httplib2 python-iso8601 python-lxml python-sqlalchemy \
python-paste python-routes python-webob python-yaml
os-svc-install -u heat -r /opt/stack/heat
os-svc-install -i "$HEAT_VENV_DIR" -u heat -r /opt/stack/heat
cp /opt/stack/heat/etc/heat/policy.json /etc/heat/policy.json

2
elements/horizon/install.d/horizon-source-install/100-horizon
View File

@ -16,7 +16,7 @@ if [ -d /etc/apache2 ]; then
sed -e "s|HORIZON_VENV_DIR|$HORIZON_VENV_DIR|g" -i /etc/apache2/sites-available/horizon.conf
fi
os-svc-install -u horizon -r /opt/stack/horizon
os-svc-install -i "$HORIZON_VENV_DIR" -u horizon -r /opt/stack/horizon
# Django won't start otherwise:
touch /etc/horizon/.secret_key_store

2
elements/ironic/install.d/68-ironic
View File

@ -4,7 +4,7 @@ set -eux
# need the libssl header files
install-packages libssl-dev
os-svc-install -u ironic -r /opt/stack/ironic
os-svc-install -i "$IRONIC_VENV_DIR" -u ironic -r /opt/stack/ironic
install -d -m 0750 -o ironic -g ironic /etc/ironic
install -o root -g root -m 0644 /opt/stack/ironic/etc/ironic/policy.json /etc/ironic

2
elements/keystone/install.d/keystone-source-install/05-keystone
View File

@ -1,6 +1,6 @@
#!/bin/bash
set -eux
os-svc-install -u keystone -r /opt/stack/keystone
os-svc-install -i "$KEYSTONE_VENV_DIR" -u keystone -r /opt/stack/keystone
# Workaround for https://bugs.launchpad.net/tripleo/+bug/1288425
$KEYSTONE_VENV_DIR/bin/pip install -U kombu

2
elements/keystone/install.d/keystone-source-install/70-keystone
View File

@ -4,7 +4,7 @@ set -eux
DISTRO=`lsb_release -si` || true
RELEASE=`lsb_release -r` || true
os-svc-install -u keystone -r /opt/stack/keystone
os-svc-install -i "$KEYSTONE_VENV_DIR" -u keystone -r /opt/stack/keystone
os-svc-daemon -i "$KEYSTONE_VENV_DIR" keystone keystone keystone-all "--config-dir /etc/keystone"
install -m 0755 -o keystone -g keystone -d /etc/keystone/ssl

2
elements/neutron/install.d/neutron-source-install/76-neutron
View File

@ -8,7 +8,7 @@ install-packages openvswitch-switch openvswitch-datapath-dkms
# for BUG: https://bugs.launchpad.net/neutron/+bug/1225232
echo "qpid-python" | tee -a /opt/stack/neutron/requirements.txt
os-svc-install -u neutron -r /opt/stack/neutron
os-svc-install -i "$NEUTRON_VENV_DIR" -u neutron -r /opt/stack/neutron
ln -sf $NEUTRON_VENV_DIR/bin/neutron-rootwrap /usr/bin/neutron-rootwrap
ln -sf $NEUTRON_VENV_DIR/etc/neutron/rootwrap.d /etc/neutron/rootwrap.d

2
elements/nova/install.d/nova-source-install/74-nova
View File

@ -4,7 +4,7 @@ set -eux
install-packages build-essential python-dev libssl-dev libxml2-dev libxslt-dev libffi-dev
# -s enables system-site-packages explicitly for python-libvirt
os-svc-install -u nova -r /opt/stack/nova -s
os-svc-install -i "$NOVA_VENV_DIR" -u nova -r /opt/stack/nova -s
cp /opt/stack/nova/etc/nova/policy.json /etc/nova/policy.json
cp /opt/stack/nova/etc/nova/api-paste.ini /etc/nova/api-paste.ini

2
elements/swift/install.d/swift-source-install/75-swift
View File

@ -4,6 +4,6 @@ set -eux
install-packages libffi-dev
os-svc-install -u swift -r /opt/stack/swift
os-svc-install -i "$SWIFT_VENV_DIR" -u swift -r /opt/stack/swift
install -m 0755 -o root -g root $SWIFT_VENV_DIR/bin/swift-ring-builder /usr/local/bin

2
elements/tempest/install.d/51-tempest
View File

@ -4,7 +4,7 @@ set -ex
install-packages augeas-tools
os-svc-install -u tempest -r /opt/stack/tempest
os-svc-install -i "$TEMPEST_VENV_DIR" -u tempest -r /opt/stack/tempest
source $TEMPEST_VENV_DIR/bin/activate
cd /opt/stack/tempest

2
elements/tuskar/install.d/100-tuskar-api
View File

@ -2,7 +2,7 @@
set -eux
install-packages swig
os-svc-install -u tuskar -r /opt/stack/tuskar
os-svc-install -i "$TUSKAR_VENV_DIR" -u tuskar -r /opt/stack/tuskar
install -d -m 0750 -o tuskar -g tuskar /etc/tuskar
cp -a /opt/stack/tuskar/etc/tuskar/policy.json /etc/tuskar