openstack
/
magnum
Code Issues Proposed changes

Enable Barbican in devstack 

This patch changes to use barbican plugin for devstack.

Change-Id: I7d2620888bef3ae6bcc34c333ef3a935245195cf
Partial-Implements: blueprint barbican-support
This commit is contained in:
OTSUKA, Yuanying 2015-09-09 18:56:40 +09:00
parent 8bb2f5f2c9
commit c5abff2511
3 changed files with 3 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
devstack/settings
View File

@ -41,7 +41,7 @@ enable_service ceilometer-alarm-notifier
enable_service ceilometer-alarm-evaluator
# Enable barbican services
enable_service barbican
enable_plugin barbican https://git.openstack.org/openstack/barbican
# Enable Magnum services
enable_service m-api

7
doc/source/dev/dev-manual-devstack.rst
View File

@ -15,13 +15,10 @@ is still under active development.
This session has only been tested on Ubuntu 14.04 (Trusty) and Fedora 20/21.
We recommend users to select one of them if it is possible.
Clone devstack and barbican::
Clone devstack::
cd ~
git clone https://git.openstack.org/openstack-dev/devstack
git clone https://git.openstack.org/openstack/barbican
cp barbican/contrib/devstack/lib/* devstack/lib/
cp barbican/contrib/devstack/extras.d/* devstack/extras.d/
Configure devstack with the minimal settings required to enable heat
and neutron::
@ -60,7 +57,7 @@ and neutron::
enable_service h-api-cw
# Enable barbican services
enable_service barbican
enable_plugin barbican https://git.openstack.org/openstack/barbican
FIXED_RANGE=10.0.0.0/24

22
magnum/tests/contrib/pre_test_hook.sh
View File

@ -1,22 +0,0 @@
#!/bin/bash
#
# Licensed under the Apache License, Version 2.0 (the "License"); you may
# not use this file except in compliance with the License. You may obtain
# a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
# License for the specific language governing permissions and limitations
# under the License.
# This script is executed inside pre_test_hook function in devstack gate.
# Install barbican devstack integration
BARBICAN_BASE=/opt/stack/new/barbican/contrib/devstack
DEVSTACK_BASE=/opt/stack/new/devstack
cp $BARBICAN_BASE/lib/* $DEVSTACK_BASE/lib
cp $BARBICAN_BASE/extras.d/* $DEVSTACK_BASE/extras.d