Merge lp:~corey.bryant/charms/trusty/nova-compute/git-ods into lp:~openstack-charmers-archive/charms/trusty/nova-compute/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 #3824 nova-compute-next for corey.bryant mp257191
    LINT OK: passed

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

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

charm_unit_test #3611 nova-compute-next for corey.bryant mp257191
    UNIT OK: passed

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

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

charm_amulet_test #3610 nova-compute-next for corey.bryant mp257191
    AMULET OK: passed

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

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

charm_lint_check #3868 nova-compute-next for corey.bryant mp257191
    LINT OK: passed

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

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

charm_unit_test #3655 nova-compute-next for corey.bryant mp257191
    UNIT OK: passed

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

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

charm_lint_check #3877 nova-compute-next for corey.bryant mp257191
    LINT OK: passed

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

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

charm_unit_test #3664 nova-compute-next for corey.bryant mp257191
    UNIT OK: passed

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

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

charm_lint_check #3907 nova-compute-next for corey.bryant mp257191
    LINT OK: passed

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

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

charm_unit_test #3694 nova-compute-next for corey.bryant mp257191
    UNIT OK: passed

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

[lp:~corey.bryant/charms/trusty/nova-compute/git-ods]

155. By Corey Bryant on 2015-05-11

Sync charm-helpers

156. By Corey Bryant on 2015-05-11

Add comment to fix bin symlinks

157. By Corey Bryant on 2015-05-11

Sync charm-helpers

158. By Corey Bryant on 2015-05-12

Sync charm-helpers

159. By Corey Bryant on 2015-05-12

Clone from github in deploy from source amulet tests

160. By Corey Bryant on 2015-05-12

Add libyaml-dev as base git package

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

charm_lint_check #4467 nova-compute-next for corey.bryant mp257191
    LINT OK: passed

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

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

charm_unit_test #4192 nova-compute-next for corey.bryant mp257191
    UNIT OK: passed

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

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

charm_amulet_test #4090 nova-compute-next for corey.bryant mp257191
    AMULET OK: passed

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

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

charm_lint_check #4529 nova-compute-next for corey.bryant mp257191
    LINT OK: passed

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

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

charm_unit_test #4254 nova-compute-next for corey.bryant mp257191
    UNIT OK: passed

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

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

charm_amulet_test #4108 nova-compute-next for corey.bryant mp257191
    AMULET OK: passed

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

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

charm_lint_check #4537 nova-compute-next for corey.bryant mp257191
    LINT OK: passed

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

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

charm_unit_test #4262 nova-compute-next for corey.bryant mp257191
    UNIT OK: passed

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

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

charm_amulet_test #4116 nova-compute-next for corey.bryant mp257191
    AMULET OK: passed

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

[lp:~corey.bryant/charms/trusty/nova-compute/git-ods]

161. By Corey Bryant on 2015-05-27

Sync charm-helpers

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

charm_lint_check #4841 nova-compute-next for corey.bryant mp257191
    LINT OK: passed

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

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

charm_unit_test #4521 nova-compute-next for corey.bryant mp257191
    UNIT OK: passed

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

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

charm_amulet_test #4332 nova-compute-next for corey.bryant mp257191
    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/11397779/
Build: http://10.245.162.77:8080/job/charm_amulet_test/4332/

=== modified file 'hooks/charmhelpers/contrib/openstack/utils.py'
--- hooks/charmhelpers/contrib/openstack/utils.py	2015-04-16 14:46:02 +0000
+++ hooks/charmhelpers/contrib/openstack/utils.py	2015-05-27 13:07:13 +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 00:01:55 +0000
+++ hooks/charmhelpers/contrib/python/packages.py	2015-05-27 13:07:13 +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 00:01:55 +0000
+++ hooks/charmhelpers/fetch/giturl.py	2015-05-27 13:07:13 +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/nova_compute_utils.py'
--- hooks/nova_compute_utils.py	2015-04-23 13:32:10 +0000
+++ hooks/nova_compute_utils.py	2015-05-27 13:07:13 +0000
@@ -45,9 +45,15 @@
     git_install_requested,
     git_clone_and_install,
     git_src_dir,
+    git_pip_venv_dir,
+    git_yaml_value,
     os_release
 )
 
