openstack
/
tripleo-image-elements
Code Issues Proposed changes

Ceilo/Ironic/Tuskar: don't hard code venv dir 

Updates the ceilometer/ironic/tuskar elements so that we use a new
{SERVICE}_VENV_DIR variable (set via an environment.d hook)
to configure the virtualenv directory.

This is cleaner in that we aren't hard coding /opt/stack/venv
everywhere and also supports both isolated and shared
venvs (which some people would like to use).

Change-Id: I5a4deef3ed79f4b633f273a37cec2aa5a8dbc698
This commit is contained in:
Dan Prince 2014-02-27 09:34:28 -05:00
parent 8eb1faea81
commit 09234d8286
10 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
elements/ceilometer-agent-compute/install.d/69-ceilometer-agent-compute
View File

@ -2,6 +2,6 @@
set -eux
install-packages libvirt-dev
/opt/stack/venvs/ceilometer/bin/pip install libvirt-python
$CEILOMETER_VENV_DIR/bin/pip install libvirt-python
os-svc-daemon ceilometer-agent-compute ceilometer ceilometer-agent-compute --config-dir /etc/ceilometer

1
elements/ceilometer/environment.d/10-ceilometer-venv-dir.bash Normal file
View File

@ -0,0 +1 @@
export CEILOMETER_VENV_DIR=${CEILOMETER_VENV_DIR:-"/opt/stack/venvs/ceilometer"}

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

@ -8,4 +8,4 @@ install -m 640 -o ceilometer -g ceilometer /opt/stack/ceilometer/etc/ceilometer/
install -m 640 -o ceilometer -g ceilometer /opt/stack/ceilometer/etc/ceilometer/policy.json /etc/ceilometer
install -m 640 -o ceilometer -g ceilometer /opt/stack/ceilometer/etc/ceilometer/sources.json /etc/ceilometer
ln -s /opt/stack/venvs/ceilometer/bin/ceilometer-dbsync /usr/local/bin/ceilometer-dbsync
ln -s $CEILOMETER_VENV_DIR/bin/ceilometer-dbsync /usr/local/bin/ceilometer-dbsync

2
elements/ironic-api/os-refresh-config/post-configure.d/68-ironic-api
View File

@ -1,7 +1,7 @@
#!/bin/bash
set -eu
/opt/stack/venvs/ironic/bin/ironic-dbsync --config-file /etc/ironic/ironic.conf
ironic-dbsync --config-file /etc/ironic/ironic.conf
os-svc-enable -n ironic-api

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

@ -1,7 +1,7 @@
#!/bin/bash
set -eux
echo "ironic ALL=(root) NOPASSWD: /opt/stack/venvs/ironic/bin/ironic-rootwrap" > /etc/sudoers.d/ironic
echo "ironic ALL=(root) NOPASSWD: $IRONIC_VENV_DIR/bin/ironic-rootwrap" > /etc/sudoers.d/ironic
chmod 0440 /etc/sudoers.d/ironic
visudo -c

1
elements/ironic/environment.d/10-ironic-venv-dir.bash Normal file
View File

@ -0,0 +1 @@
export IRONIC_VENV_DIR=${IRONIC_VENV_DIR:-"/opt/stack/venvs/ironic"}

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

@ -8,4 +8,4 @@ os-svc-install -u ironic -r /opt/stack/ironic
install -d -m 0750 -o ironic -g ironic /etc/ironic
ln -s /opt/stack/venvs/ironic/bin/ironic-dbsync /usr/local/bin/ironic-dbsync
ln -s $IRONIC_VENV_DIR/bin/ironic-dbsync /usr/local/bin/ironic-dbsync

1
elements/tuskar/environment.d/10-tuskar-venv-dir.bash Normal file
View File

@ -0,0 +1 @@
export TUSKAR_VENV_DIR=${TUSKAR_VENV_DIR:-"/opt/stack/venvs/tuskar"}

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

@ -10,4 +10,4 @@ cp -a /opt/stack/tuskar/etc/tuskar/tripleo-heat-templates /etc/tuskar
os-svc-daemon tuskar-api tuskar tuskar-api "--config-dir /etc/tuskar"
ln -s /opt/stack/venvs/tuskar/bin/tuskar-dbsync /usr/local/bin/tuskar-dbsync
ln -s $TUSKAR_VENV_DIR/bin/tuskar-dbsync /usr/local/bin/tuskar-dbsync

2
elements/tuskar/os-refresh-config/post-configure.d/100-tuskar-api
View File

@ -1,7 +1,7 @@
#!/bin/bash
set -eux
/opt/stack/venvs/tuskar/bin/tuskar-dbsync --config-file /etc/tuskar/tuskar.conf
tuskar-dbsync --config-file /etc/tuskar/tuskar.conf
os-svc-enable -n tuskar-api