From 826847b5479c62d9ecdedfccb05126526a78d8fd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vesa=20Poikaj=C3=A4rvi?= Date: Wed, 28 Dec 2016 19:55:16 +0200 Subject: [PATCH] Mongo 3.4 and (partial) Xenial support Partial support because mongodb_transparent_hugepage_disable creates an upstart init file that does not work with systemd --- defaults/main.yml | 5 ++++- files/mongod.service | 10 ---------- tasks/install.deb.yml | 2 +- tasks/install.xenial.yml | 4 ---- tasks/mongodb.yml | 3 --- vars/Debian.yml | 8 ++++++-- vars/Ubuntu.yml | 8 ++++++-- 7 files changed, 17 insertions(+), 23 deletions(-) delete mode 100644 files/mongod.service delete mode 100644 tasks/install.xenial.yml diff --git a/defaults/main.yml b/defaults/main.yml index 733665f..f45607a 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -19,7 +19,7 @@ mongodb_additional_packages: mongodb_user: mongodb mongodb_logdir: /var/log/mongodb -mongodb_version: "3.2.4" # Fully specified target installation version +mongodb_version: "3.2.11" # Fully specified target installation version mongodb_transparent_hugepage_disable: false # Service setup options @@ -36,6 +36,9 @@ mongodb_version_config: # Custom configuration for majo v3.2: daemon: mongod config_file: mongod.conf + v3.4: + daemon: mongod + config_file: mongod.conf # Config options mongodb_conf_auth: no # Run with security diff --git a/files/mongod.service b/files/mongod.service deleted file mode 100644 index 66ebce2..0000000 --- a/files/mongod.service +++ /dev/null @@ -1,10 +0,0 @@ -[Unit] -Description=High-performance, schema-free document-oriented database -After=network.target - -[Service] -User=mongodb -ExecStart=/usr/bin/mongod --quiet --config /etc/mongod.conf - -[Install] -WantedBy=multi-user.target diff --git a/tasks/install.deb.yml b/tasks/install.deb.yml index e7f1080..78edeb4 100644 --- a/tasks/install.deb.yml +++ b/tasks/install.deb.yml @@ -7,7 +7,7 @@ mongodb_repository_data: "{{mongodb_repository_config[mongodb_major_minor_version]}}" - name: Add APT key - apt_key: keyserver=keyserver.ubuntu.com id=EA312927 + apt_key: keyserver=keyserver.ubuntu.com id={{ mongodb_repository_data.signing_key|default('EA312927') }} - name: Add APT repository apt_repository: repo="{{mongodb_repository_data.repository}}" update_cache=yes diff --git a/tasks/install.xenial.yml b/tasks/install.xenial.yml deleted file mode 100644 index 55716f0..0000000 --- a/tasks/install.xenial.yml +++ /dev/null @@ -1,4 +0,0 @@ -- name: install systemd service - copy: - src=mongod.service - dest=/etc/systemd/system/mongod.service diff --git a/tasks/mongodb.yml b/tasks/mongodb.yml index dca8a7e..eacea05 100644 --- a/tasks/mongodb.yml +++ b/tasks/mongodb.yml @@ -13,9 +13,6 @@ - include: install.deb.yml when: ansible_os_family == 'Debian' and mongodb_install -- include: install.xenial.yml - when: ansible_os_family == 'Debian' and ansible_distribution_release == 'xenial' - - include: configure.yml when: mongodb_install diff --git a/vars/Debian.yml b/vars/Debian.yml index f1c7822..025fc48 100644 --- a/vars/Debian.yml +++ b/vars/Debian.yml @@ -7,8 +7,12 @@ mongodb_repository_config: repository: deb http://downloads-distro.mongodb.org/repo/debian-sysvinit dist 10gen package: mongodb-org v3.0: - repository: deb http://repo.mongodb.org/apt/debian wheezy/mongodb-org/3.0 main + repository: deb http://repo.mongodb.org/apt/debian {{ ansible_distribution_release|default('wheezy')|lower }}/mongodb-org/3.0 main package: mongodb-org v3.2: - repository: deb http://repo.mongodb.org/apt/debian wheezy/mongodb-org/3.2 main + repository: deb http://repo.mongodb.org/apt/debian {{ ansible_distribution_release|default('wheezy')|lower }}/mongodb-org/3.2 main package: mongodb-org + v3.4: + repository: deb http://repo.mongodb.org/apt/debian {{ ansible_distribution_release|default('wheezy')|lower }}/mongodb-org/3.4 main + package: mongodb-org + signing_key: 0C49F3730359A14518585931BC711F9BA15703C6 diff --git a/vars/Ubuntu.yml b/vars/Ubuntu.yml index 974a8b9..d2d30d8 100644 --- a/vars/Ubuntu.yml +++ b/vars/Ubuntu.yml @@ -7,8 +7,12 @@ mongodb_repository_config: repository: deb http://downloads-distro.mongodb.org/repo/ubuntu-upstart dist 10gen package: mongodb-org v3.0: - repository: deb http://repo.mongodb.org/apt/ubuntu trusty/mongodb-org/3.0 multiverse + repository: deb http://repo.mongodb.org/apt/ubuntu {{ ansible_distribution_release|default('trusty')|lower }}/mongodb-org/3.0 multiverse package: mongodb-org v3.2: - repository: deb http://repo.mongodb.org/apt/ubuntu trusty/mongodb-org/3.2 multiverse + repository: deb http://repo.mongodb.org/apt/ubuntu {{ ansible_distribution_release|default('trusty')|lower }}/mongodb-org/3.2 multiverse package: mongodb-org + v3.4: + repository: deb http://repo.mongodb.org/apt/ubuntu {{ ansible_distribution_release|default('trusty')|lower }}/mongodb-org/3.4 multiverse + package: mongodb-org + signing_key: 0C49F3730359A14518585931BC711F9BA15703C6