x/solar
Code Issues Proposed changes

Merge "Some speedups after adding PG"

Browse Source
This commit is contained in:
Jenkins 2016-02-18 21:42:19 +00:00 committed by Gerrit Code Review
commit c39c2bc130
3 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
bootstrap/playbooks/postgres.yaml
View File

@ -8,9 +8,14 @@
POSTGRES_USER: solar POSTGRES_USER: solar
POSTGRES_PASSWORD: solar POSTGRES_PASSWORD: solar
POSTGRES_DATABASE: solar POSTGRES_DATABASE: solar
- wait_for: host=127.0.0.1 port=5432 timeout=15 delay=1 - name: Waiting for postgresql in container
- shell: docker exec vagrant_pg_1 gosu postgres psql -c "DROP DATABASE solar;" shell: docker exec vagrant_pg_1 psql -h localhost -U solar -c "SELECT NOW();"
- shell: docker exec vagrant_pg_1 gosu postgres psql -c "CREATE DATABASE solar WITH owner=postgres LC_COLLATE='C' TEMPLATE template0;" register: result
until: result.rc == 0
retries: 15
delay: 1
- shell: docker exec vagrant_pg_1 psql -h localhost -U solar postgres -c "DROP DATABASE solar;"
- shell: docker exec vagrant_pg_1 psql -h localhost -U solar postgres -c "CREATE DATABASE solar WITH owner=postgres LC_COLLATE='C' TEMPLATE template0;"
- lineinfile: - lineinfile:
dest: /.solar_config_override dest: /.solar_config_override
line: "solar_db: postgresql://solar:solar@127.0.0.1:5432/solar" line: "solar_db: postgresql://solar:solar@127.0.0.1:5432/solar"

4
bootstrap/playbooks/solar.yaml
View File

@ -1,6 +1,6 @@
--- ---
- hosts: all - hosts: localhost
sudo: yes sudo: yes
vars: vars:
ssh_ip_mask: "10.*.*.*" ssh_ip_mask: "10.*.*.*"
@ -12,7 +12,7 @@
- shell: pip install git+git://github.com/Mirantis/solar-agent.git - shell: pip install git+git://github.com/Mirantis/solar-agent.git
- include: tasks/ssh_conf.yaml - include: tasks/ssh_conf.yaml
- hosts: all - hosts: localhost
tasks: tasks:
# setup solar-resources # setup solar-resources
# change to openstack/solar-resources later # change to openstack/solar-resources later

6
utils/jenkins/run.sh
View File

@ -65,13 +65,9 @@ set -e
# wait for riak # wait for riak
if [ $SOLAR_DB_BACKEND == "riak" ] if [ ${SOLAR_DB_BACKEND} == "riak" ]
then then
sudo docker exec vagrant_riak_1 riak-admin wait_for_service riak_kv; sudo docker exec vagrant_riak_1 riak-admin wait_for_service riak_kv;
elif [ $SOLAR_DB_BACKEND == "postgres" ]
then
# TODO: Should be replaced with something smarter
sleep 5
fi fi
export SOLAR_CONFIG_OVERRIDE="/.solar_config_override" export SOLAR_CONFIG_OVERRIDE="/.solar_config_override"