diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-03-23 15:51:42 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-03-23 15:51:42 +0000 |
| commit | 2bed01f981f8bc90332a651c979326beb914c479 (patch) | |
| tree | 2a8e43e2f367a68110bc618f97c774cfaef4625b | |
| parent | 73f55d3d6f71b7fd15f1a72af3fa33643737af8b (diff) | |
| parent | fea486a7f09aed323a1c336712c239fd602266cb (diff) | |
| download | kolla-2bed01f981f8bc90332a651c979326beb914c479.tar.gz kolla-2bed01f981f8bc90332a651c979326beb914c479.zip | |
Merge "MariaDB is not copied if enable_rabitmq is disabled"
| -rw-r--r-- | ansible/roles/common/tasks/config.yml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ansible/roles/common/tasks/config.yml b/ansible/roles/common/tasks/config.yml index 9835a318b..c26166cfa 100644 --- a/ansible/roles/common/tasks/config.yml +++ b/ansible/roles/common/tasks/config.yml @@ -28,7 +28,7 @@ - { name: "haproxy", enabled: "{{ enable_haproxy }}" } - { name: "horizon", enabled: "{{ enable_horizon }}" } - { name: "keystone", enabled: "{{ enable_keystone }}" } - - { name: "mariadb", enabled: "{{ enable_rabbitmq }}" } + - { name: "mariadb", enabled: "{{ enable_mariadb }}" } - { name: "openstack", enabled: "yes" } - { name: "rabbitmq", enabled: "{{ enable_rabbitmq }}" } - { name: "swift-account-auditor", src: "swift", enabled: "{{ enable_swift }}" } |