Adding RegionOne to settings

telefonicaid · May 24, 2016 · 197c849 · 197c849
1 parent 0f80707
commit 197c849
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 50 deletions.
diff --git a/fiware-region-sanity-tests/docker/Dockerfile_test b/fiware-region-sanity-tests/docker/Dockerfile_test
@@ -32,6 +32,5 @@ WORKDIR /opt/fiware-health/fiware-region-sanity-tests
 RUN cp ./resources/docker/system.conf /etc/dbus-1/system.conf
 RUN source /root/venv/fiware-region-sanity-tests/bin/activate; pip2.7 install -r requirements.txt --allow-all-external
 EXPOSE 8081
-COPY settings.json settings.json
 COPY start.sh start.sh
 CMD ./start.sh
diff --git a/fiware-region-sanity-tests/docker/docker-compose.yml b/fiware-region-sanity-tests/docker/docker-compose.yml
@@ -3,6 +3,9 @@ ph:
   environment: 
    - KEY
    - VMIP
+   - OS_USER_DOMAIN_NAME
+   - OS_PROJECT_DOMAIN_NAME
+   - OS_IDENTITY_API_VERSION
    - OS_USERNAME
    - OS_PASSWORD
    - OS_AUTH_URL

diff --git a/fiware-region-sanity-tests/docker/settings.json b/fiware-region-sanity-tests/docker/settings.json
diff --git a/fiware-region-sanity-tests/docker/start.sh b/fiware-region-sanity-tests/docker/start.sh
@@ -1,6 +1,3 @@
-export OS_USER_DOMAIN_NAME=default
-export OS_PROJECT_DOMAIN_NAME=default
-export OS_IDENTITY_API_VERSION=3
 openstack project create test
 openstack user create test --password test --project test
 openstack role add --user test --project test owner
@@ -31,5 +28,4 @@ ssh -i key.pem -o "StrictHostKeyChecking no" centos@${VMIP} -fnN -R0:8081:0:8081
 git checkout origin/$BRANCH
 git pull origin $BRANCH
 pip install -r requirements.txt
-cp settings.json etc/settings.json
 ./sanity_checks $OS_REGION_NAME