x/surveil
Code Issues Proposed changes

Added SURVEIL_KEYSTONE_USERNAME + SURVEIL_KEYSTONE_PASSWORD vars

Browse Source 
Change-Id: I7cb10d43d24cc31d6b36d8bdf4e4c7e81da07879
This commit is contained in:
aviau 2015-05-06 19:08:32 -04:00
parent c13208d4ac
commit eab727c45d
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Dockerfile
View File

@ -36,6 +36,8 @@ RUN cd /opt/surveil && python setup.py develop
#Set to 'surveil' or 'keystone' #Set to 'surveil' or 'keystone'
ENV SURVEIL_AUTH_BACKEND=surveil ENV SURVEIL_AUTH_BACKEND=surveil
ENV SURVEIL_KEYSTONE_ENDPOINT=127.0.0.1 ENV SURVEIL_KEYSTONE_ENDPOINT=127.0.0.1
ENV SURVEIL_KEYSTONE_USERNAME=admin
ENV SURVEIL_KEYSTONE_PASSWORD=password
CMD cd /opt/surveil && \ CMD cd /opt/surveil && \
./setup.sh && \ ./setup.sh && \

2
tools/docker/surveil_container/setup.sh
View File

@ -8,6 +8,8 @@ function setup_surveil_api {
echo -e "=> Setting up Surveil API for keystone authentication..." echo -e "=> Setting up Surveil API for keystone authentication..."
sed -i "s/pipeline =.*/pipeline = authtoken api-server/" /etc/surveil/api_paste.ini sed -i "s/pipeline =.*/pipeline = authtoken api-server/" /etc/surveil/api_paste.ini
sed -i "s/auth_uri=.*/auth_uri=${SURVEIL_KEYSTONE_ENDPOINT}/" /etc/surveil/api_paste.ini sed -i "s/auth_uri=.*/auth_uri=${SURVEIL_KEYSTONE_ENDPOINT}/" /etc/surveil/api_paste.ini
sed -i "s/admin_user=.*/admin_user=${SURVEIL_KEYSTONE_USERNAME}/" /etc/surveil/api_paste.ini
sed -i "s/admin_password=.*/admin_password=${SURVEIL_KEYSTONE_PASSWORD}/" /etc/surveil/api_paste.ini
fi fi
} }