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

[Corey Bryant]

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

176. By Corey Bryant on 2015-05-12

Add libyaml-dev as base git package

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

charm_lint_check #4463 nova-cloud-controller-next for corey.bryant mp258923
    LINT OK: passed

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

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

charm_unit_test #4188 nova-cloud-controller-next for corey.bryant mp258923
    UNIT OK: passed

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

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

charm_amulet_test #4086 nova-cloud-controller-next for corey.bryant mp258923
    AMULET OK: passed

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

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

charm_lint_check #4531 nova-cloud-controller-next for corey.bryant mp258923
    LINT OK: passed

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

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

charm_unit_test #4256 nova-cloud-controller-next for corey.bryant mp258923
    UNIT OK: passed

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

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

charm_amulet_test #4110 nova-cloud-controller-next for corey.bryant mp258923
    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/11118316/
Build: http://10.245.162.77:8080/job/charm_amulet_test/4110/

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

charm_lint_check #4539 nova-cloud-controller-next for corey.bryant mp258923
    LINT OK: passed

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

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

charm_unit_test #4264 nova-cloud-controller-next for corey.bryant mp258923
    UNIT OK: passed

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

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

charm_amulet_test #4118 nova-cloud-controller-next for corey.bryant mp258923
    AMULET OK: passed

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

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

177. By Corey Bryant on 2015-05-27

Sync charm-helpers

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

charm_lint_check #4843 nova-cloud-controller-next for corey.bryant mp258923
    LINT OK: passed

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

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

charm_unit_test #4523 nova-cloud-controller-next for corey.bryant mp258923
    UNIT OK: passed

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

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

charm_amulet_test #4334 nova-cloud-controller-next for corey.bryant mp258923
    AMULET OK: passed

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

[James Page (james-page)]

Looks OK - but see unit test failure on merged branch:

======================================================================
ERROR: test_config_changed_single_consoleauth (unit_tests.test_nova_cc_hooks.NovaCCHooksTests)
----------------------------------------------------------------------
Traceback (most recent call last):
  File "/usr/lib/python2.7/dist-packages/mock.py", line 1210, in patched
    return func(*args, **keywargs)
  File "/home/jamespage/src/charms/git/nova-cloud-controller/unit_tests/test_nova_cc_hooks.py", line 800, in test_config_changed_single_consoleauth
    hooks.config_changed()
  File "hooks/nova_cc_utils.py", line 1005, in wrapped_f
    f(*args)
  File "hooks/charmhelpers/core/host.py", line 312, in wrapped_f
    f(*args, **kwargs)
  File "hooks/nova_cc_hooks.py", line 180, in config_changed
    if config_value_changed('openstack-origin-git'):
  File "hooks/charmhelpers/contrib/openstack/utils.py", line 346, in config_value_changed
    with hook_data():
  File "/usr/lib/python2.7/contextlib.py", line 17, in __enter__
    return self.gen.next()
  File "hooks/charmhelpers/core/unitdata.py", line 425, in __call__
    self._record_charm_version(hookenv.charm_dir())
  File "hooks/charmhelpers/core/unitdata.py", line 435, in _record_charm_version
    os.path.join(charm_dir, 'revision')).read().strip()
  File "/usr/lib/python2.7/posixpath.py", line 70, in join
    elif path == '' or path.endswith('/'):
AttributeError: 'NoneType' object has no attribute 'endswith'

review: Needs Fixing

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

178. By Corey Bryant on 2015-06-10

Merge next branch

179. By Corey Bryant on 2015-06-10

Update failing unit test

[Corey Bryant (corey.bryant)]

Thanks for the review! I've merged the latest next branch and updated the failing test.

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

charm_lint_check #5239 nova-cloud-controller-next for corey.bryant mp258923
    LINT OK: passed

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

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

charm_unit_test #4918 nova-cloud-controller-next for corey.bryant mp258923
    UNIT OK: passed

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

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

180. By Corey Bryant on 2015-06-11

Merge next branch

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

charm_lint_check #5338 nova-cloud-controller-next for corey.bryant mp258923
    LINT OK: passed

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

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

charm_unit_test #4971 nova-cloud-controller-next for corey.bryant mp258923
    UNIT OK: passed

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

=== modified file '.bzrignore'
--- .bzrignore	2015-04-20 10:21:36 +0000
+++ .bzrignore	2015-06-11 13:34:00 +0000
@@ -1,2 +1,3 @@
 bin
 .coverage
+tags

=== modified file 'Makefile'
--- Makefile	2015-04-20 10:21:36 +0000
+++ Makefile	2015-06-11 13:34:00 +0000
@@ -2,7 +2,7 @@
 PYTHON := /usr/bin/env python
 
 lint:
-	@flake8 --exclude hooks/charmhelpers hooks unit_tests tests
+	@flake8 --exclude hooks/charmhelpers actions hooks unit_tests tests
 	@charm proof
 
 unit_test:

=== modified file 'README.txt'
--- README.txt	2015-04-20 10:21:36 +0000
+++ README.txt	2015-06-11 13:34:00 +0000
@@ -23,3 +23,92 @@
 
 juju add-relation "nova-cloud-controller:pgsql-nova-db" "postgresql:db"
 juju add-relation "nova-cloud-controller:pgsql-neutron-db" "postgresql:db"
