openstack/astara
Code Issues Proposed changes

Merge "Update sample config for liberty, update devstack for router config"

Browse Source
This commit is contained in:
Jenkins 2015-10-22 20:05:57 +00:00 committed by Gerrit Code Review
commit 8508bd19b5
2 changed files with 46 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
devstack/plugin.sh
View File

@ -68,7 +68,6 @@ function configure_akanda() {
configure_auth_token_middleware $AKANDA_RUG_CONF $Q_ADMIN_USERNAME $AKANDA_CACHE_DIR
iniset $AKANDA_RUG_CONF DEFAULT amqp_url "amqp://$RABBIT_USERID:$RABBIT_PASSWORD@$RABBIT_HOST:$RABBIT_PORT/"
iniset $AKANDA_RUG_CONF DEFAULT control_exchange "neutron"
iniset $AKANDA_RUG_CONF DEFAULT router_instance_flavor $ROUTER_INSTANCE_FLAVOR
iniset $AKANDA_RUG_CONF DEFAULT boot_timeout "6000"
iniset $AKANDA_RUG_CONF DEFAULT num_worker_processes "2"
iniset $AKANDA_RUG_CONF DEFAULT num_worker_threads "2"
@ -164,7 +163,7 @@ function create_akanda_nova_flavor() {
nova flavor-create akanda $ROUTER_INSTANCE_FLAVOR_ID \
$ROUTER_INSTANCE_FLAVOR_RAM $ROUTER_INSTANCE_FLAVOR_DISK \
$ROUTER_INSTANCE_FLAVOR_CPUS
iniset $AKANDA_RUG_CONF DEFAULT router_instance_flavor $ROUTER_INSTANCE_FLAVOR_ID
iniset $AKANDA_RUG_CONF router instance_flavor $ROUTER_INSTANCE_FLAVOR_ID
}
function _remove_subnets() {
@ -255,7 +254,7 @@ function pre_start_akanda() {
typeset image_id=$(glance $auth_args image-list | grep $image_name | get_field 1)
die_if_not_set $LINENO image_id "Failed to find akanda image"
iniset $AKANDA_RUG_CONF DEFAULT router_image_uuid $image_id
iniset $AKANDA_RUG_CONF router image_uuid $image_id
# NOTE(adam_g): Currently we only support keystone v2 auth so we need to
# hardcode the auth url accordingly. See (LP: #1492654)

48
etc/rug.ini
View File

@ -3,9 +3,23 @@ debug=True
versbose=True
auth_region=RegionOne
# Nova instance provider
# Currently available:
# - on_demand: Requests new nova instances as they are required
# - pez: Pre-provisions pools of instances to be used for appliances.
# Requires running the astara-pez-service.
# Note: This feature is marked experimental for Liberty.
instance_provider=on_demand
management_network_id=dca21cbf-fc11-4d0f-86a8-b856e95b0d1b
management_subnet_id=92607c63-0738-4e19-a1c8-f770a1dd48fd
management_prefix=fdca:3ba5:a17a:acda::/64
# Configure which neutron resource(s) this Rug should be managing.
# Currently available: router, loadbalancer
enabled_drivers=router
# *Deprecated* Use mgt_service_port in individual driver config sections
# instead.
akanda_mgt_service_port=5000
external_network_id=fbf6b360-be38-48cd-bce3-6a9b710b3cc9
@ -14,15 +28,27 @@ external_prefix=172.16.77.0/24
plug_external_port=True
# Public SSH key to insert into the 'akanda' user of appliance
# VMs.
ssh_public_key=/etc/akanda/akanda.pub
# *Deprecated* Use image_uuid/instance_flavor in the [router] section.
router_image_uuid=1e9c16f3-e070-47b7-b49c-ffcf38df5f9a
router_instance_flavor=1
# *Deprecated* Use ssh_public_key.
router_ssh_public_key=/etc/akanda/akanda.pub
# to plug in rug interface
interface_driver=akanda.rug.common.linux.interface.OVSInterfaceDriver
ovs_integration_bridge=br-int
amqp_url=amqp://rabbituser:yetanothersecret@192.168.57.200
# URL for connecting to oslo.messaging backend
amqp_url = amqp://rabbit:akanda@127.0.0.1:/
# *Deprecated* use amqp_url instead.
rabbit_password = yetanothersecret
rabbit_host = 192.168.57.200
provider_rules_path=/opt/stack/akanda-rug/etc/provider_rules.json
control_exchange = quantum
@ -32,10 +58,11 @@ neutron_port_security_extension_enabled = True
root_helper=sudo
# If running multiple akanda-rug instances, configure use of an external
# cluster coordinator here. For more information on supported coordination
# backends, see http://docs.openstack.org/developer/tooz/
# cluster coordinator here. For more information on supported coordination
# backends, see http://docs.openstack.org/developer/tooz/.
# NOTE: This feature is currently marked experimental for Liberty.
[coordination]
enabled = True
enabled = False
url = memcached://localhost:11211
group_id = akanda.rug
heartbeat_interval = 1
@ -52,3 +79,16 @@ password = akanda
username = neutron
auth_url = http://127.0.0.1:35357
auth_plugin = password
# Driver configuration
[router]
image_uuid = aa7bcd8e-7364-11e5-a721-a35eacf37e3b
instance_flavor = 1
mgt_service_port = 5000
# Pez instance pooling configuration, used when running the astara-pez-service
# process to manage pools of hot-standby # appliance VMs /w the pez instance
# provider (experimental)
[pez]
# The number of hot-standby nodes per pool (1 pool per enabled driver)
pool_size=1