Merge lp:~corey.bryant/charms/trusty/openstack-dashboard/git-ods into lp:~openstack-charmers-archive/charms/trusty/openstack-dashboard/next

[Corey Bryant]

Adds support to:
* Use a Python virtualenv when deploying from source
* Default to shallow clone for git (depth=1)
* Pass http_proxy to pip installs if specified

[uosci-testing-bot (uosci-testing-bot)]

charm_lint_check #3825 openstack-dashboard-next for corey.bryant mp257192
    LINT OK: passed

Build: http://10.245.162.77:8080/job/charm_lint_check/3825/

[uosci-testing-bot (uosci-testing-bot)]

charm_unit_test #3612 openstack-dashboard-next for corey.bryant mp257192
    UNIT OK: passed

Build: http://10.245.162.77:8080/job/charm_unit_test/3612/

[uosci-testing-bot (uosci-testing-bot)]

charm_amulet_test #3611 openstack-dashboard-next for corey.bryant mp257192
    AMULET FAIL: amulet-test failed

AMULET Results (max last 2 lines):
make: *** [test] Error 1
ERROR:root:Make target returned non-zero.

Full amulet test output: http://paste.ubuntu.com/10868630/
Build: http://10.245.162.77:8080/job/charm_amulet_test/3611/

[uosci-testing-bot (uosci-testing-bot)]

charm_amulet_test #3617 openstack-dashboard-next for corey.bryant mp257192
    AMULET OK: passed

Build: http://10.245.162.77:8080/job/charm_amulet_test/3617/

[uosci-testing-bot (uosci-testing-bot)]

charm_lint_check #3869 openstack-dashboard-next for corey.bryant mp257192
    LINT OK: passed

Build: http://10.245.162.77:8080/job/charm_lint_check/3869/

[uosci-testing-bot (uosci-testing-bot)]

charm_unit_test #3656 openstack-dashboard-next for corey.bryant mp257192
    UNIT OK: passed

Build: http://10.245.162.77:8080/job/charm_unit_test/3656/

[uosci-testing-bot (uosci-testing-bot)]

charm_lint_check #3878 openstack-dashboard-next for corey.bryant mp257192
    LINT OK: passed

Build: http://10.245.162.77:8080/job/charm_lint_check/3878/

[uosci-testing-bot (uosci-testing-bot)]

charm_unit_test #3665 openstack-dashboard-next for corey.bryant mp257192
    UNIT OK: passed

Build: http://10.245.162.77:8080/job/charm_unit_test/3665/

[uosci-testing-bot (uosci-testing-bot)]

charm_lint_check #3908 openstack-dashboard-next for corey.bryant mp257192
    LINT OK: passed

Build: http://10.245.162.77:8080/job/charm_lint_check/3908/

[uosci-testing-bot (uosci-testing-bot)]

charm_unit_test #3695 openstack-dashboard-next for corey.bryant mp257192
    UNIT OK: passed

Build: http://10.245.162.77:8080/job/charm_unit_test/3695/

[lp:~corey.bryant/charms/trusty/openstack-dashboard/git-ods]

101. By Corey Bryant on 2015-05-11

Sync charm-helpers

102. By Corey Bryant on 2015-05-11

Sync charm-helpers

103. By Corey Bryant on 2015-05-12

Sync charm-helpers

104. By Corey Bryant on 2015-05-12

Clone from github in deploy from source amulet tests

[uosci-testing-bot (uosci-testing-bot)]

charm_lint_check #4468 openstack-dashboard-next for corey.bryant mp257192
    LINT OK: passed

Build: http://10.245.162.77:8080/job/charm_lint_check/4468/

[uosci-testing-bot (uosci-testing-bot)]

charm_unit_test #4193 openstack-dashboard-next for corey.bryant mp257192
    UNIT OK: passed

Build: http://10.245.162.77:8080/job/charm_unit_test/4193/

[uosci-testing-bot (uosci-testing-bot)]

charm_amulet_test #4091 openstack-dashboard-next for corey.bryant mp257192
    AMULET FAIL: amulet-test failed

AMULET Results (max last 2 lines):
make: *** [test] Error 1
ERROR:root:Make target returned non-zero.

Full amulet test output: http://paste.ubuntu.com/11103939/
Build: http://10.245.162.77:8080/job/charm_amulet_test/4091/

[uosci-testing-bot (uosci-testing-bot)]

charm_lint_check #4530 openstack-dashboard-next for corey.bryant mp257192
    LINT OK: passed

Build: http://10.245.162.77:8080/job/charm_lint_check/4530/

[uosci-testing-bot (uosci-testing-bot)]

charm_unit_test #4255 openstack-dashboard-next for corey.bryant mp257192
    UNIT OK: passed

Build: http://10.245.162.77:8080/job/charm_unit_test/4255/

[uosci-testing-bot (uosci-testing-bot)]

charm_amulet_test #4109 openstack-dashboard-next for corey.bryant mp257192
    AMULET OK: passed

Build: http://10.245.162.77:8080/job/charm_amulet_test/4109/

[uosci-testing-bot (uosci-testing-bot)]

charm_lint_check #4538 openstack-dashboard-next for corey.bryant mp257192
    LINT OK: passed

Build: http://10.245.162.77:8080/job/charm_lint_check/4538/

[uosci-testing-bot (uosci-testing-bot)]

charm_unit_test #4263 openstack-dashboard-next for corey.bryant mp257192
    UNIT OK: passed

Build: http://10.245.162.77:8080/job/charm_unit_test/4263/

[uosci-testing-bot (uosci-testing-bot)]

charm_amulet_test #4117 openstack-dashboard-next for corey.bryant mp257192
    AMULET OK: passed

Build: http://10.245.162.77:8080/job/charm_amulet_test/4117/

[lp:~corey.bryant/charms/trusty/openstack-dashboard/git-ods]

105. By Corey Bryant on 2015-05-27

Sync charm-helpers

[uosci-testing-bot (uosci-testing-bot)]

charm_lint_check #4842 openstack-dashboard-next for corey.bryant mp257192
    LINT OK: passed

Build: http://10.245.162.77:8080/job/charm_lint_check/4842/

[uosci-testing-bot (uosci-testing-bot)]

charm_unit_test #4522 openstack-dashboard-next for corey.bryant mp257192
    UNIT OK: passed

Build: http://10.245.162.77:8080/job/charm_unit_test/4522/

[uosci-testing-bot (uosci-testing-bot)]

charm_amulet_test #4333 openstack-dashboard-next for corey.bryant mp257192
    AMULET OK: passed

Build: http://10.245.162.77:8080/job/charm_amulet_test/4333/

=== modified file 'hooks/charmhelpers/contrib/openstack/utils.py'
--- hooks/charmhelpers/contrib/openstack/utils.py	2015-04-16 20:24:28 +0000
+++ hooks/charmhelpers/contrib/openstack/utils.py	2015-05-27 13:07:24 +0000
@@ -53,9 +53,13 @@
     get_ipv6_addr
 )
 
+from charmhelpers.contrib.python.packages import (
+    pip_create_virtualenv,
+    pip_install,
+)
+
 from charmhelpers.core.host import lsb_release, mounts, umount
 from charmhelpers.fetch import apt_install, apt_cache, install_remote
-from charmhelpers.contrib.python.packages import pip_install
 from charmhelpers.contrib.storage.linux.utils import is_block_device, zap_disk
 from charmhelpers.contrib.storage.linux.loopback import ensure_loopback_device
 
@@ -497,7 +501,17 @@
 requirements_dir = None
 
 
