openstack
/
magnum
Code Issues Proposed changes

Enable barbican in devstack 

Magnum will use barbican to store CA and magnum client certs for
TLS support. This patch adds barbican service to devstack
configuration.

Change-Id: Id112699be08788466e7cd9806082e150cbdc15e2
Partial-Implements: blueprint magnum-as-a-ca
This commit is contained in:
OTSUKA, Yuanying 2015-08-21 16:54:31 +09:00
parent 327d2eb852
commit 31974f2023
4 changed files with 36 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
devstack/lib/magnum
View File

@ -140,7 +140,8 @@ function create_magnum_conf {
configure_auth_token_middleware $MAGNUM_CONF magnum $MAGNUM_AUTH_CACHE_DIR
iniset $MAGNUM_CONF keystone_authtoken auth_uri $KEYSTONE_SERVICE_URI/v2.0
iniset $MAGNUM_CONF keystone_authtoken auth_uri $KEYSTONE_SERVICE_URI/v3
iniset $MAGNUM_CONF keystone_authtoken auth_version v3
if is_fedora || is_suse; then
# magnum defaults to /usr/local/bin, but fedora and suse pip like to

3
devstack/settings
View File

@ -40,6 +40,9 @@ enable_service ceilometer-api
enable_service ceilometer-alarm-notifier
enable_service ceilometer-alarm-evaluator
# Enable barbican services
enable_service barbican
# Enable Magnum services
enable_service m-api
enable_service m-cond

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

@ -8,17 +8,20 @@ If you are getting started with magnum it is recommended you follow the
:ref:`dev-quickstart` to get up and running with magnum. This guide covers
a more in-depth process to setup magnum with devstack.
Magnum depends on nova, glance, heat, and neutron to create and schedule
virtual machines to simulate bare-metal. Full bare-metal support
Magnum depends on nova, glance, heat, barbican, and neutron to create and
schedule virtual machines to simulate bare-metal. Full bare-metal support
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::
Clone devstack and barbican::
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::
@ -56,6 +59,9 @@ and neutron::
enable_service h-api-cfn
enable_service h-api-cw
# Enable barbican services
enable_service barbican
FIXED_RANGE=10.0.0.0/24
Q_USE_SECGROUP=True

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

@ -0,0 +1,22 @@
#!/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