From d9e17b4468dcd7cce55d74aac2107b3f51f06e7b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Ole=C5=9B?= Date: Fri, 18 Dec 2015 01:20:34 +0100 Subject: [PATCH] Fix playbooks after recent changes: - create dir if it doesn't exist - set env for new config paths. Defaults from config.py were removed Change-Id: I580def8813595ffe18160f44894acf458f0d655a --- .gitignore | 2 ++ Dockerfile | 2 +- bootstrap/playbooks/celery.yaml | 2 ++ bootstrap/playbooks/solar.yaml | 29 +++++++++++++------------ bootstrap/playbooks/tasks/ssh_conf.yaml | 1 + docker-compose.yml | 7 ++---- 6 files changed, 23 insertions(+), 20 deletions(-) diff --git a/.gitignore b/.gitignore index c4fd1b5c..b5aeaf93 100644 --- a/.gitignore +++ b/.gitignore @@ -53,3 +53,5 @@ solar/.cache .config.override .testrepository/ + +.solar_config_override diff --git a/Dockerfile b/Dockerfile index 41aa3e3a..1091f938 100644 --- a/Dockerfile +++ b/Dockerfile @@ -7,7 +7,7 @@ ADD resources /resources ADD templates /templates ADD run.sh /run.sh -RUN apt-get upgrade && apt-get update +RUN apt-get update && apt-get upgrade -y RUN apt-get install -y python python-dev python-distribute python-pip openssh-client rsync libyaml-dev vim libffi-dev libssl-dev git RUN pip install ansible diff --git a/bootstrap/playbooks/celery.yaml b/bootstrap/playbooks/celery.yaml index f02da327..e6fa9d5c 100644 --- a/bootstrap/playbooks/celery.yaml +++ b/bootstrap/playbooks/celery.yaml @@ -5,6 +5,8 @@ sudo: yes vars: celery_dir: /var/run/celery + environment: + SOLAR_CONFIG_OVERRIDE: /.solar_config_override tasks: - shell: mkdir -p {{ celery_dir }} tags: [install] diff --git a/bootstrap/playbooks/solar.yaml b/bootstrap/playbooks/solar.yaml index 81347ce8..4b6c9acb 100644 --- a/bootstrap/playbooks/solar.yaml +++ b/bootstrap/playbooks/solar.yaml @@ -19,11 +19,25 @@ dest: /home/vagrant/.bashrc line: export SOLAR_CONFIG="/vagrant/.config" state: present + + # create custom config file /vagrant/.solar_config_override for vagrant env + - file: path=/.solar_config_override state=touch mode=0644 + - lineinfile: + dest: /.solar_config_override + line: "solar_db: riak://10.0.0.2:8087" + state: present + create: yes + - lineinfile: + dest: /.solar_config_override + line: "redis: redis://10.0.0.2:6379/1" + state: present + create: yes + # make riak default on vagrant env # unset - lineinfile: dest: /home/vagrant/.bashrc - line: export SOLAR_CONFIG_OVERRIDE="/home/vagrant/.solar_config_override" + line: export SOLAR_CONFIG_OVERRIDE="/.solar_config_override" state: present - lineinfile: dest: /home/vagrant/.bashrc @@ -34,19 +48,6 @@ line: export PYTHONWARNINGS="ignore" state: present -- hosts: all - tasks: - - lineinfile: - dest: /home/vagrant/.solar_config_override - line: "solar_db: riak://10.0.0.2:8087" - state: present - create: yes - - lineinfile: - dest: /home/vagrant/.solar_config_override - line: "redis: redis://10.0.0.2:6379/1" - state: present - create: yes - - hosts: all tasks: - file: path=/var/lib/solar/repositories state=directory diff --git a/bootstrap/playbooks/tasks/ssh_conf.yaml b/bootstrap/playbooks/tasks/ssh_conf.yaml index 1c99ff94..6dd03225 100644 --- a/bootstrap/playbooks/tasks/ssh_conf.yaml +++ b/bootstrap/playbooks/tasks/ssh_conf.yaml @@ -1,3 +1,4 @@ --- +- file: path=/root/.ssh state=directory mode=0700 - template: src=files/ssh_conf dest=/root/.ssh/config diff --git a/docker-compose.yml b/docker-compose.yml index fd60aade..02edeae0 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -10,11 +10,8 @@ solar-celery: - /vagrant/library:/vagrant/library - ~/.ssh:/root/.ssh - ./bootstrap/playbooks/celery.yaml:/celery.yaml - environment: - - REDIS_HOST=redis - - REDIS_PORT=6379 - - RIAK_HOST=riak - - RIAK_PORT=8087 + - /var/lib/solar/repositories:/var/lib/solar/repositories + - /.solar_config_override:/.solar_config_override # links are not used for configuration because we can rely on non-container # based datastores links: