Skip to content

Commit 66afb47

Browse files
author
Akihiro MOTOKI
committed
Refactor quantum installation
* Move quantum installation to lib/quantum * Refactor quantum configuration * Move Quantum service account creation from keystone_data.sh to lib/quantum * Define generic functions to install third party programs * Minor cleanups related to Quantum * Kill dnsmasq which watches an interface 'ns-XXXXXX' in unstack.sh * Set default_floating_pool in nova.conf to make default flaoting pool work when PUBLIC_NETWORK_NAME is other than 'nova' * Make tempest work even when PRIVATE_NETWORK_NAME is other than 'private' Change-Id: I4a6e7fcebfb11556968f53ab6a0e862ce16bb139
1 parent 7ae9425 commit 66afb47

8 files changed

Lines changed: 803 additions & 571 deletions

File tree

‎AUTHORS‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
Aaron Lee <[email protected]>
22
Aaron Rosen <[email protected]>
33
Adam Gandelman <[email protected]>
4+
Akihiro MOTOKI <[email protected]>
45
Andrew Laski <[email protected]>
56
Andy Smith <[email protected]>
67
Anthony Young <[email protected]>

‎files/keystone_data.sh‎

Lines changed: 0 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
# Tenant User Roles
66
# ------------------------------------------------------------------
77
# service glance admin
8-
# service quantum admin # if enabled
98
# service swift admin # if enabled
109
# service heat admin # if enabled
1110
# service ceilometer admin # if enabled
@@ -148,30 +147,6 @@ if [[ "$ENABLED_SERVICES" =~ "swift" ]]; then
148147
fi
149148
fi
150149

151-
if [[ "$ENABLED_SERVICES" =~ "q-svc" ]]; then
152-
QUANTUM_USER=$(get_id keystone user-create \
153-
--name=quantum \
154-
--pass="$SERVICE_PASSWORD" \
155-
--tenant_id $SERVICE_TENANT \
156-
[email protected])
157-
keystone user-role-add \
158-
--tenant_id $SERVICE_TENANT \
159-
--user_id $QUANTUM_USER \
160-
--role_id $ADMIN_ROLE
161-
if [[ "$KEYSTONE_CATALOG_BACKEND" = 'sql' ]]; then
162-
QUANTUM_SERVICE=$(get_id keystone service-create \
163-
--name=quantum \
164-
--type=network \
165-
--description="Quantum Service")
166-
keystone endpoint-create \
167-
--region RegionOne \
168-
--service_id $QUANTUM_SERVICE \
169-
--publicurl "http://$SERVICE_HOST:9696/" \
170-
--adminurl "http://$SERVICE_HOST:9696/" \
171-
--internalurl "http://$SERVICE_HOST:9696/"
172-
fi
173-
fi
174-
175150
if [[ "$ENABLED_SERVICES" =~ "ceilometer" ]]; then
176151
CEILOMETER_USER=$(get_id keystone user-create --name=ceilometer \
177152
--pass="$SERVICE_PASSWORD" \

‎lib/nova‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -348,6 +348,7 @@ function create_nova_conf() {
348348
add_nova_opt "dhcpbridge_flagfile=$NOVA_CONF"
349349
add_nova_opt "force_dhcp_release=True"
350350
add_nova_opt "fixed_range=$FIXED_RANGE"
351+
add_nova_opt "default_floating_pool=$PUBLIC_NETWORK_NAME"
351352
add_nova_opt "s3_host=$SERVICE_HOST"
352353
add_nova_opt "s3_port=$S3_SERVICE_PORT"
353354
add_nova_opt "osapi_compute_extension=nova.api.openstack.compute.contrib.standard_extensions"
@@ -413,6 +414,16 @@ function create_nova_conf() {
413414
done
414415
}
415416

417+
function create_nova_conf_nova_network() {
418+
add_nova_opt "network_manager=nova.network.manager.$NET_MAN"
419+
add_nova_opt "public_interface=$PUBLIC_INTERFACE"
420+
add_nova_opt "vlan_interface=$VLAN_INTERFACE"
421+
add_nova_opt "flat_network_bridge=$FLAT_NETWORK_BRIDGE"
422+
if [ -n "$FLAT_INTERFACE" ]; then
423+
add_nova_opt "flat_interface=$FLAT_INTERFACE"
424+
fi
425+
}
426+
416427
# init_nova() - Initialize databases, etc.
417428
function init_nova() {
418429
# Nova Database

0 commit comments

Comments
 (0)