Merge lp:~corey.bryant/charms/trusty/cinder/amulet-git-fixups into lp:~openstack-charmers-archive/charms/trusty/cinder/next

[Corey Bryant]

[Corey Bryant (corey.bryant)]

Amulet deploy from source updates:
  * Use modified icehouse branches due to requirements issues
  * Use /tmp/openstack-git instead of /mnt/openstack-git to prevent conflict with /dev/vdb

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

charm_lint_check #6112 cinder-next for corey.bryant mp264553
    LINT OK: passed

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

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

charm_unit_test #5744 cinder-next for corey.bryant mp264553
    UNIT OK: passed

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

[lp:~corey.bryant/charms/trusty/cinder/amulet-git-fixups]

111. By Corey Bryant on 2015-07-13

More amulet deploy from source branch fixups.

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

charm_lint_check #6113 cinder-next for corey.bryant mp264553
    LINT OK: passed

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

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

charm_unit_test #5745 cinder-next for corey.bryant mp264553
    UNIT OK: passed

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

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

charm_amulet_test #5101 cinder-next for corey.bryant mp264553
    AMULET OK: passed

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

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

charm_amulet_test #5102 cinder-next for corey.bryant mp264553
    AMULET OK: passed

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

=== modified file 'tests/basic_deployment.py'
--- tests/basic_deployment.py	2015-07-09 18:16:48 +0000
+++ tests/basic_deployment.py	2015-07-13 16:07:43 +0000
@@ -70,23 +70,28 @@
                          'glance-api-version': '2',
                          'overwrite': 'true'}
         if self.git:
-            release = self._get_openstack_release_string()
-            reqs_branch = 'stable/' + release
+            amulet_http_proxy = os.environ.get('AMULET_HTTP_PROXY')
+
+            reqs_repo = 'git://github.com/openstack/requirements'
+            cinder_repo = 'git://github.com/openstack/cinder'
             if self._get_openstack_release() == self.trusty_icehouse:
-                cinder_branch = release + '-eol'
-            else:
-                cinder_branch = 'stable/' + release
-            amulet_http_proxy = os.environ.get('AMULET_HTTP_PROXY')
+                reqs_repo = 'git://github.com/coreycb/requirements'
+                cinder_repo = 'git://github.com/coreycb/cinder'
+
+            branch = 'stable/' + self._get_openstack_release_string()
+
             openstack_origin_git = {
                 'repositories': [
                     {'name': 'requirements',
-                     'repository': 'git://github.com/openstack/requirements',
-                     'branch': reqs_branch},
+                     'repository': reqs_repo,
+                     'branch': branch},
                     {'name': 'cinder',
-                     'repository': 'git://github.com/openstack/cinder',
-                     'branch': cinder_branch},
+                     'repository': cinder_repo,
+                     'branch': branch},
                 ],
-                'directory': '/mnt/openstack-git',
+                # Most tests use /mnt/openstack-git but cinder's using /dev/vdb
+                # to store block devices so leave /mnt alone.
+                'directory': '/tmp/openstack-git',
                 'http_proxy': amulet_http_proxy,
                 'https_proxy': amulet_http_proxy,
             }