diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-10-02 14:24:14 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-10-02 14:24:14 +0000 |
| commit | 71f3bebc5a92a529c9036296ba81f5dfb6bd3e88 (patch) | |
| tree | cd6d2165543cd9042049bea743c1bc98168e65b9 | |
| parent | 4359e747b4850de7637d9e183585814e53deefbc (diff) | |
| parent | 2350f25a316f18ceb7b63281fa1511622fcc5868 (diff) | |
| download | tuskar-ui-71f3bebc5a92a529c9036296ba81f5dfb6bd3e88.tar.gz | |
Merge "Set default Tuskar port to 8585"
| -rw-r--r-- | docs/install.rst | 2 | ||||
| -rw-r--r-- | local_settings.py.example | 2 | ||||
| -rw-r--r-- | tuskar_ui/test/settings.py | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/docs/install.rst b/docs/install.rst index cd08f7d9..9e174a9d 100644 --- a/docs/install.rst +++ b/docs/install.rst @@ -98,7 +98,7 @@ editor. You will want to customize several settings: environment. (They should be correct unless you modified your OpenStack server to change them.) - ``TUSKAR_ENDPOINT_URL`` should point to the Tuskar server you - configured. It normally runs on port 6385. + configured. It normally runs on port 8585. - ``REMOTE_NOVA_BAREMETAL_CREDS`` is optional. It's a dictionary of settings for connecting to a remote Nova Baremetal. If not set, this information is gathered from Keystone's service catalog, but a common configuration with diff --git a/local_settings.py.example b/local_settings.py.example index acc09d58..ac2ec28b 100644 --- a/local_settings.py.example +++ b/local_settings.py.example @@ -379,7 +379,7 @@ SECURITY_GROUP_RULES = { }, } -TUSKAR_ENDPOINT_URL = "http://127.0.0.1:6385" +TUSKAR_ENDPOINT_URL = "http://127.0.0.1:8585" # The REMOTE_NOVA_BAREMETAL_CREDS settings can be used to connect to a remote # Nova Baremetal instance instead of the one defined in the Keystone service diff --git a/tuskar_ui/test/settings.py b/tuskar_ui/test/settings.py index 8b22b8ce..2d44d43f 100644 --- a/tuskar_ui/test/settings.py +++ b/tuskar_ui/test/settings.py @@ -135,7 +135,7 @@ NOSE_ARGS = ['--nocapture', '--cover-inclusive', '--all-modules'] -TUSKAR_ENDPOINT_URL = "http://127.0.0.1:6385" +TUSKAR_ENDPOINT_URL = "http://127.0.0.1:8585" OVERCLOUD_CREDS = { 'enabled': True, |