+
+Deploying from source
+=====================
+
+The minimum openstack-origin-git config required to deploy from source is:
+
+    openstack-origin-git: include-file://nova-juno.yaml
+
+    nova-juno.yaml
+        repositories:
+        - {name: requirements,
+           repository: 'git://github.com/openstack/requirements',
+           branch: stable/juno}
+        - {name: nova,
+           repository: 'git://github.com/openstack/nova',
+           branch: stable/juno}
+
+Note that there are only two 'name' values the charm knows about: 'requirements'
+and 'nova'. These repositories must correspond to these 'name' values.
+Additionally, the requirements repository must be specified first and the
+nova repository must be specified last. All other repostories are installed
+in the order in which they are specified.
+
+The following is a full list of current tip repos (may not be up-to-date):
+
+    openstack-origin-git: include-file://nova-master.yaml
+
+    nova-master.yaml
+        repositories:
+        - {name: requirements,
+           repository: 'git://github.com/openstack/requirements',
+           branch: master}
+        - {name: oslo-concurrency,
+           repository: 'git://github.com/openstack/oslo.concurrency',
+           branch: master}
+        - {name: oslo-config,
+           repository: 'git://github.com/openstack/oslo.config',
+           branch: master}
+        - {name: oslo-context,
+           repository: 'git://github.com/openstack/oslo.context',
+           branch: master}
+        - {name: oslo-db,
+           repository: 'git://github.com/openstack/oslo.db',
+           branch: master}
+        - {name: oslo-i18n,
+           repository: 'git://github.com/openstack/oslo.i18n',
+           branch: master}
+        - {name: oslo-log,
+           repository: 'git://github.com/openstack/oslo.log',
+           branch: master}
+        - {name: oslo-messaging,
+           repository: 'git://github.com/openstack/oslo.messaging',
+           branch: master}
+        - {name: oslo-middleware,
+           repository': 'git://github.com/openstack/oslo.middleware',
+           branch: master}
+        - {name: oslo-rootwrap',
+           repository: 'git://github.com/openstack/oslo.rootwrap',
+           branch: master}
+        - {name: oslo-serialization,
+           repository: 'git://github.com/openstack/oslo.serialization',
+           branch: master}
+        - {name: oslo-utils,
+           repository: 'git://github.com/openstack/oslo.utils',
+           branch: master}
+        - {name: pbr,
+           repository: 'git://github.com/openstack-dev/pbr',
+           branch: master}
+        - {name: stevedore,
+           repository: 'git://github.com/openstack/stevedore',
+           branch: 'master'}
+        - {name: sqlalchemy-migrate,
+           repository: 'git://github.com/stackforge/sqlalchemy-migrate',
+           branch: master}
+        - {name: python-cinderclient,
+           repository: 'git://github.com/openstack/python-cinderclient',
+           branch: master}
+        - {name: python-glanceclient,
+           repository': 'git://github.com/openstack/python-glanceclient',
+           branch: master}
+        - {name: python-neutronlient,
+           repository': 'git://github.com/openstack/python-neutronclient',
+           branch: master}
+        - {name: keystonemiddleware,
+           repository: 'git://github.com/openstack/keystonemiddleware',
+           branch: master}
+        - {name: nova,
+           repository: 'git://github.com/openstack/nova',
+           branch: master}

=== added directory 'actions'
=== added file 'actions.yaml'
--- actions.yaml	1970-01-01 00:00:00 +0000
+++ actions.yaml	2015-06-11 13:34:00 +0000
@@ -0,0 +1,2 @@
+git-reinstall:
+    description: Reinstall nova-cloud-controller from the openstack-origin-git repositories.

=== added symlink 'actions/git-reinstall'
=== target is u'git_reinstall.py'
=== added file 'actions/git_reinstall.py'
--- actions/git_reinstall.py	1970-01-01 00:00:00 +0000
+++ actions/git_reinstall.py	2015-06-11 13:34:00 +0000
@@ -0,0 +1,45 @@
+#!/usr/bin/python
+import sys
+import traceback
+
+sys.path.append('hooks/')
+
+from charmhelpers.contrib.openstack.utils import (
+    git_install_requested,
+)
+
+from charmhelpers.core.hookenv import (
+    action_set,
+    action_fail,
+    config,
+)
+
+from nova_cc_utils import (
+    git_install,
+)
+
+from nova_cc_hooks import (
+    config_changed,
+)
+
+
+def git_reinstall():
+    """Reinstall from source and restart services.
+
+    If the openstack-origin-git config option was used to install openstack
+    from source git repositories, then this action can be used to reinstall
+    from updated git repositories, followed by a restart of services."""
+    if not git_install_requested():
+        action_fail('openstack-origin-git is not configured')
+        return
+
+    try:
+        git_install(config('openstack-origin-git'))
+        config_changed()
+    except:
+        action_set({'traceback': traceback.format_exc()})
+        action_fail('git-reinstall resulted in an unexpected error')
+
+
+if __name__ == '__main__':
+    git_reinstall()

=== modified file 'config.yaml'
--- config.yaml	2015-06-10 20:32:48 +0000
+++ config.yaml	2015-06-11 13:34:00 +0000
@@ -14,6 +14,22 @@
       Note that updating this setting to a source that is known to
       provide a later version of OpenStack will trigger a software
       upgrade.
+
+      Note that when openstack-origin-git is specified, openstack
+      specific packages will be installed from source rather than
+      from the openstack-origin repository.
+  openstack-origin-git:
+    default:
+    type: string
+    description: |
+      Specifies a YAML-formatted dictionary listing the git
+      repositories and branches from which to install OpenStack and
+      its dependencies.
+
+      Note that the installed config files will be determined based on
+      the OpenStack release of the openstack-origin option.
+
+      For more details see README.md.
   rabbit-user:
     default: nova
     type: string

=== modified file 'hooks/nova_cc_hooks.py'
--- hooks/nova_cc_hooks.py	2015-06-04 08:45:01 +0000
+++ hooks/nova_cc_hooks.py	2015-06-11 13:34:00 +0000
@@ -43,7 +43,9 @@
 )
 
 from charmhelpers.contrib.openstack.utils import (
+    config_value_changed,
     configure_installation_source,
+    git_install_requested,
     openstack_upgrade_available,
     os_release,
     os_requires_version,
@@ -75,6 +77,7 @@
     disable_services,
     do_openstack_upgrade,
     enable_services,
+    git_install,
     keystone_ca_cert_b64,
     migrate_neutron_database,
     migrate_nova_database,
@@ -142,9 +145,12 @@
 def install():
     execd_preinstall()
     configure_installation_source(config('openstack-origin'))
+
     apt_update()
     apt_install(determine_packages(), fatal=True)
 
+    git_install(config('openstack-origin-git'))
+
     _files = os.path.join(charm_dir(), 'files')
     if os.path.isdir(_files):
         for f in os.listdir(_files):
@@ -170,16 +176,21 @@
                                           relation_prefix='nova')
 
     global CONFIGS
-    if openstack_upgrade_available('nova-common'):
-        CONFIGS = do_openstack_upgrade()
-        [neutron_api_relation_joined(rid=rid, remote_restart=True)
-            for rid in relation_ids('neutron-api')]
+    if git_install_requested():
+        if config_value_changed('openstack-origin-git'):
+            git_install(config('openstack-origin-git'))
+    else:
+        if openstack_upgrade_available('nova-common'):
+            CONFIGS = do_openstack_upgrade()
+            [neutron_api_relation_joined(rid=rid, remote_restart=True)
+                for rid in relation_ids('neutron-api')]
     save_script_rc()
     configure_https()
     CONFIGS.write_all()
     if console_attributes('protocol'):
-        apt_update()
-        apt_install(console_attributes('packages'), fatal=True)
+        if not git_install_requested():
+            apt_update()
+            apt_install(console_attributes('packages'), fatal=True)
         [compute_joined(rid=rid)
             for rid in relation_ids('cloud-compute')]
     for r_id in relation_ids('identity-service'):

=== modified file 'hooks/nova_cc_utils.py'
--- hooks/nova_cc_utils.py	2015-05-11 07:38:35 +0000
+++ hooks/nova_cc_utils.py	2015-06-11 13:34:00 +0000
@@ -1,4 +1,5 @@
 import os
+import shutil
 import subprocess
 import ConfigParser
 
@@ -14,11 +15,20 @@
 
 from charmhelpers.contrib.peerstorage import peer_store
 