-def git_clone_and_install(projects_yaml, core_project):
+def _git_yaml_load(projects_yaml):
+    """
+    Load the specified yaml into a dictionary.
+    """
+    if not projects_yaml:
+        return None
+
+    return yaml.load(projects_yaml)
+
+
+def git_clone_and_install(projects_yaml, core_project, depth=1):
     """
     Clone/install all specified OpenStack repositories.
 
@@ -510,23 +524,22 @@
              repository: 'git://git.openstack.org/openstack/requirements.git',
              branch: 'stable/icehouse'}
         directory: /mnt/openstack-git
-        http_proxy: http://squid.internal:3128
-        https_proxy: https://squid.internal:3128
+        http_proxy: squid-proxy-url
+        https_proxy: squid-proxy-url
 
         The directory, http_proxy, and https_proxy keys are optional.
     """
     global requirements_dir
     parent_dir = '/mnt/openstack-git'
-
-    if not projects_yaml:
-        return
-
-    projects = yaml.load(projects_yaml)
+    http_proxy = None
+
+    projects = _git_yaml_load(projects_yaml)
     _git_validate_projects_yaml(projects, core_project)
 
     old_environ = dict(os.environ)
 
     if 'http_proxy' in projects.keys():
+        http_proxy = projects['http_proxy']
         os.environ['http_proxy'] = projects['http_proxy']
     if 'https_proxy' in projects.keys():
         os.environ['https_proxy'] = projects['https_proxy']
@@ -534,15 +547,19 @@
     if 'directory' in projects.keys():
         parent_dir = projects['directory']
 
+    pip_create_virtualenv(os.path.join(parent_dir, 'venv'))
+
     for p in projects['repositories']:
         repo = p['repository']
         branch = p['branch']
         if p['name'] == 'requirements':
