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

[Corey Bryant]

[Corey Bryant (corey.bryant)]

Amulet deploy from source updates:
  * Use modified icehouse branches due to requirements issues

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

charm_lint_check #6115 keystone-next for corey.bryant mp264566
    LINT OK: passed

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

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

charm_unit_test #5747 keystone-next for corey.bryant mp264566
    UNIT OK: passed

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

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

charm_amulet_test #5104 keystone-next for corey.bryant mp264566
    AMULET OK: passed

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

=== 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:54 +0000
@@ -62,21 +62,24 @@
         keystone_config = {'admin-password': 'openstack',
                            'admin-token': 'ubuntutesting'}
         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'
+            keystone_repo = 'git://github.com/openstack/keystone'
             if self._get_openstack_release() == self.trusty_icehouse:
-                keystone_branch = release + '-eol'
-            else:
-                keystone_branch = 'stable/' + release
-            amulet_http_proxy = os.environ.get('AMULET_HTTP_PROXY')
+                reqs_repo = 'git://github.com/coreycb/requirements'
+                keystone_repo = 'git://github.com/coreycb/keystone'
+
+            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': 'keystone',
-                     'repository': 'git://github.com/openstack/keystone',
-                     'branch': keystone_branch},
+                     'repository': keystone_repo,
+                     'branch': branch},
                 ],
                 'directory': '/mnt/openstack-git',
                 'http_proxy': amulet_http_proxy,