+from charmhelpers.contrib.python.packages import (
+    pip_install,
+)
+
 from charmhelpers.contrib.openstack.utils import (
     configure_installation_source,
     get_host_ip,
     get_hostname,
     get_os_codename_install_source,
+    git_install_requested,
+    git_clone_and_install,
+    git_src_dir,
+    git_pip_venv_dir,
+    git_yaml_value,
     is_ip,
     os_release,
     save_script_rc as _save_script_rc)
@@ -31,6 +41,7 @@
 )
 
 from charmhelpers.core.hookenv import (
+    charm_dir,
     config,
     log,
     relation_get,
@@ -42,13 +53,19 @@
 )
 
 from charmhelpers.core.host import (
+    adduser,
+    add_group,
+    add_user_to_group,
+    mkdir,
     service,
     service_start,
     service_stop,
     service_running,
-    lsb_release
+    lsb_release,
 )
 
+from charmhelpers.core.templating import render
+
 from charmhelpers.contrib.network.ip import (
     is_ipv6
 )
@@ -76,6 +93,46 @@
     'python-memcache',
 ]
 
+BASE_GIT_PACKAGES = [
+    'libffi-dev',
+    'libmysqlclient-dev',
+    'libssl-dev',
+    'libxml2-dev',
+    'libxslt1-dev',
+    'libyaml-dev',
+    'python-dev',
+    'python-pip',
+    'python-setuptools',
+    'zlib1g-dev',
+]
+
+LATE_GIT_PACKAGES = [
+    'novnc',
+    'spice-html5',
+    'websockify',
+]
+
+# ubuntu packages that should not be installed when deploying from git
+GIT_PACKAGE_BLACKLIST = [
+    'neutron-common',
+    'neutron-server',
+    'neutron-plugin-ml2',
+    'nova-api-ec2',
+    'nova-api-os-compute',
+    'nova-api-os-volume',
+    'nova-cert',
+    'nova-conductor',
+    'nova-consoleauth',
+    'nova-novncproxy',
+    'nova-objectstore',
+    'nova-scheduler',
+    'nova-spiceproxy',
+    'nova-xvpvncproxy',
+    'python-keystoneclient',
+    'python-six',
+    'quantum-server',
+]
+
 BASE_SERVICES = [
     'nova-api-ec2',
     'nova-api-os-compute',
@@ -381,6 +438,15 @@
         packages.extend(pkgs)
     if console_attributes('packages'):
         packages.extend(console_attributes('packages'))
+
+    if git_install_requested():
+        packages = list(set(packages))
+        packages.extend(BASE_GIT_PACKAGES)
+        # don't include packages that will be installed from git
+        for p in GIT_PACKAGE_BLACKLIST:
+            if p in packages:
+                packages.remove(p)
+
     return list(set(packages))
 
 
@@ -454,8 +520,8 @@
     os.unlink('/usr/sbin/policy-rc.d')
 
 
-QUANTUM_DB_MANAGE = "/usr/bin/quantum-db-manage"
-NEUTRON_DB_MANAGE = "/usr/bin/neutron-db-manage"
+QUANTUM_DB_MANAGE = "quantum-db-manage"
+NEUTRON_DB_MANAGE = "neutron-db-manage"
 
 
 def reset_os_release():
@@ -985,3 +1051,257 @@
                    ' main')
         apt_update()
         apt_install('haproxy/trusty-backports', fatal=True)
