From 28fa7389b10219392c8db9b3b575a2805bfdab8b Mon Sep 17 00:00:00 2001 From: Shaun Zinck Date: Wed, 23 Jan 2013 22:09:07 -0600 Subject: [PATCH 1/5] added first version of pkgin, just does install, remove (for SmartOS) --- pkgin | 142 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 142 insertions(+) create mode 100755 pkgin diff --git a/pkgin b/pkgin new file mode 100755 index 00000000000..0d67341b2ee --- /dev/null +++ b/pkgin @@ -0,0 +1,142 @@ +#!/usr/bin/python -tt +# -*- coding: utf-8 -*- + +# (c) 2013, Shaun Zinck +# Written by Shaun Zinck +# Based on pacman module written by Afterburn +# that was based on apt module written by Matthew Williams +# +# This module is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This software is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this software. If not, see . + + +DOCUMENTATION = ''' +--- +module: pkgin +short_description: Package manager for SmartOS +description: + - Manages SmartOS packages + +version_added: "1.0" +options: + name: + description: + - name of package to install/remove + required: true + + state: + description: + - state of the package installed or absent. + required: false + +author: Shaun Zinck +notes: [] +examples: + - code: "pkgin: name=foo state=installed" + description: install package foo" + - code: "pkgin: name=foo state=absent" + description: remove package foo + - code: "pkgin: name=foo,bar state=absent + description: remove packages foo and bar + +''' + + +import json +import shlex +import os +import sys + +PKGIN_PATH = "/opt/local/bin/pkgin" + +def query_package(module, name, state="installed"): + + if state == "installed": + + rc = os.system("%s list | grep ^%s" % (PKGIN_PATH, name)) + + if rc == 0: + return True + + return False + + +def remove_packages(module, packages): + + remove_c = 0 + # Using a for loop incase of error, we can report the package that failed + for package in packages: + # Query the package first, to see if we even need to remove + if not query_package(module, package): + continue + + rc = os.system("%s -y remove %s" % (PKGIN_PATH, package)) + + if rc != 0: + module.fail_json(msg="failed to remove %s" % (package)) + + remove_c += 1 + + if remove_c > 0: + + module.exit_json(changed=True, msg="removed %s package(s)" % remove_c) + + module.exit_json(changed=False, msg="package(s) already absent") + + +def install_packages(module, packages): + + install_c = 0 + + for package in packages: + if query_package(module, package): + continue + + rc = os.system("%s -y install %s" % (PKGIN_PATH, package)) + + if rc != 0: + module.fail_json(msg="failed to install %s" % (package)) + + install_c += 1 + + if install_c > 0: + module.exit_json(changed=True, msg="installed %s package(s)" % (install_c)) + + module.exit_json(changed=False, msg="package(s) already installed") + + + +def main(): + module = AnsibleModule( + argument_spec = dict( + state = dict(default="installed", choices=["installed","absent"]), + name = dict(aliases=["pkg"], required=True))) + + + if not os.path.exists(PKGIN_PATH): + module.fail_json(msg="cannot find pkgin, looking for %s" % (PKGIN_PATH)) + + p = module.params + + pkgs = p["name"].split(",") + + if p["state"] == "installed": + install_packages(module, pkgs) + + elif p["state"] == "absent": + remove_packages(module, pkgs) + +# this is magic, see lib/ansible/module_common.py +#<> + +main() From 6a879562b65c45673e607038f2b93d3249e584d2 Mon Sep 17 00:00:00 2001 From: Shaun Zinck Date: Wed, 23 Jan 2013 22:12:13 -0600 Subject: [PATCH 2/5] add pkgin to list of package managers in setup --- setup | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/setup b/setup index 07e4cdaf466..f4fa950e3ee 100644 --- a/setup +++ b/setup @@ -82,10 +82,11 @@ class Facts(object): # A list of dicts. If there is a platform with more than one # package manager, put the preferred one last. If there is an # ansible module, use that as the value for the 'name' key. - PKG_MGRS = [ { 'path' : '/usr/bin/yum', 'name' : 'yum' }, - { 'path' : '/usr/bin/apt-get', 'name' : 'apt' }, - { 'path' : '/usr/bin/zypper', 'name' : 'zypper' }, - { 'path' : '/usr/bin/pacman', 'name' : 'pacman' } ] + PKG_MGRS = [ { 'path' : '/usr/bin/yum', 'name' : 'yum' }, + { 'path' : '/usr/bin/apt-get', 'name' : 'apt' }, + { 'path' : '/usr/bin/zypper', 'name' : 'zypper' }, + { 'path' : '/usr/bin/pacman', 'name' : 'pacman' }, + { 'path' : '/opt/local/bin/pkgin', 'name' : 'pkgin' } ] def __init__(self): self.facts = {} From dd67e5c36f248765bbf165952750ead5d4d39177 Mon Sep 17 00:00:00 2001 From: Shaun Zinck Date: Thu, 24 Jan 2013 19:58:31 -0600 Subject: [PATCH 3/5] pkgin: change install/remove to not use return code of pkgin pkgin always returns 0 so can't be used to tell if the install or remove worked. Instead this just queries the installed packages after performing an operation. --- pkgin | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgin b/pkgin index 0d67341b2ee..acbc55e0461 100755 --- a/pkgin +++ b/pkgin @@ -82,7 +82,7 @@ def remove_packages(module, packages): rc = os.system("%s -y remove %s" % (PKGIN_PATH, package)) - if rc != 0: + if query_package(module, package): module.fail_json(msg="failed to remove %s" % (package)) remove_c += 1 @@ -104,7 +104,7 @@ def install_packages(module, packages): rc = os.system("%s -y install %s" % (PKGIN_PATH, package)) - if rc != 0: + if not query_package(module, package): module.fail_json(msg="failed to install %s" % (package)) install_c += 1 From a25575cee92d251b85f7a1248a20368b02c078cd Mon Sep 17 00:00:00 2001 From: Shaun Zinck Date: Fri, 25 Jan 2013 16:48:58 -0600 Subject: [PATCH 4/5] pkgin: use module.run_command to run stuff This also fixes an issue where some console output for packages I was installing was creating invalid JSON because it contained single-quotes. --- pkgin | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgin b/pkgin index acbc55e0461..02fac16f27f 100755 --- a/pkgin +++ b/pkgin @@ -63,7 +63,7 @@ def query_package(module, name, state="installed"): if state == "installed": - rc = os.system("%s list | grep ^%s" % (PKGIN_PATH, name)) + (rc, stdout, stderr) = module.run_command("%s list | grep ^%s" % (PKGIN_PATH, name)) if rc == 0: return True @@ -80,7 +80,7 @@ def remove_packages(module, packages): if not query_package(module, package): continue - rc = os.system("%s -y remove %s" % (PKGIN_PATH, package)) + module.run_command("%s -y remove %s" % (PKGIN_PATH, package)) if query_package(module, package): module.fail_json(msg="failed to remove %s" % (package)) @@ -102,7 +102,7 @@ def install_packages(module, packages): if query_package(module, package): continue - rc = os.system("%s -y install %s" % (PKGIN_PATH, package)) + module.run_command("%s -y install %s" % (PKGIN_PATH, package)) if not query_package(module, package): module.fail_json(msg="failed to install %s" % (package)) From 835d7e9bc8cfb6a171db4794c8689ad3f7507927 Mon Sep 17 00:00:00 2001 From: Shaun Zinck Date: Fri, 25 Jan 2013 16:58:29 -0600 Subject: [PATCH 5/5] pkgin: add stdout to error message when shell commands fail --- pkgin | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgin b/pkgin index 02fac16f27f..eec541135b5 100755 --- a/pkgin +++ b/pkgin @@ -63,7 +63,7 @@ def query_package(module, name, state="installed"): if state == "installed": - (rc, stdout, stderr) = module.run_command("%s list | grep ^%s" % (PKGIN_PATH, name)) + rc, out, err = module.run_command("%s list | grep ^%s" % (PKGIN_PATH, name)) if rc == 0: return True @@ -80,10 +80,10 @@ def remove_packages(module, packages): if not query_package(module, package): continue - module.run_command("%s -y remove %s" % (PKGIN_PATH, package)) + rc, out, err = module.run_command("%s -y remove %s" % (PKGIN_PATH, package)) if query_package(module, package): - module.fail_json(msg="failed to remove %s" % (package)) + module.fail_json(msg="failed to remove %s: %s" % (package, out)) remove_c += 1 @@ -102,10 +102,10 @@ def install_packages(module, packages): if query_package(module, package): continue - module.run_command("%s -y install %s" % (PKGIN_PATH, package)) + rc, out, err = module.run_command("%s -y install %s" % (PKGIN_PATH, package)) if not query_package(module, package): - module.fail_json(msg="failed to install %s" % (package)) + module.fail_json(msg="failed to install %s: %s" % (package, out)) install_c += 1