summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSam Yaple <sam@yaple.net>2015-04-03 09:21:07 -0500
committerSam Yaple <sam@yaple.net>2015-04-03 09:28:59 -0500
commit9a81566d05a6fdbdf06cf68c87eebdb9043a28c6 (patch)
treecedb78bbc4e75906c975913e26700d5f39c1306f
parentc46cdfd53e8b3b629185a61dd5e59156f1ee2c57 (diff)
downloadkolla-9a81566d05a6fdbdf06cf68c87eebdb9043a28c6.tar.gz
kolla-9a81566d05a6fdbdf06cf68c87eebdb9043a28c6.zip
Allow the Kolla directory to be configurable
Implements the initial structure for variable substitution in ansible. Change-Id: I26d82189273be6ebf941b0ab82efc6bf1eebc53d
-rw-r--r--ansible/README.md3
-rw-r--r--ansible/group_vars/all.yml1
-rw-r--r--ansible/roles/database/tasks/main.yml2
-rw-r--r--ansible/roles/message-broker/tasks/main.yml2
4 files changed, 6 insertions, 2 deletions
diff --git a/ansible/README.md b/ansible/README.md
index 32da6604d..8bee0e895 100644
--- a/ansible/README.md
+++ b/ansible/README.md
@@ -25,6 +25,9 @@ to setup ssh-keys. More information on the ansible inventory file can be found
Deploying
---------
+You can adjust variables for your environment in the file:
+"./kolla/ansible/group_vars/all.yml"
+
For All-In-One deploys, you can run the following commands. These will setup all
of the containers on your localhost.
diff --git a/ansible/group_vars/all.yml b/ansible/group_vars/all.yml
new file mode 100644
index 000000000..313d58c35
--- /dev/null
+++ b/ansible/group_vars/all.yml
@@ -0,0 +1 @@
+koalla_directory: "/usr/share/kolla"
diff --git a/ansible/roles/database/tasks/main.yml b/ansible/roles/database/tasks/main.yml
index 3ce9c61ca..559b4bd1c 100644
--- a/ansible/roles/database/tasks/main.yml
+++ b/ansible/roles/database/tasks/main.yml
@@ -2,6 +2,6 @@
- name: Bringing up mariadb service(s)
docker_compose:
project_name: mariadb
- compose_file: /usr/share/kolla/compose/mariadb.yml
+ compose_file: "{{ koalla_directory }}/compose/mariadb.yml"
command: up
no_recreate: true
diff --git a/ansible/roles/message-broker/tasks/main.yml b/ansible/roles/message-broker/tasks/main.yml
index 1837e6bb0..c7a0fc830 100644
--- a/ansible/roles/message-broker/tasks/main.yml
+++ b/ansible/roles/message-broker/tasks/main.yml
@@ -2,6 +2,6 @@
- name: Bringing up rabbitmq service(s)
docker_compose:
project_name: rabbitmq
- compose_file: /usr/share/kolla/compose/rabbitmq.yml
+ compose_file: "{{ koalla_directory }}/compose/rabbitmq.yml"
command: up
no_recreate: true