+
+
+def git_install(projects_yaml):
+    """Perform setup, and install git repos specified in yaml parameter."""
+    if git_install_requested():
+        git_pre_install()
+        git_clone_and_install(projects_yaml, core_project='nova')
+        git_post_install(projects_yaml)
+
+
+def git_pre_install():
+    """Perform pre-install setup."""
+    dirs = [
+        '/var/lib/nova',
+        '/var/lib/nova/buckets',
+        '/var/lib/nova/CA',
+        '/var/lib/nova/CA/INTER',
+        '/var/lib/nova/CA/newcerts',
+        '/var/lib/nova/CA/private',
+        '/var/lib/nova/CA/reqs',
+        '/var/lib/nova/images',
+        '/var/lib/nova/instances',
+        '/var/lib/nova/keys',
+        '/var/lib/nova/networks',
+        '/var/lib/nova/tmp',
+        '/var/lib/neutron',
+        '/var/lib/neutron/lock',
+        '/var/log/nova',
+        '/etc/neutron',
+        '/etc/neutron/plugins',
+        '/etc/neutron/plugins/ml2',
+    ]
+
+    adduser('nova', shell='/bin/bash', system_user=True)
+    subprocess.check_call(['usermod', '--home', '/var/lib/nova', 'nova'])
+    add_group('nova', system_group=True)
+    add_user_to_group('nova', 'nova')
+
+    adduser('neutron', shell='/bin/bash', system_user=True)
+    add_group('neutron', system_group=True)
+    add_user_to_group('neutron', 'neutron')
+
+    for d in dirs:
+        mkdir(d, owner='nova', group='nova', perms=0755, force=False)
+
+
+def git_post_install(projects_yaml):
+    """Perform post-install setup."""
+    http_proxy = git_yaml_value(projects_yaml, 'http_proxy')
+    if http_proxy:
+        pip_install('mysql-python', proxy=http_proxy,
+                    venv=git_pip_venv_dir(projects_yaml))
+    else:
+        pip_install('mysql-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,
+         'dest': '/etc/nova'},
+    ]
+
+    for c in configs:
+        if os.path.exists(c['dest']):
+            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-manage'),
+         'link': '/usr/local/bin/nova-manage'},
+        {'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'])
+
+    render('git/nova_sudoers', '/etc/sudoers.d/nova_sudoers', {}, perms=0o440)
+
+    nova_cc = 'nova-cloud-controller'
+    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_ec2_api_context = {
+        'service_description': 'Nova EC2 API server',
+        'service_name': nova_cc,
+        'user_name': nova_user,
+        'start_dir': start_dir,
+        'process_name': 'nova-api-ec2',
+        'executable_name': os.path.join(bin_dir, 'nova-api-ec2'),
+        'config_files': [nova_conf],
+    }
+    nova_api_os_compute_context = {
+        'service_description': 'Nova OpenStack Compute API server',
+        'service_name': nova_cc,
+        'user_name': nova_user,
+        'start_dir': start_dir,
+        'process_name': 'nova-api-os-compute',
+        'executable_name': os.path.join(bin_dir, 'nova-api-os-compute'),
+        'config_files': [nova_conf],
+    }
+    nova_cells_context = {
+        'service_description': 'Nova cells',
+        'service_name': nova_cc,
+        'user_name': nova_user,
+        'start_dir': start_dir,
+        'process_name': 'nova-cells',
+        'executable_name': os.path.join(bin_dir, 'nova-cells'),
+        'config_files': [nova_conf],
+    }
+    nova_cert_context = {
+        'service_description': 'Nova cert',
+        'service_name': nova_cc,
+        'user_name': nova_user,
+        'start_dir': start_dir,
+        'process_name': 'nova-cert',
+        'executable_name': os.path.join(bin_dir, 'nova-cert'),
+        'config_files': [nova_conf],
+    }
+    nova_conductor_context = {
+        'service_description': 'Nova conductor',
+        'service_name': nova_cc,
+        'user_name': nova_user,
+        'start_dir': start_dir,
+        'process_name': 'nova-conductor',
+        'executable_name': os.path.join(bin_dir, 'nova-conductor'),
+        'config_files': [nova_conf],
+    }
+    nova_consoleauth_context = {
+        'service_description': 'Nova console auth',
+        'service_name': nova_cc,
+        'user_name': nova_user,
+        'start_dir': start_dir,
+        'process_name': 'nova-consoleauth',
+        'executable_name': os.path.join(bin_dir, 'nova-consoleauth'),
+        'config_files': [nova_conf],
+    }
+    nova_console_context = {
+        'service_description': 'Nova console',
+        'service_name': nova_cc,
+        'user_name': nova_user,
+        'start_dir': start_dir,
+        'process_name': 'nova-console',
+        'executable_name': os.path.join(bin_dir, 'nova-console'),
+        'config_files': [nova_conf],
+    }
+    nova_novncproxy_context = {
+        'service_description': 'Nova NoVNC proxy',
+        'service_name': nova_cc,
+        'user_name': nova_user,
+        'start_dir': start_dir,
+        'process_name': 'nova-novncproxy',
+        'executable_name': os.path.join(bin_dir, 'nova-novncproxy'),
+        'config_files': [nova_conf],
+    }
+    nova_objectstore_context = {
+        'service_description': 'Nova object store',
+        'service_name': nova_cc,
+        'user_name': nova_user,
+        'start_dir': start_dir,
+        'process_name': 'nova-objectstore',
+        'executable_name': os.path.join(bin_dir, 'nova-objectstore'),
+        'config_files': [nova_conf],
+    }
+    nova_scheduler_context = {
+        'service_description': 'Nova scheduler',
+        'service_name': nova_cc,
+        'user_name': nova_user,
+        'start_dir': start_dir,
+        'process_name': 'nova-scheduler',
+        'executable_name': os.path.join(bin_dir, 'nova-scheduler'),
+        'config_files': [nova_conf],
+    }
+    nova_serialproxy_context = {
+        'service_description': 'Nova serial proxy',
+        'service_name': nova_cc,
+        'user_name': nova_user,
+        'start_dir': start_dir,
+        'process_name': 'nova-serialproxy',
+        'executable_name': os.path.join(bin_dir, 'nova-serialproxy'),
+        'config_files': [nova_conf],
+    }
+    nova_spiceproxy_context = {
+        'service_description': 'Nova spice proxy',
+        'service_name': nova_cc,
+        'user_name': nova_user,
+        'start_dir': start_dir,
+        'process_name': 'nova-spicehtml5proxy',
+        'executable_name': os.path.join(bin_dir, 'nova-spicehtml5proxy'),
+        'config_files': [nova_conf],
+    }
+    nova_xvpvncproxy_context = {
+        'service_description': 'Nova XVPVNC proxy',
+        'service_name': nova_cc,
+        'user_name': nova_user,
+        'start_dir': start_dir,
+        'process_name': 'nova-xvpvncproxy',
+        'executable_name': os.path.join(bin_dir, 'nova-xvpvncproxy'),
+        'config_files': [nova_conf],
+    }
+
+    # NOTE(coreycb): Needs systemd support
+    templates_dir = 'hooks/charmhelpers/contrib/openstack/templates'
+    templates_dir = os.path.join(charm_dir(), templates_dir)
+    os_rel = os_release('nova-common')
+    render('git.upstart', '/etc/init/nova-api-ec2.conf',
+           nova_ec2_api_context, perms=0o644,
+           templates_dir=templates_dir)
+    render('git.upstart', '/etc/init/nova-api-os-compute.conf',
+           nova_api_os_compute_context, perms=0o644,
+           templates_dir=templates_dir)
+    render('git.upstart', '/etc/init/nova-cells.conf',
+           nova_cells_context, perms=0o644,
+           templates_dir=templates_dir)
+    render('git.upstart', '/etc/init/nova-cert.conf',
+           nova_cert_context, perms=0o644,
+           templates_dir=templates_dir)
+    render('git.upstart', '/etc/init/nova-conductor.conf',
+           nova_conductor_context, perms=0o644,
+           templates_dir=templates_dir)
+    render('git.upstart', '/etc/init/nova-consoleauth.conf',
+           nova_consoleauth_context, perms=0o644,
+           templates_dir=templates_dir)
+    render('git.upstart', '/etc/init/nova-console.conf',
+           nova_console_context, perms=0o644,
+           templates_dir=templates_dir)
+    render('git.upstart', '/etc/init/nova-novncproxy.conf',
+           nova_novncproxy_context, perms=0o644,
+           templates_dir=templates_dir)
+    render('git.upstart', '/etc/init/nova-objectstore.conf',
+           nova_objectstore_context, perms=0o644,
+           templates_dir=templates_dir)
+    render('git.upstart', '/etc/init/nova-scheduler.conf',
+           nova_scheduler_context, perms=0o644,
+           templates_dir=templates_dir)
+    if os_rel >= 'juno':
+        render('git.upstart', '/etc/init/nova-serialproxy.conf',
+               nova_serialproxy_context, perms=0o644,
+               templates_dir=templates_dir)
+    render('git.upstart', '/etc/init/nova-spiceproxy.conf',
+           nova_spiceproxy_context, perms=0o644,
+           templates_dir=templates_dir)
+    render('git.upstart', '/etc/init/nova-xvpvncproxy.conf',
+           nova_xvpvncproxy_context, perms=0o644,
+           templates_dir=templates_dir)
+
+    apt_update()
+    apt_install(LATE_GIT_PACKAGES, fatal=True)

=== added directory 'templates/git'
=== added file 'templates/git/nova_sudoers'
--- templates/git/nova_sudoers	1970-01-01 00:00:00 +0000
+++ templates/git/nova_sudoers	2015-06-11 13:34:00 +0000
@@ -0,0 +1,4 @@
+Defaults:nova !requiretty
+
+nova ALL = (root) NOPASSWD: /usr/local/bin/nova-rootwrap /etc/nova/rootwrap.conf *
+

=== added file 'tests/050-basic-trusty-icehouse-git'
--- tests/050-basic-trusty-icehouse-git	1970-01-01 00:00:00 +0000
+++ tests/050-basic-trusty-icehouse-git	2015-06-11 13:34:00 +0000
@@ -0,0 +1,10 @@
+#!/usr/bin/python
+
+"""Amulet tests on a basic nova cloud controller git deployment on
+   trusty-icehouse."""
+
+from basic_deployment import NovaCCBasicDeployment
+
+if __name__ == '__main__':
+    deployment = NovaCCBasicDeployment(series='trusty', git=True)
+    deployment.run_tests()

