openstack
/
barbican
Code Issues Proposed changes

Remove deprecated references to admin endpoint. 

Removes references to former Admin API port 9312

Removes references to adminurl for admin API endpoint

Removes references to barbican-admin.ini and barbican-admin-paste.ini and files

Change-Id: I7265952d2caf69c1ac322055127f3f84c80641c8
Closes-Bug: #1450277
This commit is contained in:
Amy Marrich 2015-05-04 14:47:55 -05:00
parent ce776c522a
commit 39ea8464ba
7 changed files with 2 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
bin/keystone_data.sh
View File

@ -71,7 +71,6 @@ if [[ "$ENABLED_SERVICES" =~ "barbican" ]]; then
--region RegionOne \
--service_id $BARBICAN_SERVICE \
--publicurl "http://$SERVICE_HOST:9311" \
--adminurl "http://$SERVICE_HOST:9312" \
--internalurl "http://$SERVICE_HOST:9311"
fi
fi

2
contrib/devstack/lib/barbican
View File

@ -91,7 +91,6 @@ function configure_barbican {
# Copy the barbican config files to the config dir
cp $BARBICAN_DIR/etc/barbican/barbican-api.conf $BARBICAN_CONF_DIR
cp $BARBICAN_DIR/etc/barbican/barbican-api-paste.ini $BARBICAN_CONF_DIR
cp $BARBICAN_DIR/etc/barbican/barbican-admin-paste.ini $BARBICAN_CONF_DIR
cp -R $BARBICAN_DIR/etc/barbican/vassals $BARBICAN_CONF_DIR
# Copy functional test config
@ -213,7 +212,6 @@ function create_barbican_accounts {
--region RegionOne \
--service_id $BARBICAN_SERVICE \
--publicurl "http://$SERVICE_HOST:9311" \
--adminurl "http://$SERVICE_HOST:9312" \
--internalurl "http://$SERVICE_HOST:9311"
fi

3
doc/source/setup/troubleshooting.rst
View File

@ -137,7 +137,6 @@ What you might see
spawned uWSGI master process (pid: 59190)
spawned uWSGI worker 1 (pid: 59191, cores: 1)
spawned uWSGI worker 1 (pid: 59192, cores: 1)
Loading paste environment: config:/etc/barbican/barbican-admin-paste.ini
Loading paste environment: config:/etc/barbican/barbican-api-paste.ini
WSGI app 0 (mountpoint='') ready in 0 seconds on interpreter \
0x7fd098c08520 pid: 59191 (default app)
@ -327,7 +326,6 @@ What you might see
*** has_emperor mode detected (fd: 6) ***
...
[uWSGI] getting INI configuration from barbican-admin.ini
!!! UNABLE to load uWSGI plugin: dlopen(./python_plugin.so, 10): image not \
found !!!
...
@ -337,7 +335,6 @@ What you might see
2015, in load
entry = __import__(self.module_name, globals(),globals(), ['__name__'])
ImportError: No module named barbican.api.app
[emperor] removed uwsgi instance barbican-admin.ini
...
*** Starting uWSGI 1.9.13 (64bit) on [Fri Jul 5 09:59:29 2013] ***

1
docs/src/docbkx/samples/resgenerateToken.json
View File

@ -12,7 +12,6 @@
},
"serviceCatalog": [{
"endpoints": [{
"adminURL": "http://localhost:9312",
"region": "RegionOne",
"internalURL": "http://localhost:9313",
"publicURL": "http://localhost:9311"

8
etc/barbican/barbican-admin-paste.ini
View File

@ -1,8 +0,0 @@
[pipeline:main]
pipeline = unauthenticated-context admin
[app:admin]
paste.app_factory = barbican.api.app:create_admin_app
[filter:unauthenticated-context]
paste.filter_factory = barbican.api.middleware.context:UnauthenticatedContextMiddleware.factory

11
etc/barbican/vassals/barbican-admin.ini
View File

@ -1,11 +0,0 @@
[uwsgi]
socket = :9312
protocol = http
processes = 1
lazy = true
vacuum = true
no-default-app = true
memory-report = true
plugins = python
paste = config:/etc/barbican/barbican-admin-paste.ini
add-header = Connection: close

11
functionaltests/run_tests.sh
View File

@ -16,18 +16,11 @@
API_RESPONDING_TIMEOUT=20
if ! timeout ${API_RESPONDING_TIMEOUT} sh -c "while ! curl -s http://127.0.0.1:9311/ 2>/dev/null | grep -q 'v1' ; do sleep 1; done"; then
echo "The Barbican (non-admin) API failed to respond within ${API_RESPONDING_TIMEOUT} seconds"
echo "The Barbican API failed to respond within ${API_RESPONDING_TIMEOUT} seconds"
exit 1
fi
echo "Successfully contacted the Barbican (non-admin) API"
if ! timeout ${API_RESPONDING_TIMEOUT} sh -c "while ! curl -s http://127.0.0.1:9312/ -HX-Project-Id:123 2>/dev/null | grep -q 'v1' ; do sleep 1; done"; then
echo "The Barbican (admin) API failed to respond within ${API_RESPONDING_TIMEOUT} seconds"
exit 1
fi
echo "Successfully contacted the Barbican (admin) API"
echo "Successfully contacted the Barbican API"
# Where tempest code lives
TEMPEST_DIR=${TEMPEST_DIR:-/opt/stack/new/tempest}