-            repo_dir = _git_clone_and_install_single(repo, branch, parent_dir,
+            repo_dir = _git_clone_and_install_single(repo, branch, depth,
+                                                     parent_dir, http_proxy,
                                                      update_requirements=False)
             requirements_dir = repo_dir
         else:
-            repo_dir = _git_clone_and_install_single(repo, branch, parent_dir,
+            repo_dir = _git_clone_and_install_single(repo, branch, depth,
+                                                     parent_dir, http_proxy,
                                                      update_requirements=True)
 
     os.environ = old_environ
@@ -574,7 +591,8 @@
         error_out('openstack-origin-git key \'{}\' is missing'.format(key))
 
 
-def _git_clone_and_install_single(repo, branch, parent_dir, update_requirements):
+def _git_clone_and_install_single(repo, branch, depth, parent_dir, http_proxy,
+                                  update_requirements):
     """
     Clone and install a single git repository.
     """
@@ -587,7 +605,8 @@
 
     if not os.path.exists(dest_dir):
         juju_log('Cloning git repo: {}, branch: {}'.format(repo, branch))
-        repo_dir = install_remote(repo, dest=parent_dir, branch=branch)
+        repo_dir = install_remote(repo, dest=parent_dir, branch=branch,
+                                  depth=depth)
     else:
         repo_dir = dest_dir
 
@@ -598,7 +617,12 @@
         _git_update_requirements(repo_dir, requirements_dir)
 
     juju_log('Installing git repo from dir: {}'.format(repo_dir))
-    pip_install(repo_dir)
+    if http_proxy:
+        pip_install(repo_dir, proxy=http_proxy,
+                    venv=os.path.join(parent_dir, 'venv'))
+    else:
+        pip_install(repo_dir,
+                    venv=os.path.join(parent_dir, 'venv'))
 
     return repo_dir
 
@@ -621,16 +645,27 @@
     os.chdir(orig_dir)
 
 
+def git_pip_venv_dir(projects_yaml):
+    """
+    Return the pip virtualenv path.
+    """
+    parent_dir = '/mnt/openstack-git'
+
+    projects = _git_yaml_load(projects_yaml)
+
+    if 'directory' in projects.keys():
+        parent_dir = projects['directory']
+
+    return os.path.join(parent_dir, 'venv')
+
+
 def git_src_dir(projects_yaml, project):
     """
     Return the directory where the specified project's source is located.
     """
     parent_dir = '/mnt/openstack-git'
 
-    if not projects_yaml:
-        return
-
-    projects = yaml.load(projects_yaml)
+    projects = _git_yaml_load(projects_yaml)
 
     if 'directory' in projects.keys():
         parent_dir = projects['directory']
@@ -640,3 +675,15 @@
             return os.path.join(parent_dir, os.path.basename(p['repository']))
 
     return None
+
+
+def git_yaml_value(projects_yaml, key):
+    """
+    Return the value in projects_yaml for the specified key.
+    """
+    projects = _git_yaml_load(projects_yaml)
+
+    if key in projects.keys():
+        return projects[key]
+
+    return None

=== modified file 'hooks/charmhelpers/contrib/python/packages.py'
--- hooks/charmhelpers/contrib/python/packages.py	2015-02-26 10:11:26 +0000
+++ hooks/charmhelpers/contrib/python/packages.py	2015-05-27 13:07:24 +0000
@@ -17,8 +17,11 @@
 # You should have received a copy of the GNU Lesser General Public License
 # along with charm-helpers.  If not, see <http://www.gnu.org/licenses/>.
 
+import os
+import subprocess
+
 from charmhelpers.fetch import apt_install, apt_update
-from charmhelpers.core.hookenv import log
+from charmhelpers.core.hookenv import charm_dir, log
 
 try:
     from pip import main as pip_execute
@@ -51,11 +54,15 @@
     pip_execute(command)
 
 
-def pip_install(package, fatal=False, upgrade=False, **options):
+def pip_install(package, fatal=False, upgrade=False, venv=None, **options):
     """Install a python package"""
-    command = ["install"]
+    if venv:
+        venv_python = os.path.join(venv, 'bin/pip')
+        command = [venv_python, "install"]
+    else:
+        command = ["install"]
 
-    available_options = ('proxy', 'src', 'log', "index-url", )
+    available_options = ('proxy', 'src', 'log', 'index-url', )
     for option in parse_options(options, available_options):
         command.append(option)
 
@@ -69,7 +76,10 @@
 
     log("Installing {} package with options: {}".format(package,
                                                         command))
-    pip_execute(command)
+    if venv:
+        subprocess.check_call(command)
+    else:
+        pip_execute(command)
 
 
 def pip_uninstall(package, **options):
@@ -94,3 +104,16 @@
     """Returns the list of current python installed packages
     """
     return pip_execute(["list"])
+
+
+def pip_create_virtualenv(path=None):
+    """Create an isolated Python environment."""
+    apt_install('python-virtualenv')
+
+    if path:
+        venv_path = path
+    else:
+        venv_path = os.path.join(charm_dir(), 'venv')
+
+    if not os.path.exists(venv_path):
+        subprocess.check_call(['virtualenv', venv_path])

=== modified file 'hooks/charmhelpers/fetch/giturl.py'
--- hooks/charmhelpers/fetch/giturl.py	2015-02-26 10:11:26 +0000
+++ hooks/charmhelpers/fetch/giturl.py	2015-05-27 13:07:24 +0000
@@ -45,14 +45,16 @@
         else:
             return True
 
-    def clone(self, source, dest, branch):
+    def clone(self, source, dest, branch, depth=None):
         if not self.can_handle(source):
             raise UnhandledSource("Cannot handle {}".format(source))
 
-        repo = Repo.clone_from(source, dest)
-        repo.git.checkout(branch)
+        if depth:
+            Repo.clone_from(source, dest, branch=branch, depth=depth)
+        else:
+            Repo.clone_from(source, dest, branch=branch)
 
-    def install(self, source, branch="master", dest=None):
+    def install(self, source, branch="master", dest=None, depth=None):
         url_parts = self.parse_url(source)
         branch_name = url_parts.path.strip("/").split("/")[-1]
         if dest:
@@ -63,7 +65,7 @@
         if not os.path.exists(dest_dir):
             mkdir(dest_dir, perms=0o755)
         try:
-            self.clone(source, dest_dir, branch)
+            self.clone(source, dest_dir, branch, depth)
         except GitCommandError as e:
             raise UnhandledSource(e.message)
         except OSError as e:

=== modified file 'hooks/horizon_hooks.py'
--- hooks/horizon_hooks.py	2015-04-07 13:58:41 +0000
+++ hooks/horizon_hooks.py	2015-05-27 13:07:24 +0000
@@ -125,7 +125,7 @@
     open_port(443)
 
     if git_install_requested():
-        git_post_install_late()
+        git_post_install_late(config('openstack-origin-git'))
 
 
 @hooks.hook('identity-service-relation-joined')

=== modified file 'hooks/horizon_utils.py'
--- hooks/horizon_utils.py	2015-04-13 19:11:22 +0000
+++ hooks/horizon_utils.py	2015-05-27 13:07:24 +0000
@@ -17,9 +17,13 @@
     git_clone_and_install,
     os_release,
     git_src_dir,
+    git_pip_venv_dir,
+    git_yaml_value,
+)
+from charmhelpers.contrib.python.packages import (
+    pip_install,
 )
 from charmhelpers.core.hookenv import (
-    charm_dir,
     config,
     log
 )
@@ -32,7 +36,9 @@
     mkdir,
     service_restart,
 )