=== added file 'tests/051-basic-trusty-juno-git'
--- tests/051-basic-trusty-juno-git	1970-01-01 00:00:00 +0000
+++ tests/051-basic-trusty-juno-git	2015-06-11 13:34:00 +0000
@@ -0,0 +1,13 @@
+#!/usr/bin/python
+
+"""Amulet tests on a basic nova cloud controller git deployment on
+   trusty-juno."""
+
+from basic_deployment import NovaCCBasicDeployment
+
+if __name__ == '__main__':
+    deployment = NovaCCBasicDeployment(series='trusty',
+                                       openstack='cloud:trusty-juno',
+                                       source='cloud:trusty-updates/juno',
+                                       git=True)
+    deployment.run_tests()

=== modified file 'tests/basic_deployment.py'
--- tests/basic_deployment.py	2015-04-20 10:21:36 +0000
+++ tests/basic_deployment.py	2015-06-11 13:34:00 +0000
@@ -1,6 +1,8 @@
 #!/usr/bin/python
 
 import amulet
+import os
+import yaml
 
 from charmhelpers.contrib.openstack.amulet.deployment import (
     OpenStackAmuletDeployment
@@ -19,9 +21,11 @@
 class NovaCCBasicDeployment(OpenStackAmuletDeployment):
     """Amulet tests on a basic nova cloud controller deployment."""
 
-    def __init__(self, series=None, openstack=None, source=None, stable=False):
+    def __init__(self, series=None, openstack=None, source=None, git=False,
+                 stable=False):
         """Deploy the entire test environment."""
         super(NovaCCBasicDeployment, self).__init__(series, openstack, source, stable)
+        self.git = git
         self._add_services()
         self._add_relations()
         self._configure_services()
@@ -62,9 +66,28 @@
 
     def _configure_services(self):
         """Configure all of the services."""
+        nova_cc_config = {}
+        if self.git:
+            branch = 'stable/' + self._get_openstack_release_string()
+            amulet_http_proxy = os.environ.get('AMULET_HTTP_PROXY')
+            openstack_origin_git = {
+                'repositories': [
+                    {'name': 'requirements',
+                     'repository': 'git://github.com/openstack/requirements',
+                     'branch': branch},
+                    {'name': 'nova',
+                     'repository': 'git://github.com/openstack/nova',
+                     'branch': branch},
+                ],
+                'directory': '/mnt/openstack-git',
+                'http_proxy': amulet_http_proxy,
+                'https_proxy': amulet_http_proxy,
+            }
+            nova_cc_config['openstack-origin-git'] = yaml.dump(openstack_origin_git)
         keystone_config = {'admin-password': 'openstack',
                            'admin-token': 'ubuntutesting'}
-        configs = {'keystone': keystone_config}
+        configs = {'nova-cloud-controller': nova_cc_config,
+                   'keystone': keystone_config}
         super(NovaCCBasicDeployment, self)._configure_services(configs)
 
     def _initialize_tests(self):

=== modified file 'unit_tests/__init__.py'
--- unit_tests/__init__.py	2015-04-20 10:21:36 +0000
+++ unit_tests/__init__.py	2015-06-11 13:34:00 +0000
@@ -1,2 +1,4 @@
 import sys
+
+sys.path.append('actions/')
 sys.path.append('hooks/')

=== added file 'unit_tests/test_actions_git_reinstall.py'
--- unit_tests/test_actions_git_reinstall.py	1970-01-01 00:00:00 +0000
+++ unit_tests/test_actions_git_reinstall.py	2015-06-11 13:34:00 +0000
@@ -0,0 +1,107 @@
+from mock import patch, MagicMock
+
+with patch('charmhelpers.core.hookenv.config') as config:
+    config.return_value = 'nova'
+    import nova_cc_utils as utils  # noqa
+
+_reg = utils.register_configs
+_map = utils.restart_map
+
+utils.register_configs = MagicMock()
+utils.restart_map = MagicMock()
+
+with patch('nova_cc_utils.guard_map') as gmap:
+    with patch('charmhelpers.core.hookenv.config') as config:
+        config.return_value = False
+        gmap.return_value = {}
+        import git_reinstall
+
+utils.register_configs = _reg
+utils.restart_map = _map
+
+from test_utils import (
+    CharmTestCase
+)
+
+TO_PATCH = [
+    'config',
+]
+
+
+openstack_origin_git = \
+    """repositories:
+         - {name: requirements,
+            repository: 'git://git.openstack.org/openstack/requirements',
+            branch: stable/juno}
+         - {name: nova,
+            repository: 'git://git.openstack.org/openstack/nova',
+            branch: stable/juno}"""
+
+
+class TestnovaAPIActions(CharmTestCase):
+
+    def setUp(self):
+        super(TestnovaAPIActions, self).setUp(git_reinstall, TO_PATCH)
+        self.config.side_effect = self.test_config.get
+
+    @patch.object(git_reinstall, 'action_set')
+    @patch.object(git_reinstall, 'action_fail')
+    @patch.object(git_reinstall, 'git_install')
+    @patch.object(git_reinstall, 'config_changed')
+    def test_git_reinstall(self, config_changed, git_install, action_fail,
+                           action_set):
+        self.test_config.set('openstack-origin-git', openstack_origin_git)
+
+        git_reinstall.git_reinstall()
+
+        git_install.assert_called_with(openstack_origin_git)
+        self.assertTrue(git_install.called)
+        self.assertTrue(config_changed.called)
+        self.assertFalse(action_set.called)
+        self.assertFalse(action_fail.called)
+
+    @patch.object(git_reinstall, 'action_set')
+    @patch.object(git_reinstall, 'action_fail')
+    @patch.object(git_reinstall, 'git_install')
+    @patch.object(git_reinstall, 'config_changed')
+    @patch('charmhelpers.contrib.openstack.utils.config')
+    def test_git_reinstall_not_configured(self, _config, config_changed,
+                                          git_install, action_fail,
+                                          action_set):
+        _config.return_value = None
+
+        git_reinstall.git_reinstall()
+
+        msg = 'openstack-origin-git is not configured'
+        action_fail.assert_called_with(msg)
+        self.assertFalse(git_install.called)
+        self.assertFalse(action_set.called)
+
+    @patch.object(git_reinstall, 'action_set')
+    @patch.object(git_reinstall, 'action_fail')
+    @patch.object(git_reinstall, 'git_install')
+    @patch.object(git_reinstall, 'config_changed')
+    @patch('traceback.format_exc')
+    @patch('charmhelpers.contrib.openstack.utils.config')
+    def test_git_reinstall_exception(self, _config, format_exc,
+                                     config_changed, git_install, action_fail,
+                                     action_set):
+        _config.return_value = openstack_origin_git
+        e = OSError('something bad happened')
+        git_install.side_effect = e
+        traceback = (
+            "Traceback (most recent call last):\n"
+            "  File \"actions/git_reinstall.py\", line 37, in git_reinstall\n"
+            "    git_install(config(\'openstack-origin-git\'))\n"
+            "  File \"/usr/lib/python2.7/dist-packages/mock.py\", line 964, in __call__\n"  # noqa
+            "    return _mock_self._mock_call(*args, **kwargs)\n"
+            "  File \"/usr/lib/python2.7/dist-packages/mock.py\", line 1019, in _mock_call\n"  # noqa
+            "    raise effect\n"
+            "OSError: something bad happened\n")
+        format_exc.return_value = traceback
+
+        git_reinstall.git_reinstall()
+
+        msg = 'git-reinstall resulted in an unexpected error'
+        action_fail.assert_called_with(msg)
+        action_set.assert_called_with({'traceback': traceback})

=== modified file 'unit_tests/test_nova_cc_contexts.py'
--- unit_tests/test_nova_cc_contexts.py	2015-06-03 00:06:30 +0000
+++ unit_tests/test_nova_cc_contexts.py	2015-06-11 13:34:00 +0000
@@ -9,9 +9,7 @@
 from charmhelpers.core import hookenv
 _conf = hookenv.config
 hookenv.config = mock.MagicMock()
-import nova_cc_utils as _utils
-# this assert is a double check + to avoid pep8 warning
-assert _utils.config == hookenv.config
+import nova_cc_utils as _utils  # noqa
 hookenv.config = _conf
 #####
 

=== modified file 'unit_tests/test_nova_cc_hooks.py'
--- unit_tests/test_nova_cc_hooks.py	2015-06-10 20:32:48 +0000
+++ unit_tests/test_nova_cc_hooks.py	2015-06-11 13:34:00 +0000
@@ -1,6 +1,7 @@
 from mock import MagicMock, patch, call
 from test_utils import CharmTestCase, patch_open
 import os
+import yaml
 import tempfile
 
 with patch('charmhelpers.core.hookenv.config') as config:
@@ -70,6 +71,8 @@
     'get_iface_for_address',
     'get_netmask_for_address',
     'update_nrpe_config',
+    'git_install',
+    'git_install_requested',
 ]
 
 
