From 804d89698bc6867dba1b17555649910cfe385911 Mon Sep 17 00:00:00 2001 From: Kirill Klenov Date: Wed, 30 Jul 2014 18:32:46 +0100 Subject: [PATCH] Migrate to the mongo-org package --- defaults/main.yml | 4 ++-- handlers/main.yml | 4 ++-- tasks/configure.yml | 2 +- tasks/mongodb.yml | 2 +- templates/{mongodb.conf.j2 => mongod.conf.j2} | 0 5 files changed, 6 insertions(+), 6 deletions(-) rename templates/{mongodb.conf.j2 => mongod.conf.j2} (100%) diff --git a/defaults/main.yml b/defaults/main.yml index 4cccb3b..15e560d 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -4,11 +4,11 @@ mongodb_enabled: yes mongodb_packages: - python-selinux - python-pymongo - - mongodb-10gen + - mongodb-org # Configuration mongodb_dbpath: /var/lib/mongodb -mongodb_logpath: /var/log/mongodb/mongodb.log +mongodb_logpath: /var/log/mongodb/mongod.log mongodb_port: 27017 mongodb_nojournal: true mongodb_cpu: true diff --git a/handlers/main.yml b/handlers/main.yml index 483a0c4..b6cfe60 100644 --- a/handlers/main.yml +++ b/handlers/main.yml @@ -1,7 +1,7 @@ --- - name: mongodb reload - service: name=mongodb state=reloaded + service: name=mongod state=reloaded - name: mongodb restart - service: name=mongodb state=restarted + service: name=mongod state=restarted diff --git a/tasks/configure.yml b/tasks/configure.yml index b9d79ad..ebd00fb 100644 --- a/tasks/configure.yml +++ b/tasks/configure.yml @@ -1,7 +1,7 @@ --- - name: Configure mongodb - template: src=mongodb.conf.j2 dest=/etc/mongodb.conf owner=root group=root mode=0644 + template: src=mongod.conf.j2 dest=/etc/mongod.conf owner=root group=root mode=0644 notify: mongodb reload - name: Configure log rotation diff --git a/tasks/mongodb.yml b/tasks/mongodb.yml index 5d704d8..a6bc996 100644 --- a/tasks/mongodb.yml +++ b/tasks/mongodb.yml @@ -4,6 +4,6 @@ when: ansible_os_family == 'Debian' - name: Ensure mongodb is started - service: name=mongodb state=started + service: name=mongod state=started - include: configure.yml diff --git a/templates/mongodb.conf.j2 b/templates/mongod.conf.j2 similarity index 100% rename from templates/mongodb.conf.j2 rename to templates/mongod.conf.j2