-
+from charmhelpers.core.templating import (
+    render,
+)
 from charmhelpers.fetch import (
     apt_upgrade,
     apt_update,
@@ -53,9 +59,14 @@
 BASE_GIT_PACKAGES = [
     'apache2',
     'libapache2-mod-wsgi',
+    'libffi-dev',
+    'libpcre3-dev',
+    'libssl-dev',
     'libxml2-dev',
     'libxslt1-dev',
+    'libyaml-dev',
     'python-dev',
+    'python-lesscpy',
     'python-pip',
     'python-setuptools',
     'zlib1g-dev',
@@ -296,7 +307,6 @@
 def git_post_install(projects_yaml):
     """Perform horizon post-install setup."""
     src_dir = git_src_dir(projects_yaml, 'horizon')
-    templates_dir = os.path.join(charm_dir(), 'templates/git')
     copy_files = {
         'manage': {
             'src': os.path.join(src_dir, 'manage.py'),
@@ -311,10 +321,6 @@
                                 'local_settings.py.example'),
             'dest': '/etc/openstack-dashboard/local_settings.py',
         },
-        'openstack-dashboard': {
-            'src': os.path.join(templates_dir, 'dashboard.conf'),
-            'dest': '/etc/apache2/conf-available/openstack-dashboard.conf',
-        },
     }
 
     for name, files in copy_files.iteritems():
@@ -342,8 +348,8 @@
          'link': '/usr/share/openstack-dashboard/bin/less/lessc'},
         {'src': '/etc/openstack-dashboard/local_settings.py',
          'link': os.path.join(share_dir, 'local/local_settings.py')},
-        {'src':
-            '/usr/local/lib/python2.7/dist-packages/horizon/static/horizon/',
+        {'src': os.path.join(git_pip_venv_dir(projects_yaml),
+         'local/lib/python2.7/site-packages/horizon/static/horizon/'),
          'link': os.path.join(share_dir, 'static/horizon')},
     ]
 
@@ -352,12 +358,25 @@
             os.remove(s['link'])
         os.symlink(s['src'], s['link'])
 
+    render('git/dashboard.conf',
+           '/etc/apache2/conf-available/openstack-dashboard.conf',
+           {'virtualenv': git_pip_venv_dir(projects_yaml)},
+           owner='root', group='root', perms=0o644)
+
     os.chmod('/var/lib/openstack-dashboard', 0o750)
     os.chmod('/usr/share/openstack-dashboard/manage.py', 0o755),
 
