x/almanach
Code Issues Proposed changes

Avoid hardcoded RabbitMQ URL in devstack plugin

Browse Source 
Change-Id: Ibc9bbfa622f20b5b64eb7d6c4062b59efd81d249
This commit is contained in:
Marc Aubry 2016-12-19 16:47:47 -05:00 committed by Frédéric Guillot
parent 0d5ba59482
commit 22f4e62a25
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
almanach/tests/tempest/plugin.py
View File

@ -12,6 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
import almanach
import os
from tempest import config
@ -24,8 +25,8 @@ class AlmanachTempestPlugin(plugins.TempestPlugin):
def load_tests(self):
base_path = os.path.split(os.path.dirname(
os.path.abspath(__file__)))[0]
test_dir = "tempest/tests"
os.path.abspath(almanach.__file__)))[0]
test_dir = "almanach/tests/tempest/tests"
full_test_dir = os.path.join(base_path, test_dir)
return full_test_dir, base_path

2
devstack/plugin.sh
View File

@ -43,7 +43,7 @@ function almanach_configure {
iniset $ALMANACH_CONF keystone_authtoken project_name $SERVICE_PROJECT_NAME
iniset $ALMANACH_CONF keystone_authtoken auth_url $KEYSTONE_SERVICE_URI_V3
iniset $ALMANACH_CONF collector transport_url rabbit://stackrabbit:secret@localhost:5672
iniset $ALMANACH_CONF collector transport_url rabbit://$RABBIT_USERID:$RABBIT_PASSWORD@$RABBIT_HOST:5672
iniset $ALMANACH_CONF database connection_url mongodb://localhost/almanach
}