Fix few missed issues with the reddwarf -> trove rename
There were still a few files remaining after the reddwarf->trove rename that were still referencing "reddwarf". Changed these references to "trove". Fixed bug: 1194637 Change-Id: Ib1cc57d909a2024ea650aefd82f2f7c91f39e5d4
This commit is contained in:
Nikhil Manchanda
parent
5a48d23bfe
commit
60ec74217a
|
|
@ -51,7 +51,7 @@ Install a fresh Ubuntu 12.04 (Precise Pangolin) image ( _We suggest to create a
|
|||
$ ./redstack
|
||||
|
||||
#### Install all the dependencies and then install trove via redstack.
|
||||
*This brings up trove (rd-api rd-tmgr) and initializes the reddwarf database.*
|
||||
*This brings up trove (rd-api rd-tmgr) and initializes the trove database.*
|
||||
|
||||
$ ./redstack install
|
||||
|
||||
|
|
@ -111,7 +111,7 @@ Allows the services to continue running in the background
|
|||
|
||||
$ sudo iptables -t nat -A POSTROUTING -s 10.0.0.0/24 -o eth0 -j MASQUERADE
|
||||
|
||||
#### Running the reddwarf client (It's so easy!)
|
||||
#### Running the trove client (It's so easy!)
|
||||
*This sets of the authorization endpoint and gets a token for you*
|
||||
|
||||
$ ./redstack rd-client
|
||||
|
|
@ -150,7 +150,6 @@ If the VM was restarted, then the process for bringing up Openstack and Trove is
|
|||
Use screen to ensure all modules have started without error
|
||||
|
||||
$screen -r stack
|
||||
$screen -r reddwarf
|
||||
|
||||
***
|
||||
|
||||
|
|
|
|||
|
|
@ -430,7 +430,7 @@
|
|||
overcommit multiplier.</para>
|
||||
</listitem>
|
||||
<listitem security="internal">
|
||||
<para>Fixed the reddwarf-api issues with rabbit
|
||||
<para>Fixed the trove-api issues with rabbit
|
||||
connections. Using openstack-common rpc.</para>
|
||||
</listitem>
|
||||
<listitem security="internal">
|
||||
|
|
|
|||
|
|
@ -60,4 +60,4 @@ Date: Thu, 12 Apr 2012 18:50:20 GMT
|
|||
publicURL="https://dns.api.rackspacecloud.com/v1.0/1100111"/>
|
||||
</service>
|
||||
</serviceCatalog>
|
||||
</access>
|
||||
</access>
|
||||
|
|
|
|||
|
|
@ -47,4 +47,4 @@ Date: Thu, 12 Apr 2012 18:50:20 GMT
|
|||
/>
|
||||
</service>
|
||||
</serviceCatalog>
|
||||
</auth>
|
||||
</auth>
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
GET /v1.0/1234/mgmt/accounts/1234 HTTP/1.1
|
||||
User-Agent: python-reddwarfclient
|
||||
User-Agent: python-troveclient
|
||||
Host: ord.databases.api.rackspacecloud.com
|
||||
X-Auth-Token: 87c6033c-9ff6-405f-943e-2deb73f278b7
|
||||
Accept: application/json
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
GET /v1.0/1234/mgmt/accounts/1234 HTTP/1.1
|
||||
User-Agent: python-reddwarfclient
|
||||
User-Agent: python-troveclient
|
||||
Host: ord.databases.api.rackspacecloud.com
|
||||
X-Auth-Token: 87c6033c-9ff6-405f-943e-2deb73f278b7
|
||||
Accept: application/xml
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
GET /v1.0/1234/mgmt/hosts/hostname HTTP/1.1
|
||||
User-Agent: python-reddwarfclient
|
||||
User-Agent: python-troveclient
|
||||
Host: ord.databases.api.rackspacecloud.com
|
||||
X-Auth-Token: 87c6033c-9ff6-405f-943e-2deb73f278b7
|
||||
Accept: application/json
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
GET /v1.0/1234/mgmt/hosts/hostname HTTP/1.1
|
||||
User-Agent: python-reddwarfclient
|
||||
User-Agent: python-troveclient
|
||||
Host: ord.databases.api.rackspacecloud.com
|
||||
X-Auth-Token: 87c6033c-9ff6-405f-943e-2deb73f278b7
|
||||
Accept: application/xml
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
GET /v1.0/1234/mgmt/instances/6e038c18-902f-4a41-b2a2-5f46fa62fc1b HTTP/1.1
|
||||
User-Agent: python-reddwarfclient
|
||||
User-Agent: python-troveclient
|
||||
Host: ord.databases.api.rackspacecloud.com
|
||||
X-Auth-Token: 87c6033c-9ff6-405f-943e-2deb73f278b7
|
||||
Accept: application/json
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
GET /v1.0/1234/mgmt/instances/72eed896-134e-4212-9f25-f81b4e0795e2 HTTP/1.1
|
||||
User-Agent: python-reddwarfclient
|
||||
User-Agent: python-troveclient
|
||||
Host: ord.databases.api.rackspacecloud.com
|
||||
X-Auth-Token: 87c6033c-9ff6-405f-943e-2deb73f278b7
|
||||
Accept: application/xml
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
GET /v1.0/1234/mgmt/instances/6e038c18-902f-4a41-b2a2-5f46fa62fc1b/root HTTP/1.1
|
||||
User-Agent: python-reddwarfclient
|
||||
User-Agent: python-troveclient
|
||||
Host: ord.databases.api.rackspacecloud.com
|
||||
X-Auth-Token: 87c6033c-9ff6-405f-943e-2deb73f278b7
|
||||
Accept: application/json
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
GET /v1.0/1234/mgmt/instances/72eed896-134e-4212-9f25-f81b4e0795e2/root HTTP/1.1
|
||||
User-Agent: python-reddwarfclient
|
||||
User-Agent: python-troveclient
|
||||
Host: ord.databases.api.rackspacecloud.com
|
||||
X-Auth-Token: 87c6033c-9ff6-405f-943e-2deb73f278b7
|
||||
Accept: application/xml
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
GET /v1.0/1234/mgmt/storage HTTP/1.1
|
||||
User-Agent: python-reddwarfclient
|
||||
User-Agent: python-troveclient
|
||||
Host: ord.databases.api.rackspacecloud.com
|
||||
X-Auth-Token: 87c6033c-9ff6-405f-943e-2deb73f278b7
|
||||
Accept: application/json
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
GET /v1.0/1234/mgmt/storage HTTP/1.1
|
||||
User-Agent: python-reddwarfclient
|
||||
User-Agent: python-troveclient
|
||||
Host: ord.databases.api.rackspacecloud.com
|
||||
X-Auth-Token: 87c6033c-9ff6-405f-943e-2deb73f278b7
|
||||
Accept: application/xml
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
GET /v1.0/1234/mgmt/instances/6e038c18-902f-4a41-b2a2-5f46fa62fc1b/diagnostics HTTP/1.1
|
||||
User-Agent: python-reddwarfclient
|
||||
User-Agent: python-troveclient
|
||||
Host: ord.databases.api.rackspacecloud.com
|
||||
X-Auth-Token: 87c6033c-9ff6-405f-943e-2deb73f278b7
|
||||
Accept: application/json
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
GET /v1.0/1234/mgmt/instances/72eed896-134e-4212-9f25-f81b4e0795e2/diagnostics HTTP/1.1
|
||||
User-Agent: python-reddwarfclient
|
||||
User-Agent: python-troveclient
|
||||
Host: ord.databases.api.rackspacecloud.com
|
||||
X-Auth-Token: 87c6033c-9ff6-405f-943e-2deb73f278b7
|
||||
Accept: application/xml
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
GET /v1.0/1234/mgmt/instances/6e038c18-902f-4a41-b2a2-5f46fa62fc1b/hwinfo HTTP/1.1
|
||||
User-Agent: python-reddwarfclient
|
||||
User-Agent: python-troveclient
|
||||
Host: ord.databases.api.rackspacecloud.com
|
||||
X-Auth-Token: 87c6033c-9ff6-405f-943e-2deb73f278b7
|
||||
Accept: application/json
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
GET /v1.0/1234/mgmt/instances/72eed896-134e-4212-9f25-f81b4e0795e2/hwinfo HTTP/1.1
|
||||
User-Agent: python-reddwarfclient
|
||||
User-Agent: python-troveclient
|
||||
Host: ord.databases.api.rackspacecloud.com
|
||||
X-Auth-Token: 87c6033c-9ff6-405f-943e-2deb73f278b7
|
||||
Accept: application/xml
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
GET /v1.0/1234/mgmt/instances?deleted=false HTTP/1.1
|
||||
User-Agent: python-reddwarfclient
|
||||
User-Agent: python-troveclient
|
||||
Host: ord.databases.api.rackspacecloud.com
|
||||
X-Auth-Token: 87c6033c-9ff6-405f-943e-2deb73f278b7
|
||||
Accept: application/json
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
GET /v1.0/1234/mgmt/instances?deleted=false HTTP/1.1
|
||||
User-Agent: python-reddwarfclient
|
||||
User-Agent: python-troveclient
|
||||
Host: ord.databases.api.rackspacecloud.com
|
||||
X-Auth-Token: 87c6033c-9ff6-405f-943e-2deb73f278b7
|
||||
Accept: application/xml
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
GET /v1.0/1234/mgmt/accounts HTTP/1.1
|
||||
User-Agent: python-reddwarfclient
|
||||
User-Agent: python-troveclient
|
||||
Host: ord.databases.api.rackspacecloud.com
|
||||
X-Auth-Token: 87c6033c-9ff6-405f-943e-2deb73f278b7
|
||||
Accept: application/json
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
GET /v1.0/1234/mgmt/accounts HTTP/1.1
|
||||
User-Agent: python-reddwarfclient
|
||||
User-Agent: python-troveclient
|
||||
Host: ord.databases.api.rackspacecloud.com
|
||||
X-Auth-Token: 87c6033c-9ff6-405f-943e-2deb73f278b7
|
||||
Accept: application/xml
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
GET /v1.0/1234/mgmt/hosts HTTP/1.1
|
||||
User-Agent: python-reddwarfclient
|
||||
User-Agent: python-troveclient
|
||||
Host: ord.databases.api.rackspacecloud.com
|
||||
X-Auth-Token: 87c6033c-9ff6-405f-943e-2deb73f278b7
|
||||
Accept: application/json
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
GET /v1.0/1234/mgmt/hosts HTTP/1.1
|
||||
User-Agent: python-reddwarfclient
|
||||
User-Agent: python-troveclient
|
||||
Host: ord.databases.api.rackspacecloud.com
|
||||
X-Auth-Token: 87c6033c-9ff6-405f-943e-2deb73f278b7
|
||||
Accept: application/xml
|
||||
|
|
|
|||
|
|
@ -12,4 +12,4 @@ X-Auth-Token: eaaafd18-0fed-4b3a-81b4-663c99ec1cbb
|
|||
"size": "2"
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -21,4 +21,4 @@ Date: Thu, 17 Nov 2011 02:37:37 GMT
|
|||
rel="bookmark"/>
|
||||
</links>
|
||||
</flavor>
|
||||
</instance>
|
||||
</instance>
|
||||
|
|
|
|||
|
|
@ -9,4 +9,4 @@ Date: Wed, 25 Jan 2012 21:53:04 GMT
|
|||
<link href="https://ord.databases.api.rackspacecloud.com/v1.0/" rel="self"/>
|
||||
</links>
|
||||
</version>
|
||||
</versions>
|
||||
</versions>
|
||||
|
|
|
|||
|
|
@ -1,15 +1,15 @@
|
|||
description "Reddwarf Guest"
|
||||
description "Trove Guest"
|
||||
author "Auto-Gen"
|
||||
|
||||
start on (filesystem and net-device-up IFACE!=lo)
|
||||
stop on runlevel [016]
|
||||
chdir /var/run
|
||||
pre-start script
|
||||
mkdir -p /var/run/reddwarf
|
||||
chown GUEST_USERNAME:root /var/run/reddwarf/
|
||||
mkdir -p /var/run/trove
|
||||
chown GUEST_USERNAME:root /var/run/trove/
|
||||
|
||||
mkdir -p /var/lock/reddwarf
|
||||
chown GUEST_USERNAME:root /var/lock/reddwarf/
|
||||
mkdir -p /var/lock/trove
|
||||
chown GUEST_USERNAME:root /var/lock/trove/
|
||||
end script
|
||||
|
||||
exec su -c "/home/GUEST_USERNAME/trove/bin/trove-guestagent --config-file=/etc/guest_info --config-file=/home/GUEST_USERNAME/trove/etc/trove/trove-guestagent.conf.sample" GUEST_USERNAME
|
||||
|
|
|
|||
|
|
@ -252,11 +252,6 @@ function install_diskimagebuilder() {
|
|||
COMMIT_DISKIMAGEBUILDER=${COMMIT_DISKIMAGEBUILDER:-HEAD}
|
||||
cd $PATH_DISKIMAGEBUILDER
|
||||
git reset $COMMIT_DISKIMAGEBUILDER --hard
|
||||
# link files so that trove and disk image builder can be updated independently
|
||||
echo "Linking Trove Elements to Disk Image Builder"
|
||||
ln -s $REDSTACK_SCRIPTS/files/elements/trove-guest $PATH_DISKIMAGEBUILDER/elements/trove-guest
|
||||
ln -s $REDSTACK_SCRIPTS/files/elements/trove-mysql $PATH_DISKIMAGEBUILDER/elements/trove-mysql
|
||||
ln -s $REDSTACK_SCRIPTS/files/elements/trove-percona $PATH_DISKIMAGEBUILDER/elements/trove-percona
|
||||
fi
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@ def read(fname):
|
|||
|
||||
|
||||
setup(
|
||||
name="Reddwarf Example Generator",
|
||||
name="Trove Example Generator",
|
||||
version="0.0.9.9",
|
||||
author='OpenStack',
|
||||
description="Generates documentation examples.",
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
# Examples:
|
||||
# Run tests against Reddwarf running locally in fake mode:
|
||||
# Run tests against Trove running locally in fake mode:
|
||||
# tox -e local -- --group=blackbox
|
||||
[tox]
|
||||
envlist = py27
|
||||
|
|
@ -9,7 +9,7 @@ deps =
|
|||
lxml==2.3
|
||||
nose
|
||||
proboscis
|
||||
{env:REDDWARF_CLIENT_PATH}
|
||||
{env:TROVE_CLIENT_PATH}
|
||||
|
||||
[testenv:py27]
|
||||
commands =
|
||||
|
|
|
|||
|
|
@ -1,19 +1,19 @@
|
|||
#!/usr/bin/env bash
|
||||
# Specify the path to the RDL repo as argument one.
|
||||
# Specify the path to the Trove repo as argument one.
|
||||
# This script will create a .pid file and report in the current directory.
|
||||
|
||||
set -e
|
||||
if [ $# -lt 1 ]; then
|
||||
echo "Please give the path to the RDL repo as argument one."
|
||||
echo "Please give the path to the Trove repo as argument one."
|
||||
exit 5
|
||||
else
|
||||
RDL_PATH=$1
|
||||
TROVE_PATH=$1
|
||||
fi
|
||||
if [ $# -lt 2 ]; then
|
||||
echo "Please give the path to the RD Client as argument two."
|
||||
echo "Please give the path to the Trove Client as argument two."
|
||||
exit 5
|
||||
else
|
||||
RDC_PATH=$2
|
||||
TROVECLIENT_PATH=$2
|
||||
fi
|
||||
shift;
|
||||
shift;
|
||||
|
|
@ -22,7 +22,7 @@ shift;
|
|||
PID_FILE="`pwd`.pid"
|
||||
|
||||
function start_server() {
|
||||
pushd $RDL_PATH
|
||||
pushd $TROVE_PATH
|
||||
bin/start_server.sh --pid_file=$PID_FILE
|
||||
popd
|
||||
}
|
||||
|
|
@ -30,7 +30,7 @@ function start_server() {
|
|||
function stop_server() {
|
||||
if [ -f $PID_FILE ];
|
||||
then
|
||||
pushd $RDL_PATH
|
||||
pushd $TROVE_PATH
|
||||
bin/stop_server.sh $PID_FILE
|
||||
popd
|
||||
else
|
||||
|
|
@ -44,10 +44,10 @@ function on_error() {
|
|||
|
||||
trap on_error EXIT # Proceed to trap - END in event of failure.
|
||||
|
||||
REDDWARF_CLIENT_PATH=$RDC_PATH tox -e py26
|
||||
TROVE_CLIENT_PATH=$TROVECLIENT_PATH tox -e py26
|
||||
start_server
|
||||
.tox/py26/bin/pip install -U $RDC_PATH
|
||||
PYTHONPATH=$PYTHONPATH:$RDC_PATH .tox/py26/bin/python int_tests.py \
|
||||
.tox/py26/bin/pip install -U $TROVECLIENT_PATH
|
||||
PYTHONPATH=$PYTHONPATH:$TROVECLIENT_PATH .tox/py26/bin/python int_tests.py \
|
||||
--conf=localhost.test.conf -- $@
|
||||
stop_server
|
||||
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@ def read(fname):
|
|||
|
||||
|
||||
setup(
|
||||
name="Reddwarf Integration Tests",
|
||||
name="Trove Integration Tests",
|
||||
version="0.0.9.9",
|
||||
author='OpenStack',
|
||||
description="Runs integration tests on Ridley.",
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
# Examples:
|
||||
# Run tests against Reddwarf running locally in fake mode:
|
||||
# REDDWARF_CLIENT_PATH=../some_path tox -e local -- --group=blackbox
|
||||
# Run tests against Trove running locally in fake mode:
|
||||
# TROVE_CLIENT_PATH=../some_path tox -e local -- --group=blackbox
|
||||
[tox]
|
||||
envlist = py26
|
||||
|
||||
|
|
@ -11,8 +11,8 @@ deps =
|
|||
pexpect
|
||||
proboscis
|
||||
sqlalchemy
|
||||
{env:REDDWARF_PATH}
|
||||
{env:REDDWARF_CLIENT_PATH}
|
||||
{env:TROVE_PATH}
|
||||
{env:TROVE_CLIENT_PATH}
|
||||
|
||||
[testenv:py26]
|
||||
|
||||
|
|
@ -22,7 +22,7 @@ deps =
|
|||
pexpect
|
||||
proboscis
|
||||
sqlalchemy
|
||||
{env:REDDWARF_PATH}
|
||||
{env:REDDWARF_CLIENT_PATH}
|
||||
{env:TROVE_PATH}
|
||||
{env:TROVE_CLIENT_PATH}
|
||||
commands =
|
||||
{envpython} int_tests.py --conf=localhost.test.conf {posargs:DEFAULTS}
|
||||
|
|
|
|||
Loading…
Reference in New Issue