@@ -116,12 +119,63 @@
         self.disable_services.assert_called()
         self.cmd_all_services.assert_called_with('stop')
 
+    def test_install_hook_git(self):
+        self.git_install_requested.return_value = True
+        self.determine_packages.return_value = ['foo', 'bar']
+        self.determine_ports.return_value = [80, 81, 82]
+        repo = 'cloud:trusty-juno'
+        openstack_origin_git = {
+            'repositories': [
+                {'name': 'requirements',
+                 'repository': 'git://git.openstack.org/openstack/requirements',  # noqa
+                 'branch': 'stable/juno'},
+                {'name': 'nova',
+                 'repository': 'git://git.openstack.org/openstack/nova',
+                 'branch': 'stable/juno'}
+            ],
+            'directory': '/mnt/openstack-git',
+        }
+        projects_yaml = yaml.dump(openstack_origin_git)
+        self.test_config.set('openstack-origin', repo)
+        self.test_config.set('openstack-origin-git', projects_yaml)
+        hooks.install()
+        self.git_install.assert_called_with(projects_yaml)
+        self.apt_install.assert_called_with(['foo', 'bar'], fatal=True)
+        self.execd_preinstall.assert_called()
+        self.disable_services.assert_called()
+        self.cmd_all_services.assert_called_with('stop')
+
     @patch.object(hooks, 'configure_https')
     def test_config_changed_no_upgrade(self, conf_https):
+        self.git_install_requested.return_value = False
         self.openstack_upgrade_available.return_value = False
         hooks.config_changed()
         self.assertTrue(self.save_script_rc.called)
 
+    @patch.object(hooks, 'config_value_changed')
+    @patch.object(hooks, 'configure_https')
+    def test_config_changed_git(self, configure_https, config_val_changed):
+        self.git_install_requested.return_value = True
+        repo = 'cloud:trusty-juno'
+        openstack_origin_git = {
+            'repositories': [
+                {'name': 'requirements',
+                 'repository':
+                 'git://git.openstack.org/openstack/requirements',
+                 'branch': 'stable/juno'},
+                {'name': 'nova',
+                 'repository': 'git://git.openstack.org/openstack/nova',
+                 'branch': 'stable/juno'}
+            ],
+            'directory': '/mnt/openstack-git',
+        }
+        projects_yaml = yaml.dump(openstack_origin_git)
+        self.test_config.set('openstack-origin', repo)
+        self.test_config.set('openstack-origin-git', projects_yaml)
+        hooks.config_changed()
+        self.git_install.assert_called_with(projects_yaml)
+        self.assertFalse(self.do_openstack_upgrade.called)
+
     @patch('charmhelpers.contrib.openstack.ip.service_name',
            lambda *args: 'nova-cloud-controller')
     @patch.object(hooks, 'cluster_joined')
@@ -130,6 +184,7 @@
     @patch.object(hooks, 'configure_https')
     def test_config_changed_with_upgrade(self, conf_https, neutron_api_joined,
                                          identity_joined, cluster_joined):
+        self.git_install_requested.return_value = False
         self.openstack_upgrade_available.return_value = True
         self.relation_ids.return_value = ['generic_rid']
         _zmq_joined = self.patch('zeromq_configuration_relation_joined')
@@ -768,6 +823,7 @@
     @patch('nova_cc_hooks.configure_https')
     @patch('nova_cc_utils.config')
     def test_config_changed_single_consoleauth(self, config, *args):
+        self.git_install_requested.return_value = False
         config.return_value = 'novnc'
         rids = {'ha': ['ha:1']}
 

=== modified file 'unit_tests/test_nova_cc_utils.py'
--- unit_tests/test_nova_cc_utils.py	2015-05-11 09:51:21 +0000
+++ unit_tests/test_nova_cc_utils.py	2015-06-11 13:34:00 +0000
@@ -127,6 +127,15 @@
     '--option', 'Dpkg::Options::=--force-confdef',
 ]
 
+openstack_origin_git = \
+    """repositories:
+         - {name: requirements,
+            repository: 'git://git.openstack.org/openstack/requirements',
+            branch: stable/juno}
+         - {name: nova,
+            repository: 'git://git.openstack.org/openstack/nova',
+            branch: stable/juno}"""
+
 
 def fake_plugin_attribute(plugin, attr, net_manager):
     if plugin in PLUGIN_ATTRIBUTES:
