From 862a63342540d43ca01e9fbe10e2f26aed9bd964 Mon Sep 17 00:00:00 2001 From: Kirill Klenov Date: Fri, 23 Jan 2015 12:43:11 +0300 Subject: [PATCH] Better handle mongodb-org --- defaults/main.yml | 2 +- tasks/install.deb.yml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/defaults/main.yml b/defaults/main.yml index ac14250..12b5d6c 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -9,7 +9,7 @@ mongodb_additional_packages: - python-pymongo mongodb_user: mongodb -mongodb_daemon_name: "{{ 'mongod' if ('mongodb-org' == mongodb_package) else 'mongodb' }}" +mongodb_daemon_name: "{{ 'mongod' if ('mongodb-org' in mongodb_package) else 'mongodb' }}" mongodb_conf_auth: no # Run with security mongodb_conf_bind_ip: 127.0.0.1 # Comma separated list of ip addresses to listen on diff --git a/tasks/install.deb.yml b/tasks/install.deb.yml index 2c412a2..bd967ef 100644 --- a/tasks/install.deb.yml +++ b/tasks/install.deb.yml @@ -4,11 +4,11 @@ - name: Add APT key apt_key: url=http://docs.mongodb.org/10gen-gpg-key.asc id=7F0CEB10 - when: mongodb_package == 'mongodb-org' + when: '"mongodb-org" in mongodb_package' - name: Add APT repository apt_repository: repo="{{mongodb_repository}}" update_cache=yes - when: mongodb_package == 'mongodb-org' + when: '"mongodb-org" in mongodb_package' - name: Install MongoDB package apt: pkg={{mongodb_package}} state=present