diff options
| -rw-r--r-- | requirements.txt | 2 | ||||
| -rw-r--r-- | setup.py | 1 | ||||
| -rw-r--r-- | test-requirements.txt | 12 | ||||
| -rw-r--r-- | tuskar_ui/infrastructure/templates/infrastructure/overview/deployment_initialize.html | 2 |
4 files changed, 10 insertions, 7 deletions
diff --git a/requirements.txt b/requirements.txt index 93fe4194..590d6696 100644 --- a/requirements.txt +++ b/requirements.txt @@ -3,4 +3,4 @@ # process, which may cause wedges in the gate later. os-cloud-config python-ironicclient>=0.2.1 -ironic-discoverd>=1.0.0 # Apache-2.0 +ironic-discoverd>=1.0.0 # Apache-2.0 @@ -1,4 +1,3 @@ -#!/usr/bin/env python # Copyright (c) 2013 Hewlett-Packard Development Company, L.P. # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/test-requirements.txt b/test-requirements.txt index 7032a15e..ac2402a7 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -2,10 +2,14 @@ # of appearance. Changing the order has an impact on the overall integration # process, which may cause wedges in the gate later. # Hacking already pins down pep8, pyflakes and flake8 -hacking>=0.10.0,<0.11 +hacking<0.11,>=0.10.0 # Testing Requirements http://tarballs.openstack.org/horizon/horizon-master.tar.gz#egg=horizon + + http://tarballs.openstack.org/python-tuskarclient/python-tuskarclient-master.tar.gz#egg=python-tuskarclient + + coverage>=3.6 django-nose>=1.2 mock>=1.0 @@ -14,11 +18,11 @@ nodeenv>=0.9.4 # BSD License nose nose-exclude nosexcover -openstack.nose_plugin>=0.7 +openstack.nose-plugin>=0.7 nosehtmloutput>=0.0.3 selenium xvfbwrapper>=0.1.3 #license: MIT # Docs Requirements -sphinx>=1.1.2,!=1.2.0,!=1.3b1,<1.3 -oslosphinx>=2.5.0 # Apache-2.0 +sphinx!=1.2.0,!=1.3b1,<1.3,>=1.1.2 +oslosphinx>=2.5.0 # Apache-2.0 diff --git a/tuskar_ui/infrastructure/templates/infrastructure/overview/deployment_initialize.html b/tuskar_ui/infrastructure/templates/infrastructure/overview/deployment_initialize.html index be537ed4..af29031e 100644 --- a/tuskar_ui/infrastructure/templates/infrastructure/overview/deployment_initialize.html +++ b/tuskar_ui/infrastructure/templates/infrastructure/overview/deployment_initialize.html @@ -8,7 +8,7 @@ {% block deployment-title %}{% trans "Initialization Needed" %}{% endblock %} {% block deployment-info %} -<p>{% trans "Your OpenStack cloud is deployed but it needs to get initialized in order to get live." %}</p> +<p>{% trans "Your OpenStack cloud is successfully deployed. Before using the cloud you must now initialize it." %}</p> {% endblock %} {% block deployment-buttons %} |