@@ -298,26 +307,34 @@
         self.assertEquals(_proxy_page, None)
 
     @patch('charmhelpers.contrib.openstack.context.SubordinateConfigContext')
-    def test_determine_packages_quantum(self, subcontext):
+    @patch.object(utils, 'git_install_requested')
+    def test_determine_packages_quantum(self, git_requested, subcontext):
+        git_requested.return_value = False
         self._resource_map(network_manager='quantum')
         pkgs = utils.determine_packages()
         self.assertIn('quantum-server', pkgs)
 
     @patch('charmhelpers.contrib.openstack.context.SubordinateConfigContext')
-    def test_determine_packages_neutron(self, subcontext):
+    @patch.object(utils, 'git_install_requested')
+    def test_determine_packages_neutron(self, git_requested, subcontext):
+        git_requested.return_value = False
         self.is_relation_made.return_value = False
         self._resource_map(network_manager='neutron')
         pkgs = utils.determine_packages()
         self.assertIn('neutron-server', pkgs)
 
     @patch('charmhelpers.contrib.openstack.context.SubordinateConfigContext')
-    def test_determine_packages_nova_volume(self, subcontext):
+    @patch.object(utils, 'git_install_requested')
+    def test_determine_packages_nova_volume(self, git_requested, subcontext):
+        git_requested.return_value = False
         self.relation_ids.return_value = ['nova-volume-service:0']
         pkgs = utils.determine_packages()
         self.assertIn('nova-api-os-volume', pkgs)
 
     @patch('charmhelpers.contrib.openstack.context.SubordinateConfigContext')
-    def test_determine_packages_console(self, subcontext):
+    @patch.object(utils, 'git_install_requested')
+    def test_determine_packages_console(self, git_requested, subcontext):
+        git_requested.return_value = False
         self.test_config.set('console-access-protocol', 'spice')
         self.relation_ids.return_value = []
         pkgs = utils.determine_packages()
@@ -326,7 +343,9 @@
             self.assertIn(console_pkg, pkgs)
 
     @patch('charmhelpers.contrib.openstack.context.SubordinateConfigContext')
-    def test_determine_packages_base(self, subcontext):
+    @patch.object(utils, 'git_install_requested')
+    def test_determine_packages_base(self, git_requested, subcontext):
+        git_requested.return_value = False
         self.relation_ids.return_value = []
         self.os_release.return_value = 'folsom'
         pkgs = utils.determine_packages()
@@ -334,7 +353,10 @@
         self.assertEquals(ex, pkgs)
 
     @patch('charmhelpers.contrib.openstack.context.SubordinateConfigContext')
-    def test_determine_packages_base_grizzly_beyond(self, subcontext):
+    @patch.object(utils, 'git_install_requested')
+    def test_determine_packages_base_grizzly_beyond(self, git_requested,
+                                                    subcontext):
+        git_requested.return_value = False
         self.relation_ids.return_value = []
         self.os_release.return_value = 'grizzly'
         pkgs = utils.determine_packages()
@@ -847,3 +869,264 @@
         self.assertFalse(self.service_running.called)
         self.assertFalse(self.service_stop.called)
         self.assertTrue(contexts.complete_contexts.called)