+from charmhelpers.contrib.python.packages import (
+    pip_install,
+)
+
 from nova_compute_context import (
     CloudComputeContext,
     MetadataServiceContext,
@@ -73,9 +79,13 @@
 ]
 
 BASE_GIT_PACKAGES = [
+    'libffi-dev',
+    'libssl-dev',
     'libvirt-bin',
     'libxml2-dev',
     'libxslt1-dev',
+    'libvirt-dev',
+    'libyaml-dev',
     'python-dev',
     'python-pip',
     'python-setuptools',
@@ -686,6 +696,14 @@
 
 def git_post_install(projects_yaml):
     """Perform post-install setup."""
+    http_proxy = git_yaml_value(projects_yaml, 'http_proxy')
+    if http_proxy:
+        pip_install('libvirt-python', proxy=http_proxy,
+                    venv=git_pip_venv_dir(projects_yaml))
+    else:
+        pip_install('libvirt-python',
+                    venv=git_pip_venv_dir(projects_yaml))
+
     src_etc = os.path.join(git_src_dir(projects_yaml, 'nova'), 'etc/nova')
     configs = [
         {'src': src_etc,
@@ -697,6 +715,18 @@
             shutil.rmtree(c['dest'])
         shutil.copytree(c['src'], c['dest'])
 
+    # NOTE(coreycb): Need to find better solution than bin symlinks.
+    symlinks = [
+        {'src': os.path.join(git_pip_venv_dir(projects_yaml),
+                             'bin/nova-rootwrap'),
+         'link': '/usr/local/bin/nova-rootwrap'},
+    ]
+
+    for s in symlinks:
+        if os.path.lexists(s['link']):
+            os.remove(s['link'])
+        os.symlink(s['src'], s['link'])
+
     virt_type = VIRT_TYPES[config('virt-type')][0]
     nova_compute_conf = 'git/{}.conf'.format(virt_type)
     render(nova_compute_conf, '/etc/nova/nova-compute.conf', {}, perms=0o644)
@@ -705,6 +735,7 @@
     service_name = 'nova-compute'
     nova_user = 'nova'
     start_dir = '/var/lib/nova'
+    bin_dir = os.path.join(git_pip_venv_dir(projects_yaml), 'bin')
     nova_conf = '/etc/nova/nova.conf'
     nova_api_metadata_context = {
         'service_description': 'Nova Metadata API server',
@@ -712,7 +743,7 @@
         'user_name': nova_user,
         'start_dir': start_dir,
         'process_name': 'nova-api-metadata',
-        'executable_name': '/usr/local/bin/nova-api-metadata',
+        'executable_name': os.path.join(bin_dir, 'nova-api-metadata'),
         'config_files': [nova_conf],
     }
     nova_api_context = {
@@ -721,7 +752,7 @@
         'user_name': nova_user,
         'start_dir': start_dir,
         'process_name': 'nova-api',
-        'executable_name': '/usr/local/bin/nova-api',
+        'executable_name': os.path.join(bin_dir, 'nova-api'),
         'config_files': [nova_conf],
     }
     nova_compute_context = {
@@ -729,7 +760,7 @@
         'service_name': service_name,
         'user_name': nova_user,
         'process_name': 'nova-compute',
-        'executable_name': '/usr/local/bin/nova-compute',
+        'executable_name': os.path.join(bin_dir, 'nova-compute'),
         'config_files': [nova_conf, '/etc/nova/nova-compute.conf'],
     }
     nova_network_context = {
@@ -738,7 +769,7 @@
         'user_name': nova_user,
         'start_dir': start_dir,
         'process_name': 'nova-network',
-        'executable_name': '/usr/local/bin/nova-network',
+        'executable_name': os.path.join(bin_dir, 'nova-network'),
         'config_files': [nova_conf],
     }
 

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

=== modified file 'unit_tests/test_nova_compute_utils.py'
--- unit_tests/test_nova_compute_utils.py	2015-04-22 16:15:45 +0000
+++ unit_tests/test_nova_compute_utils.py	2015-05-27 13:07:13 +0000
@@ -20,6 +20,7 @@
     'os_release',
     'log',
     'neutron_plugin_attribute',
+    'pip_install',
     'related_units',
     'relation_ids',
     'relation_get',
@@ -617,22 +618,30 @@
     @patch.object(utils, 'git_src_dir')
     @patch.object(utils, 'service_restart')
     @patch.object(utils, 'render')
+    @patch.object(utils, 'git_pip_venv_dir')
     @patch('os.path.join')
     @patch('os.path.exists')
+    @patch('os.symlink')
     @patch('shutil.copytree')
     @patch('shutil.rmtree')
+    @patch('subprocess.check_call')
     @patch.object(utils, 'apt_install')
     @patch.object(utils, 'apt_update')
-    def test_git_post_install(self, apt_update, apt_install, rmtree, copytree,
-                              exists, join, render, service_restart,
-                              git_src_dir):
+    def test_git_post_install(self, apt_update, apt_install, check_call,
+                              rmtree, copytree, symlink, exists, join, venv,
+                              render, service_restart, git_src_dir):
         projects_yaml = openstack_origin_git
         join.return_value = 'joined-string'
+        venv.return_value = '/mnt/openstack-git/venv'
         utils.git_post_install(projects_yaml)
         expected = [
             call('joined-string', '/etc/nova'),
         ]
         copytree.assert_has_calls(expected)
+        expected = [
+            call('joined-string', '/usr/local/bin/nova-rootwrap'),
+        ]
+        symlink.assert_has_calls(expected, any_order=True)
 
         service_name = 'nova-compute'
         nova_user = 'nova'
@@ -644,7 +653,7 @@
             'user_name': nova_user,
             'start_dir': start_dir,
             'process_name': 'nova-api-metadata',
-            'executable_name': '/usr/local/bin/nova-api-metadata',
+            'executable_name': 'joined-string',
             'config_files': [nova_conf],
         }
         nova_api_context = {
@@ -653,7 +662,7 @@
             'user_name': nova_user,
             'start_dir': start_dir,
             'process_name': 'nova-api',
-            'executable_name': '/usr/local/bin/nova-api',
+            'executable_name': 'joined-string',
             'config_files': [nova_conf],
         }
         nova_compute_context = {
@@ -661,7 +670,7 @@
             'service_name': service_name,
             'user_name': nova_user,
             'process_name': 'nova-compute',
-            'executable_name': '/usr/local/bin/nova-compute',
+            'executable_name': 'joined-string',
             'config_files': [nova_conf, '/etc/nova/nova-compute.conf'],
         }
         nova_network_context = {
@@ -670,7 +679,7 @@
             'user_name': nova_user,
             'start_dir': start_dir,
             'process_name': 'nova-network',
-            'executable_name': '/usr/local/bin/nova-network',
+            'executable_name': 'joined-string',
             'config_files': [nova_conf],
         }
         expected = [