diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-04-06 00:44:34 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-04-06 00:44:34 +0000 |
| commit | c4653bf9c8af9006058ce51fe403c0135d29b48b (patch) | |
| tree | 1b1fce2c9f20473288e2776717e196b33b73d93c | |
| parent | 0573da4424daf02e2b8e4932c1c56adfa77cb17d (diff) | |
| parent | 9a81566d05a6fdbdf06cf68c87eebdb9043a28c6 (diff) | |
| download | kolla-c4653bf9c8af9006058ce51fe403c0135d29b48b.tar.gz kolla-c4653bf9c8af9006058ce51fe403c0135d29b48b.zip | |
Merge "Allow the Kolla directory to be configurable"
| -rw-r--r-- | ansible/README.md | 3 | ||||
| -rw-r--r-- | ansible/group_vars/all.yml | 1 | ||||
| -rw-r--r-- | ansible/roles/database/tasks/main.yml | 2 | ||||
| -rw-r--r-- | ansible/roles/message-broker/tasks/main.yml | 2 |
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 |