+
+    @patch.object(utils, 'git_install_requested')
+    @patch.object(utils, 'git_clone_and_install')
+    @patch.object(utils, 'git_post_install')
+    @patch.object(utils, 'git_pre_install')
+    def test_git_install(self, git_pre, git_post, git_clone_and_install,
+                         git_requested):
+        projects_yaml = openstack_origin_git
+        git_requested.return_value = True
+        utils.git_install(projects_yaml)
+        self.assertTrue(git_pre.called)
+        git_clone_and_install.assert_called_with(openstack_origin_git,
+                                                 core_project='nova')
+        self.assertTrue(git_post.called)
+
+    @patch.object(utils, 'mkdir')
+    @patch.object(utils, 'add_user_to_group')
+    @patch.object(utils, 'add_group')
+    @patch.object(utils, 'adduser')
+    @patch('subprocess.check_call')
+    def test_git_pre_install(self, check_call, adduser, add_group,
+                             add_user_to_group, mkdir):
+        utils.git_pre_install()
+        expected = [
+            call('nova', shell='/bin/bash', system_user=True),
+            call('neutron', shell='/bin/bash', system_user=True),
+        ]
+        self.assertEquals(adduser.call_args_list, expected)
+        check_call.assert_called_with(['usermod', '--home', '/var/lib/nova',
+                                       'nova'])
+        expected = [
+            call('nova', system_group=True),
+            call('neutron', system_group=True),
+        ]
+        self.assertEquals(add_group.call_args_list, expected)
+        expected = [
+            call('nova', 'nova'),
+            call('neutron', 'neutron'),
+        ]
+        self.assertEquals(add_user_to_group.call_args_list, expected)
+        expected = [
+            call('/var/lib/nova', owner='nova',
+                 group='nova', perms=0755, force=False),
+            call('/var/lib/nova/buckets', owner='nova',
+                 group='nova', perms=0755, force=False),
+            call('/var/lib/nova/CA', owner='nova',
+                 group='nova', perms=0755, force=False),
+            call('/var/lib/nova/CA/INTER', owner='nova',
+                 group='nova', perms=0755, force=False),
+            call('/var/lib/nova/CA/newcerts', owner='nova',
+                 group='nova', perms=0755, force=False),
+            call('/var/lib/nova/CA/private', owner='nova',
+                 group='nova', perms=0755, force=False),
+            call('/var/lib/nova/CA/reqs', owner='nova',
+                 group='nova', perms=0755, force=False),
+            call('/var/lib/nova/images', owner='nova',
+                 group='nova', perms=0755, force=False),
+            call('/var/lib/nova/instances', owner='nova',
+                 group='nova', perms=0755, force=False),
+            call('/var/lib/nova/keys', owner='nova',
+                 group='nova', perms=0755, force=False),
+            call('/var/lib/nova/networks', owner='nova',
+                 group='nova', perms=0755, force=False),
+            call('/var/lib/nova/tmp', owner='nova',
+                 group='nova', perms=0755, force=False),
+            call('/var/lib/neutron', owner='nova',
+                 group='nova', perms=0755, force=False),
+            call('/var/lib/neutron/lock', owner='nova',
+                 group='nova', perms=0755, force=False),
+            call('/var/log/nova', owner='nova',
+                 group='nova', perms=0755, force=False),
+            call('/etc/neutron', owner='nova',
+                 group='nova', perms=0755, force=False),
+            call('/etc/neutron/plugins', owner='nova',
+                 group='nova', perms=0755, force=False),
+            call('/etc/neutron/plugins/ml2', owner='nova',
+                 group='nova', perms=0755, force=False),
+        ]
+        self.assertEquals(mkdir.call_args_list, expected)
+
+    @patch.object(utils, 'git_src_dir')
+    @patch.object(utils, 'render')
+    @patch.object(utils, 'git_pip_venv_dir')
+    @patch.object(utils, 'pip_install')
+    @patch('os.path.join')
+    @patch('os.path.exists')
+    @patch('os.symlink')
+    @patch('shutil.copytree')
+    @patch('shutil.rmtree')
+    def test_git_post_install(self, rmtree, copytree, symlink,
+                              exists, join, pip_install, venv, render,
+                              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-manage'),
+            call('joined-string', '/usr/local/bin/nova-rootwrap'),
+        ]
+
+        nova_cc = 'nova-cloud-controller'
+        nova_user = 'nova'
+        start_dir = '/var/lib/nova'
+        nova_conf = '/etc/nova/nova.conf'
+        nova_ec2_api_context = {
+            'service_description': 'Nova EC2 API server',
+            'service_name': nova_cc,
+            'user_name': nova_user,
+            'start_dir': start_dir,
+            'process_name': 'nova-api-ec2',
+            'executable_name': 'joined-string',
+            'config_files': [nova_conf],
+        }
+        nova_api_os_compute_context = {
+            'service_description': 'Nova OpenStack Compute API server',
+            'service_name': nova_cc,
+            'user_name': nova_user,
+            'start_dir': start_dir,
+            'process_name': 'nova-api-os-compute',
+            'executable_name': 'joined-string',
+            'config_files': [nova_conf],
+        }
+        nova_cells_context = {
+            'service_description': 'Nova cells',
+            'service_name': nova_cc,
+            'user_name': nova_user,
+            'start_dir': start_dir,
+            'process_name': 'nova-cells',
+            'executable_name': 'joined-string',
+            'config_files': [nova_conf],
+        }
+        nova_cert_context = {
+            'service_description': 'Nova cert',
+            'service_name': nova_cc,
+            'user_name': nova_user,
+            'start_dir': start_dir,
+            'process_name': 'nova-cert',
+            'executable_name': 'joined-string',
+            'config_files': [nova_conf],
+        }
+        nova_conductor_context = {
+            'service_description': 'Nova conductor',
+            'service_name': nova_cc,
+            'user_name': nova_user,
+            'start_dir': start_dir,
+            'process_name': 'nova-conductor',
+            'executable_name': 'joined-string',
+            'config_files': [nova_conf],
+        }
+        nova_consoleauth_context = {
+            'service_description': 'Nova console auth',
+            'service_name': nova_cc,
+            'user_name': nova_user,
+            'start_dir': start_dir,
+            'process_name': 'nova-consoleauth',
+            'executable_name': 'joined-string',
+            'config_files': [nova_conf],
+        }
+        nova_console_context = {
+            'service_description': 'Nova console',
+            'service_name': nova_cc,
+            'user_name': nova_user,
+            'start_dir': start_dir,
+            'process_name': 'nova-console',
+            'executable_name': 'joined-string',
+            'config_files': [nova_conf],
+        }
+        nova_novncproxy_context = {
+            'service_description': 'Nova NoVNC proxy',
+            'service_name': nova_cc,
+            'user_name': nova_user,
+            'start_dir': start_dir,
+            'process_name': 'nova-novncproxy',
+            'executable_name': 'joined-string',
+            'config_files': [nova_conf],
+        }
+        nova_objectstore_context = {
+            'service_description': 'Nova object store',
+            'service_name': nova_cc,
+            'user_name': nova_user,
+            'start_dir': start_dir,
+            'process_name': 'nova-objectstore',
+            'executable_name': 'joined-string',
+            'config_files': [nova_conf],
+        }
+        nova_scheduler_context = {
+            'service_description': 'Nova scheduler',
+            'service_name': nova_cc,
+            'user_name': nova_user,
+            'start_dir': start_dir,
+            'process_name': 'nova-scheduler',
+            'executable_name': 'joined-string',
+            'config_files': [nova_conf],
+        }
+        nova_spiceproxy_context = {
+            'service_description': 'Nova spice proxy',
+            'service_name': nova_cc,
+            'user_name': nova_user,
+            'start_dir': start_dir,
+            'process_name': 'nova-spicehtml5proxy',
+            'executable_name': 'joined-string',
+            'config_files': [nova_conf],
+        }
+        nova_xvpvncproxy_context = {
+            'service_description': 'Nova XVPVNC proxy',
+            'service_name': nova_cc,
+            'user_name': nova_user,
+            'start_dir': start_dir,
+            'process_name': 'nova-xvpvncproxy',
+            'executable_name': 'joined-string',
+            'config_files': [nova_conf],
+        }
+        expected = [
+            call('git/nova_sudoers', '/etc/sudoers.d/nova_sudoers',
+                 {}, perms=0o440),
+            call('git.upstart', '/etc/init/nova-api-ec2.conf',
+                 nova_ec2_api_context, perms=0o644,
+                 templates_dir='joined-string'),
+            call('git.upstart', '/etc/init/nova-api-os-compute.conf',
+                 nova_api_os_compute_context, perms=0o644,
+                 templates_dir='joined-string'),
+            call('git.upstart', '/etc/init/nova-cells.conf',
+                 nova_cells_context, perms=0o644,
+                 templates_dir='joined-string'),
+            call('git.upstart', '/etc/init/nova-cert.conf',
+                 nova_cert_context, perms=0o644,
+                 templates_dir='joined-string'),
+            call('git.upstart', '/etc/init/nova-conductor.conf',
+                 nova_conductor_context, perms=0o644,
+                 templates_dir='joined-string'),
+            call('git.upstart', '/etc/init/nova-consoleauth.conf',
+                 nova_consoleauth_context, perms=0o644,
+                 templates_dir='joined-string'),
+            call('git.upstart', '/etc/init/nova-console.conf',
+                 nova_console_context, perms=0o644,
+                 templates_dir='joined-string'),
+            call('git.upstart', '/etc/init/nova-novncproxy.conf',
+                 nova_novncproxy_context, perms=0o644,
+                 templates_dir='joined-string'),
+            call('git.upstart', '/etc/init/nova-objectstore.conf',
+                 nova_objectstore_context, perms=0o644,
+                 templates_dir='joined-string'),
+            call('git.upstart', '/etc/init/nova-scheduler.conf',
+                 nova_scheduler_context, perms=0o644,
+                 templates_dir='joined-string'),
+            call('git.upstart', '/etc/init/nova-spiceproxy.conf',
+                 nova_spiceproxy_context, perms=0o644,
+                 templates_dir='joined-string'),
+            call('git.upstart', '/etc/init/nova-xvpvncproxy.conf',
+                 nova_xvpvncproxy_context, perms=0o644,
+                 templates_dir='joined-string'),
+        ]
+        self.assertEquals(render.call_args_list, expected)
+        self.assertTrue(self.apt_update.called)
+        self.apt_install.assert_called_with(['novnc', 'spice-html5',
+                                             'websockify'], fatal=True)