Merge branch 'update_puppet' of github.com:colab-community/colab into update_puppet

Sergio Oliveira
2 parents 733d4cda 7c6bb027
Showing 2 changed files with 136 additions and 98 deletions Show diff stats
fabfile.py
puppet/bootstrap.py
@@ -9,23 +9,24 @@ from fabric.api import env, run, sudo, local
 from fabric.contrib.files import exists
 from fabric.context_managers import prefix, cd, settings, shell_env
-LINUX_DISTRO = ''
 DEBIAN_FAMILY = ['debian', 'ubuntu']
 REDHAT_FAMILY = ['centos', 'fedora']
-DISTRO_CMD = {'debian': ('apt-get', {
-				'install': '-y',
-				'update': '-y',
-			}), 
-	      'redhat': ('yum', {
-				'install': '-y',
-				'update': '-y',
-	                })
-             }
+DISTRO_CMD = {
+    'debian': ('apt-get', {
+        'install': '-y',
+        'update': '-y',
+        }),
+    'redhat': ('yum', {
+        'install': '-y',
+        'update': '-y',
+        })
+}
 APP_USER = APP_NAME = VENV_NAME = 'colab'
 REPO_URL = 'git@github.com:colab-community/colab.git'
+
 environments = {
     'dev': {
         'hosts': ['127.0.0.1'],
@@ -47,19 +48,23 @@ WORKON_ENV = &#39;{} &amp;&amp; workon {}&#39;.format(SOURCE_VENV, VENV_NAME)
 MANAGE_PATH = os.path.join(REPO_PATH, 'src')
 SETTINGS_PATH = os.path.join(MANAGE_PATH, APP_NAME)
+
 def get_distro_family():
-    linux_name = run('python -c "import platform; print platform.dist()[0]"').lower()
+    cmd = 'python -c "import platform; print platform.dist()[0]"'
+    linux_name = run(cmd).lower()
     if linux_name in DEBIAN_FAMILY:
-	return 'debian'
+        return 'debian'
     elif linux_name in REDHAT_FAMILY:
-	return 'redhat'
-    else :
-	error(colors.red('Distribuiton `{}` not supported.'.format(linux_name)))
-	exit(1)
+        return 'redhat'
+    else:
+        error(colors.red('Distribuiton `{}` not supported'.format(linux_name)))
+        exit(1)
+
-def cmd(family, command, args = ''):
+def cmd(family, command, args=''):
     pkgmanager, commands = DISTRO_CMD[family]
-    return '{} {} {} {}'.format(pkgmanager, command, commands[command], args)
+    return ' '.join([pkgmanager, command, commands[command], args])
+
 @task
 def environment(name=DEFAULT_ENVIRONMENT):
@@ -80,9 +85,11 @@ def environment(name=DEFAULT_ENVIRONMENT):
     env.update(environments[name])
     env.environment = name
-def package_install(pkg): 
+
+def package_install(pkg):
     family = get_distro_family()
-    sudo(cmd(family, 'install', pkg ))
+    sudo(cmd(family, 'install', pkg))
+
 def install_requirements():
     with cd(REPO_PATH), prefix(WORKON_ENV):
@@ -96,12 +103,14 @@ def install_requirements():
         else:
             run('pip install -r requirements.txt')
+
 def mkvirtualenv():
     if not exists('~/.virtualenvs/' + VENV_NAME):
         with prefix(SOURCE_VENV):
             run('mkvirtualenv ' + VENV_NAME)
             return True
+
 def manage(command):
     django_settings = env.get('django_settings')
     env_vars = {}
@@ -112,17 +121,21 @@ def manage(command):
         with cd(MANAGE_PATH), prefix(WORKON_ENV):
             run('python manage.py {}'.format(command))
+
 def syncdb():
     manage('syncdb')
+
 def migrate():
     manage('migrate')
+
 def collectstatic():
     sudo('mkdir -p /usr/share/nginx/{}'.format(APP_NAME))
     sudo('chown {} /usr/share/nginx/{}'.format(env.user, APP_NAME))
     manage('collectstatic --noinput')
+
 def create_local_settings():
     with cd(SETTINGS_PATH), settings(user=env.superuser):
         env_local_settings = 'local_settings-{}.py'.format(env.environment)
@@ -131,6 +144,7 @@ def create_local_settings():
             run('ln -s {} {}'.format(env_local_settings, 'local_settings.py'))
             run('chown {} local_settings.py'.format(env.user))
+
 def update_code():
     if env.is_vagrant:
         if not exists(REPO_PATH):
@@ -143,26 +157,29 @@ def update_code():
         with cd(REPO_PATH):
             run('git pull')
+
 @task
 def bootstrap():
     """Bootstrap machine to run fabric tasks"""
+
     with settings(user=env.superuser):
-	family = get_distro_family()
-	sudo(cmd(family, 'update'))
-        
-	if not exists('/usr/bin/git'):
+        family = get_distro_family()
+        sudo(cmd(family, 'update'))
+
+        if not exists('/usr/bin/git'):
             package_install('git-core')
         if env.is_vagrant:
-            groups = ['sudo' ,'vagrant']
+            groups = ['sudo', 'vagrant']
             local('chmod -fR g+w {}'.format(PROJECT_PATH))
         else:
             groups = ['sudo']
-	for group in groups:
-  	    sudo('groupadd -f {}'.format(group))
+        for group in groups:
+            sudo('groupadd -f {}'.format(group))
-        sudo('useradd {} -G {} -m -s /bin/bash'.format(APP_USER, ','.join(groups)))
+        command = 'useradd {} -G {} -m -s /bin/bash'
+        sudo(command.format(APP_USER, ','.join(groups)))
         ssh_dir = '/home/{0}/.ssh/'.format(APP_USER)
         if not exists(ssh_dir):
@@ -182,11 +199,13 @@ def bootstrap():
             sudo('chmod 440 {}'.format(tmp_file))
             sudo('mv {} {}'.format(tmp_file, sudoers_file))
+
 @task
 def provision():
     """Run puppet"""
     update_code()
+
     puppet_path = os.path.join(REPO_PATH, 'puppet/')
     modules_path = os.path.join(puppet_path, 'modules')
     puppet_modules = '{}:/etc/puppet/modules'.format(modules_path)
@@ -205,6 +224,7 @@ def provision():
     sudo('puppet apply --modulepath={} {}'.format(puppet_modules, cmd))
+
 @task
 def ssh_keygen():
     """Create SSH credentials"""
@@ -218,6 +238,7 @@ def ssh_keygen():
     print('')
     print('Add the key above to your github repository deploy keys')
+
 @task
 def deploy(noprovision=False):
     """Deploy and run the new code (master branch)"""
@@ -239,5 +260,6 @@ def deploy(noprovision=False):
     sudo('supervisorctl start all')
+
 # Main
 environment()
-#!/usr/bin/env python2.7
+#!/usr/bin/env python
 import os
-import apt
-import apt_pkg
+import re
 import locale
 import platform
 import subprocess
 import urllib
-from apt import debfile
 from distutils.version import StrictVersion
 from pkg_resources import parse_requirements
 from shutil import copyfile
-from subprocess import check_output
-
-PUPPET_TARGET_VERSION="3.4.3-1"
+PUPPET_TARGET_VERSION = "3.6.2"
 PUPPET_DIR = os.path.join(os.path.dirname(__file__))
 MODULES_FILE_PATH = os.path.join(PUPPET_DIR, 'modules.txt')
-def get_package(name):
-    cache = apt.cache.Cache()
-    if name in cache:
-        return cache[name], cache
-
-    return None, None
-
-
-def pkg_available(name):
-    pkg = get_package(name)[0]
-    if pkg and pkg.versions.get(PUPPET_TARGET_VERSION):
-        return True
-
-    return False
-
-
-def config_puppetlabs_repo():
-    dist = platform.dist()[-1]
-
-    url = 'http://apt.puppetlabs.com/puppetlabs-release-{}.deb'.format(dist)
-    filename = '/tmp/puppet_apt.deb'
-    try:
-        urllib.urlretrieve(url, filename)
-    except IOError:
-        print "Could not install puppet"
-        raise
-
-    deb_pkg = debfile.DebPackage(filename)
-    if deb_pkg.check():
-        deb_pkg.install()
-        cache = apt.cache.Cache()
-        cache.update()
-        cache.open()
-
-
-def install_puppet(upgrade=False):
-    pkg, cache = get_package('puppet')
-
-    pkg.candidate = pkg.versions.get(PUPPET_TARGET_VERSION)
-    if upgrade:
-        pkg.mark_upgrade()
+def get_release_name():
+    distro = platform.dist()[0].lower()
+    if distro == 'centos':
+        with open('/etc/centos-release') as release_file:
+            regex = r'CentOS release (\d)'
+            release = re.search(regex, release_file.read()).group(1)
+            return 'centos', release
+    elif distro == 'ubuntu':
+        with open('/etc/lsb-release') as release_file:
+            regex = r'DISTRIB_CODENAME=([a-z]+)'
+            release = re.search(regex, release_file.read()).group(1)
+            return 'ubuntu', release
     else:
-        pkg.mark_install()
-
-    cache.commit()
+        return '', ''
 def get_modules_installed():
-    modules_list = check_output(['puppet', 'module', 'list']).split('\n')
+    modules_list = os.popen('puppet module list').read().split('\n')
     modules_list = [line for line in modules_list if 'no modules' not in line]
     modules_list = [item.split()[1:] for item in modules_list]
     modules_list = [item for item in modules_list if item]
@@ -83,9 +48,9 @@ def get_modules_installed():
 def run(cmd, module, version=''):
     if version:
-        version = ' --version {}'.format(version)
+        version = ' --version %s' % (version)
-    cmd = 'puppet module {} {}{}'.format(cmd, module, version)
+    cmd = 'puppet module %s %s%s' % (cmd, module, version)
     process = subprocess.Popen(cmd, shell=True, executable='/bin/bash')
     process.wait()
@@ -97,16 +62,19 @@ def install_puppet_modules():
         modules_requirements = modules_file.read().replace('/', '-')
     for module in parse_requirements(modules_requirements):
-
         current_cmd, compare, version, version_comparison = '', '', '', None
         if module.project_name in modules_installed:
-
             if module.specs:
                 compare, version = module.specs[0]
-                version_comparison = apt_pkg.version_compare(
-                    modules_installed[module.project_name],
-                    version
-                )
+
+                tmp_version = modules_installed[module.project_name]
+                installed_version = StrictVersion(tmp_version)
+                required_version = StrictVersion(version)
+
+                if installed_version >= required_version:
+                    version_comparison = 0
+                else:
+                    version_comparison = -1
             else:
                 continue
@@ -125,17 +93,65 @@ def install_puppet_modules():
             if not version_comparison or version_comparison < 0:
                 run(current_cmd, module.project_name)
+
+def iscentos(distro):
+    return distro == 'centos'
+
+
+def isubuntu(distro):
+    return distro == 'ubuntu'
+
+
+def download(url, filename):
+    try:
+        urllib.urlretrieve(url, filename)
+    except IOError:
+        print "Could not install puppet"
+        raise
+
+
 def main():
-    # If the package not found or if the version is outdated, install puppet
-    if not pkg_available('puppet'):
-        config_puppetlabs_repo()
-
-    pkg = get_package('puppet')[0]
-    if not pkg.is_installed:
-        install_puppet()
-    elif apt_pkg.version_compare(pkg.installed.version,
-                                 PUPPET_TARGET_VERSION) < 0:
-        install_puppet(upgrade=True)
+    distro, release = get_release_name()
+    print('Distro %s, release %s' % (distro, release))
+
+    if iscentos(distro):
+        cmd = 'rpm'
+        flags = '-ivh'
+        url = 'http://yum.puppetlabs.com/'
+        pkg = 'puppetlabs-release-el-%s.noarch.rpm' % (release)
+        update = ['yum', 'update', '-y']
+        install = ['yum', 'install', 'puppet', '-y']
+    elif isubuntu(distro):
+        cmd = 'dpkg'
+        flags = '-i'
+        url = 'https://apt.puppetlabs.com/'
+        pkg = 'puppetlabs-release-%s.deb' % (release)
+        update = ['apt-get', 'update', '-y']
+        install = ['apt-get', 'install', 'puppet', '-y']
+
+        # Needed dependency for import pkg_resources
+        pkg_res = ['apt-get', 'install', 'python-pkg-resources', '-y']
+        subprocess.call(pkg_res)
+    else:
+        print('This distribuition is currently not supported!')
+        print('exiting...')
+        exit(1)
+
+    tmp_file = '/tmp/%s' % (pkg)
+    download(url + pkg, tmp_file)
+    args = [cmd, flags, tmp_file]
+
+    # Add repository
+    result = subprocess.call(args)
+    if result != 0:
+        print('Repository %s already set' % pkg)
+
+    # Install Puppet
+    subprocess.call(update)
+    result = subprocess.call(install)
+    if result != 0:
+        print('Failed installing puppet')
+        exit(result)
     if os.path.isfile('/vagrant/puppet/hiera.yaml'):
         copyfile('/vagrant/puppet/hiera.yaml', '/etc/puppet/hiera.yaml')