Consume horizon master

Previously the repository consumes horizon from amotoki's
private github repository for initial testing.
Let's switch it to the main horizon repository.

At the moment, this is for testing.
It should be merged after horizon change is merged.

Depends-On: Ib304ddef381d80011f7030fdd5049aab0e901ae6
Change-Id: I11a927ae799102def257edc5c18486acd3700299

tox.ini

@@ -7,8 +7,7 @@ skipsdist = True
 usedevelop = True
 install_command = {toxinidir}/tools/tox_install.sh {env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt} {opts} {packages}
 setenv = VIRTUAL_ENV={envdir}
-         # BRANCH_NAME=master
-         BRANCH_NAME=drop-vpnaas
+         BRANCH_NAME=master
          CLIENT_NAME=neutron-vpnaas-dashboard
          NOSE_WITH_OPENSTACK=1
          NOSE_OPENSTACK_COLOR=1
@@ -17,8 +16,7 @@ setenv = VIRTUAL_ENV={envdir}
          NOSE_OPENSTACK_SHOW_ELAPSED=1
 deps = -r{toxinidir}/requirements.txt
        -r{toxinidir}/test-requirements.txt
-       os:amotoki/horizon:horizon
-       # os:openstack/horizon:horizon
+       os:openstack/horizon:horizon
 commands = {[unit_tests]commands}
 
 [unit_tests]