-    subprocess.check_call(['/usr/share/openstack-dashboard/manage.py',
+    http_proxy = git_yaml_value(projects_yaml, 'http_proxy')
+    if http_proxy:
+        pip_install('python-memcached', proxy=http_proxy,
+                    venv=git_pip_venv_dir(projects_yaml))
+    else:
+        pip_install('python-memcached',
+                    venv=git_pip_venv_dir(projects_yaml))
+    python = os.path.join(git_pip_venv_dir(projects_yaml), 'bin/python')
+    subprocess.check_call([python, '/usr/share/openstack-dashboard/manage.py',
                            'collectstatic', '--noinput'])
-    subprocess.check_call(['/usr/share/openstack-dashboard/manage.py',
+    subprocess.check_call([python, '/usr/share/openstack-dashboard/manage.py',
                            'compress', '--force'])
 
     uid = pwd.getpwnam('horizon').pw_uid
@@ -379,9 +398,15 @@
     service_restart('apache2')
 
 
-def git_post_install_late():
+def git_post_install_late(projects_yaml):
     """Perform horizon post-install setup."""
-    subprocess.check_call(['/usr/share/openstack-dashboard/manage.py',
+    render('git/dashboard.conf',
+           '/etc/apache2/conf-available/openstack-dashboard.conf',
+           {'virtualenv': git_pip_venv_dir(projects_yaml)},
+           owner='root', group='root', perms=0o644)
+
+    python = os.path.join(git_pip_venv_dir(projects_yaml), 'bin/python')
+    subprocess.check_call([python, '/usr/share/openstack-dashboard/manage.py',
                            'collectstatic', '--noinput'])
-    subprocess.check_call(['/usr/share/openstack-dashboard/manage.py',
+    subprocess.check_call([python, '/usr/share/openstack-dashboard/manage.py',
                            'compress', '--force'])

=== modified file 'templates/git/dashboard.conf'
--- templates/git/dashboard.conf	2015-04-13 14:18:45 +0000
+++ templates/git/dashboard.conf	2015-05-27 13:07:24 +0000
@@ -1,6 +1,7 @@
 WSGIScriptAlias /horizon /usr/share/openstack-dashboard/openstack_dashboard/wsgi/django.wsgi
 WSGIDaemonProcess horizon user=horizon group=horizon processes=3 threads=10
 WSGIProcessGroup horizon
+WSGIPythonHome {{ virtualenv }}
 Alias /static /usr/share/openstack-dashboard/openstack_dashboard/static/
 <Directory /usr/share/openstack-dashboard/openstack_dashboard/wsgi>
   Order allow,deny

=== modified file 'tests/basic_deployment.py'
--- tests/basic_deployment.py	2015-04-15 19:31:27 +0000
+++ tests/basic_deployment.py	2015-05-27 13:07:24 +0000
@@ -64,10 +64,10 @@
             openstack_origin_git = {
                 'repositories': [
                     {'name': 'requirements',
-                     'repository': 'git://git.openstack.org/openstack/requirements',
+                     'repository': 'git://github.com/openstack/requirements',
                      'branch': branch},
                     {'name': 'horizon',
-                     'repository': 'git://git.openstack.org/openstack/horizon',
+                     'repository': 'git://github.com/openstack/horizon',
                      'branch': branch},
                 ],
                 'directory': '/mnt/openstack-git',

=== modified file 'unit_tests/test_horizon_utils.py'
--- unit_tests/test_horizon_utils.py	2015-04-07 13:58:41 +0000
+++ unit_tests/test_horizon_utils.py	2015-05-27 13:07:24 +0000
@@ -192,7 +192,6 @@
 
     @patch.object(horizon_utils, 'git_src_dir')
     @patch.object(horizon_utils, 'service_restart')
-    @patch.object(horizon_utils, 'charm_dir')
     @patch('shutil.copyfile')
     @patch('shutil.copytree')
     @patch('os.path.join')
@@ -207,8 +206,7 @@
     @patch('grp.getgrnam')
     def test_git_post_install(self, grnam, pwnam, check_call, walk, lchown,
                               chown, chmod, symlink, exists, join, copytree,
-                              copyfile, charm_dir, service_restart,
-                              git_src_dir):
+                              copyfile, service_restart, git_src_dir):
         class IDs(object):
             pw_uid = 999
             gr_gid = 999