openstack
/
tripleo-image-elements
Code Issues Proposed changes

Quantum -> Neutron rename 

Rename all paths to neutron, and almost all file entries,
except some of those in the nova.conf template(these have not been
ported to neutron yet).

This does not "Fix" bug 1199443 more accurately it avoids it. But
a rename would eventually be needed in tripleo anyway so doing
this now means we don't need to find/wait for a fix.

Fixes bug 1199443

Change-Id: I5e61fab1d444d90eb2c54ccfeefca5e148d96996
This commit is contained in:
Derek Higgins 2013-07-10 09:31:40 +01:00
parent d06f8fd54f
commit 3eeb771535
52 changed files with 169 additions and 169 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
docs/ci.md
View File

@ -27,7 +27,7 @@ Jenkins
* bootstrap VM via image-build chain (archive bm-cloud.qcow2). * bootstrap VM via image-build chain (archive bm-cloud.qcow2).
disk-image-create vm base glance nova-bm swift mysql haproxy-api \ disk-image-create vm base glance nova-bm swift mysql haproxy-api \
haproxy-mysql cinder quantum rabbitmq -o bootstrap-prod haproxy-mysql cinder neutron rabbitmq -o bootstrap-prod
* baremetal SPOF node build (archive the resulting image). * baremetal SPOF node build (archive the resulting image).
@ -36,7 +36,7 @@ Jenkins
* baremetal demo node build (archive the resulting image). * baremetal demo node build (archive the resulting image).
disk-image-create base vm glance nova-bm swift cinder quantum \ disk-image-create base vm glance nova-bm swift cinder neutron \
-o bootstrap-prod -o bootstrap-prod
* ramdisk deploy image build * ramdisk deploy image build

2
elements/boot-stack/README.md
View File

@ -48,7 +48,7 @@ Utilities
The following utilities are available in the running boot-stack machine: The following utilities are available in the running boot-stack machine:
`wipe-openstack` - Clear all openstack databases, and return `wipe-openstack` - Clear all openstack databases, and return
nova/keystone/quantum/etc. to their default states. nova/keystone/neutron/etc. to their default states.
`boot-stack-logs` - Start a screen session which tails important logs. `boot-stack-logs` - Start a screen session which tails important logs.

24
elements/boot-stack/bin/init-keystone
View File

@ -28,8 +28,8 @@
# * ADMIN_PASSWORD is used to set the password for the admin and demo accounts. # * ADMIN_PASSWORD is used to set the password for the admin and demo accounts.
# * SERVICE_PASSWORD is used to set the password for the service accounts. # * SERVICE_PASSWORD is used to set the password for the service accounts.
# #
# Enable the Swift and Quantum accounts by setting ENABLE_SWIFT and/or # Enable the Swift and Neutron accounts by setting ENABLE_SWIFT and/or
# ENABLE_QUANTUM environment variables. # ENABLE_NEUTRON environment variables.
# #
# Enable creation of endpoints by setting ENABLE_ENDPOINTS environment variable. # Enable creation of endpoints by setting ENABLE_ENDPOINTS environment variable.
# Works with Catalog SQL backend. Do not use with Catalog Templated backend # Works with Catalog SQL backend. Do not use with Catalog Templated backend
@ -43,7 +43,7 @@
# admin admin admin # admin admin admin
# service glance admin # service glance admin
# service nova admin # service nova admin
# service quantum admin # if enabled # service neutron admin # if enabled
# service swift admin # if enabled # service swift admin # if enabled
# demo admin admin # demo admin admin
# demo demo Member,sysadmin,netadmin # demo demo Member,sysadmin,netadmin
@ -69,7 +69,7 @@ CONTROLLER_INTERNAL_ADDRESS=$BOOTSTRAP_IP
source /root/stackrc source /root/stackrc
ENABLE_ENDPOINTS=yes ENABLE_ENDPOINTS=yes
ENABLE_QUANTUM=yes ENABLE_NEUTRON=yes
ENABLE_SWIFT=yes ENABLE_SWIFT=yes
ENABLE_HEAT=yes ENABLE_HEAT=yes
@ -242,20 +242,20 @@ if [[ -n "$ENABLE_SWIFT" ]]; then
fi fi
fi fi
if [[ -n "$ENABLE_QUANTUM" ]]; then if [[ -n "$ENABLE_NEUTRON" ]]; then
QUANTUM_SERVICE=$(get_id \ NEUTRON_SERVICE=$(get_id \
keystone service-create --name=quantum \ keystone service-create --name=neutron \
--type=network \ --type=network \
--description="Quantum Service") --description="Neutron Service")
QUANTUM_USER=$(get_id keystone user-create --name=quantum \ NEUTRON_USER=$(get_id keystone user-create --name=neutron \
--pass="$SERVICE_PASSWORD" \ --pass="$SERVICE_PASSWORD" \
--tenant-id $SERVICE_TENANT \ --tenant-id $SERVICE_TENANT \
--email=quantum@example.com) --email=neutron@example.com)
keystone user-role-add --tenant-id $SERVICE_TENANT \ keystone user-role-add --tenant-id $SERVICE_TENANT \
--user-id $QUANTUM_USER \ --user-id $NEUTRON_USER \
--role-id $ADMIN_ROLE --role-id $ADMIN_ROLE
if [[ -n "$ENABLE_ENDPOINTS" ]]; then if [[ -n "$ENABLE_ENDPOINTS" ]]; then
keystone endpoint-create --region RegionOne --service-id $QUANTUM_SERVICE \ keystone endpoint-create --region RegionOne --service-id $NEUTRON_SERVICE \
--publicurl "http://$CONTROLLER_PUBLIC_ADDRESS:9696" \ --publicurl "http://$CONTROLLER_PUBLIC_ADDRESS:9696" \
--adminurl "http://$CONTROLLER_ADMIN_ADDRESS:9696" \ --adminurl "http://$CONTROLLER_ADMIN_ADDRESS:9696" \
--internalurl "http://$CONTROLLER_INTERNAL_ADDRESS:9696" --internalurl "http://$CONTROLLER_INTERNAL_ADDRESS:9696"

20
elements/boot-stack/bin/init-quantum → elements/boot-stack/bin/init-neutron
View File

@ -1,8 +1,8 @@
#!/bin/bash #!/bin/bash
# Initialise the quantum server configuration. # Initialise the neutron server configuration.
# #
# This creates initial networks for quantum based on heat metadata and local # This creates initial networks for neutron based on heat metadata and local
# network configuration. # network configuration.
# #
# It is not idempotent. # It is not idempotent.
@ -13,14 +13,14 @@ set -o pipefail
PATH=/usr/local/bin:$PATH PATH=/usr/local/bin:$PATH
source /root/stackrc source /root/stackrc
PHYSICAL_NETWORK=$(os-config-applier --type raw --key quantum.ovs.physical_network --key-default '') PHYSICAL_NETWORK=$(os-config-applier --type raw --key neutron.ovs.physical_network --key-default '')
ALLOCATION_START=$(os-config-applier --type netaddress --key quantum.ovs.fixed_range.start --key-default '') ALLOCATION_START=$(os-config-applier --type netaddress --key neutron.ovs.fixed_range.start --key-default '')
ALLOCATION_END=$(os-config-applier --type netaddress --key quantum.ovs.fixed_range.end --key-default '') ALLOCATION_END=$(os-config-applier --type netaddress --key neutron.ovs.fixed_range.end --key-default '')
NETWORK=$(os-config-applier --type netaddress --key quantum.ovs.ovs_range --key-default 'unset') NETWORK=$(os-config-applier --type netaddress --key neutron.ovs.ovs_range --key-default 'unset')
if [ "$NETWORK" == "unset" ] ; then if [ "$NETWORK" == "unset" ] ; then
# undercloud / seed cloud - lookup the network device # undercloud / seed cloud - lookup the network device
BRIDGE=$(os-config-applier --type raw --key quantum.ovs.physical_bridge) BRIDGE=$(os-config-applier --type raw --key neutron.ovs.physical_bridge)
# NB: assumes only one network on the device # NB: assumes only one network on the device
NETWORK=$(ip addr show dev $BRIDGE | grep ' inet ' | awk '{print $2}') NETWORK=$(ip addr show dev $BRIDGE | grep ' inet ' | awk '{print $2}')
# Route traffic to this machine # Route traffic to this machine
@ -33,7 +33,7 @@ if [ -n "$ALLOCATION_START" -a -n "$ALLOCATION_END" ] ; then
fi fi
# Hackish: ensure the server is running. XXX: Test without this. # Hackish: ensure the server is running. XXX: Test without this.
service quantum-server restart service neutron-server restart
TENANT_ID=$(keystone tenant-list | grep ' admin ' | awk '{print $2}') TENANT_ID=$(keystone tenant-list | grep ' admin ' | awk '{print $2}')
@ -46,8 +46,8 @@ if [ -n "$PHYSICAL_NETWORK" ] ; then
SUBNET_EXTRA="--tenant_id $TENANT_ID" SUBNET_EXTRA="--tenant_id $TENANT_ID"
fi fi
# quantum-server might not be fully started yet, so we're going to # neutron-server might not be fully started yet, so we're going to
# call `quantum net-create` in a loop until it returns true # call `neutron net-create` in a loop until it returns true
t=0 t=0
while ! NET_ID=$(neutron net-create $NET_NAME $NET_EXTRA | grep ' id ' | awk '{print $4}'); do while ! NET_ID=$(neutron net-create $NET_NAME $NET_EXTRA | grep ' id ' | awk '{print $4}'); do
if [ $t -eq 10 ]; then if [ $t -eq 10 ]; then

2
elements/boot-stack/bin/reset-db
View File

@ -28,5 +28,5 @@ $venvs/glance/bin/glance-manage db_sync
os-db-create heat heat $db_pass os-db-create heat heat $db_pass
$venvs/heat/bin/heat-manage db_sync $venvs/heat/bin/heat-manage db_sync
os-db-create ovs_quantum quantum $db_pass os-db-create ovs_neutron neutron $db_pass

2
elements/boot-stack/bin/wipe-openstack
View File

@ -17,5 +17,5 @@ init-nova
# Reentering into os-refresh-config is a little terrifying : later refactoring # Reentering into os-refresh-config is a little terrifying : later refactoring
# should remove this. # should remove this.
os-refresh-config os-refresh-config
init-quantum init-neutron

4
elements/boot-stack/element-deps
View File

@ -6,6 +6,6 @@ nova-api
nova-compute nova-compute
openstack-clients openstack-clients
os-refresh-config os-refresh-config
quantum-openvswitch-agent neutron-openvswitch-agent
quantum-server neutron-server
rabbitmq-server rabbitmq-server

8
elements/quantum-network-node/README.md → elements/neutron-network-node/README.md
View File

@ -1,12 +1,12 @@
Install components for Quantum network node. Install components for Neutron network node.
Configuration Configuration
------------- -------------
The configuration path quantum.ovs.public\_interface will be added The configuration path neutron.ovs.public\_interface will be added
to br-ex. to br-ex.
quantum: neutron:
ovs: ovs:
public_interface: eth1 public_interface: eth1
@ -14,7 +14,7 @@ In the example above, eth1 will be added as a port for br-ex.
An external network is configured with details gotten from heat. An external network is configured with details gotten from heat.
quantum: neutron:
floatingip_range: a.b.c.d/24 floatingip_range: a.b.c.d/24
floatingip_start: a.b.c.3 floatingip_start: a.b.c.3
floatingip_end: a.b.c.54 floatingip_end: a.b.c.54

2
elements/neutron-network-node/element-deps Normal file
View File

@ -0,0 +1,2 @@
neutron
neutron-openvswitch-agent

0
elements/quantum-network-node/install.d/80-arping → elements/neutron-network-node/install.d/80-arping
View File

9
elements/neutron-network-node/install.d/80-neutron-networking Executable file
View File

@ -0,0 +1,9 @@
#!/bin/bash
set -eux
os-svc-daemon -n neutron-l3-agent -u neutron -c neutron-l3-agent -- --config-file /etc/neutron/l3_agent.ini --config-dir /etc/neutron
os-svc-daemon -n neutron-dhcp-agent -u neutron -c neutron-dhcp-agent -- --config-file /etc/neutron/dhcp_agent.ini --config-dir /etc/neutron
os-svc-daemon -n neutron-metadata-agent -u neutron -c neutron-metadata-agent -- --config-file /etc/neutron/metadata_agent.ini --config-dir /etc/neutron
# This has to be on the path of the agent that runs it http://pad.lv/1182704
ln -sf /opt/stack/venvs/neutron/bin/neutron-ns-metadata-proxy /usr/bin

16
elements/quantum-network-node/os-refresh-config/post-configure.d/80-quantum-networking → elements/neutron-network-node/os-refresh-config/post-configure.d/80-neutron-networking
View File

@ -4,7 +4,7 @@ set -o pipefail
. /root/stackrc . /root/stackrc
PUBLIC_INTERFACE=$(os-config-applier --key quantum.ovs.public_interface --key-default '') PUBLIC_INTERFACE=$(os-config-applier --key neutron.ovs.public_interface --key-default '')
ovs-vsctl --no-wait -- --may-exist add-br br-ex ovs-vsctl --no-wait -- --may-exist add-br br-ex
ovs-vsctl --no-wait br-set-external-id br-ex bridge-id br-ex ovs-vsctl --no-wait br-set-external-id br-ex bridge-id br-ex
@ -32,7 +32,7 @@ find_cidr() {
echo $id echo $id
} }
FIXED_RANGE=$(os-config-applier --key quantum.ovs.fixed_range --key-default '' --type netaddress) FIXED_RANGE=$(os-config-applier --key neutron.ovs.fixed_range --key-default '' --type netaddress)
# Determine subnet ID # Determine subnet ID
id=$(find_cidr $FIXED_RANGE) id=$(find_cidr $FIXED_RANGE)
@ -53,7 +53,7 @@ if ! neutron router-port-list default-router -f csv -F fixed_ips | grep -q "$id"
fi fi
# Ensure defined floating ip range exists # Ensure defined floating ip range exists
FLOATING_RANGE=$(os-config-applier --key quantum.floatingip_range --type netaddress --key-default '') FLOATING_RANGE=$(os-config-applier --key neutron.floatingip_range --type netaddress --key-default '')
if [ -n "$FLOATING_RANGE" ] ; then if [ -n "$FLOATING_RANGE" ] ; then
# External net? # External net?
if ! neutron net-show ext-net >/dev/null 2>&1 ; then if ! neutron net-show ext-net >/dev/null 2>&1 ; then
@ -62,8 +62,8 @@ if [ -n "$FLOATING_RANGE" ] ; then
id=$(find_cidr $FLOATING_RANGE) id=$(find_cidr $FLOATING_RANGE)
if [ -z "$id" ] ; then if [ -z "$id" ] ; then
# id is set by command below # id is set by command below
POOL_START=$(os-config-applier --key quantum.floatingip_start --type netaddress) POOL_START=$(os-config-applier --key neutron.floatingip_start --type netaddress)
POOL_END=$(os-config-applier --key quantum.floatingip_end --type netaddress) POOL_END=$(os-config-applier --key neutron.floatingip_end --type netaddress)
eval $(neutron subnet-create ext-net $FLOATING_RANGE --disable-dhcp \ eval $(neutron subnet-create ext-net $FLOATING_RANGE --disable-dhcp \
--allocation-pool start=$POOL_START,end=$POOL_END -f shell -c id|grep '^id=') --allocation-pool start=$POOL_START,end=$POOL_END -f shell -c id|grep '^id=')
fi fi
@ -75,6 +75,6 @@ if [ -n "$FLOATING_RANGE" ] ; then
fi fi
service quantum-metadata-agent restart service neutron-metadata-agent restart
service quantum-l3-agent restart service neutron-l3-agent restart
service quantum-dhcp-agent restart service neutron-dhcp-agent restart

6
elements/quantum-openvswitch-agent/README.md → elements/neutron-openvswitch-agent/README.md
View File

@ -6,7 +6,7 @@ Configuration
The physical interface and bridges to use to bridge traffic onto can be The physical interface and bridges to use to bridge traffic onto can be
configured via Heat Metadata. For example: configured via Heat Metadata. For example:
quantum: neutron:
ovs: ovs:
public_interface: eth2 public_interface: eth2
physical_bridge: br-ctlplane physical_bridge: br-ctlplane
@ -19,10 +19,10 @@ configured via Heat Metadata. For example:
ovs_range: 198.51.100.0/24 ovs_range: 198.51.100.0/24
If public\_interface and physical\_bridge are not set, no bridges will be If public\_interface and physical\_bridge are not set, no bridges will be
connected directly. This is normal for quantum hosting virtual machines connected directly. This is normal for neutron hosting virtual machines
when using an overlay network (e.g. GRE tunnelling). Some of the when using an overlay network (e.g. GRE tunnelling). Some of the
other fields will be ignored in this case. Most of them map 1:1 with their other fields will be ignored in this case. Most of them map 1:1 with their
counterparts in the OVS section of ovs\_quantum\_plugin.ini counterparts in the OVS section of ovs\_neutron\_plugin.ini
fixed\_range is used to create an allocation pool on the tenants network, and fixed\_range is used to create an allocation pool on the tenants network, and
ovs\_range is used to create the tenants subnet, if set. If not set the subnet ovs\_range is used to create the tenants subnet, if set. If not set the subnet

1
elements/neutron-openvswitch-agent/element-deps Normal file
View File

@ -0,0 +1 @@
neutron

5
elements/neutron-openvswitch-agent/install.d/80-neutron-openvswitch-agent Executable file
View File

@ -0,0 +1,5 @@
#!/bin/bash
set -eux
install -m 0755 -o root -g root -t /usr/local/bin $(dirname $0)/../neutron-ovs-agent-bin/*
os-svc-daemon neutron-openvswitch-agent neutron neutron-openvswitch-agent \
"--config-file /etc/neutron/neutron.conf --config-file /etc/neutron/plugins/openvswitch/ovs_neutron_plugin.ini --config-dir /etc/neutron"

6
elements/quantum-openvswitch-agent/quantum-ovs-agent-bin/init-quantum-ovs → elements/neutron-openvswitch-agent/neutron-ovs-agent-bin/init-neutron-ovs
View File

@ -7,7 +7,7 @@
# any device then it will be added to the public_interface device if one is # any device then it will be added to the public_interface device if one is
# defined. # defined.
# #
# An integration bridge for quantum-ovs-agent is created. # An integration bridge for neutron-ovs-agent is created.
# #
# If no physical bridge is defined in metadata, the script will have no # If no physical bridge is defined in metadata, the script will have no
# further effect. # further effect.
@ -33,8 +33,8 @@ set -eux
PATH=/usr/local/bin:$PATH PATH=/usr/local/bin:$PATH
EXTERNAL_BRIDGE=$(os-config-applier --key quantum.ovs.physical_bridge --type raw --key-default '') EXTERNAL_BRIDGE=$(os-config-applier --key neutron.ovs.physical_bridge --type raw --key-default '')
PHYSICAL_INTERFACE=$(os-config-applier --key quantum.ovs.public_interface --type raw --key-default '') PHYSICAL_INTERFACE=$(os-config-applier --key neutron.ovs.public_interface --type raw --key-default '')
PHYSICAL_INTERFACE_IP=$(os-config-applier --key bootstack.public_interface_ip --type netaddress --key-default '') PHYSICAL_INTERFACE_IP=$(os-config-applier --key bootstack.public_interface_ip --type netaddress --key-default '')
if [ -n "$PHYSICAL_INTERFACE_IP" -a -n "$PHYSICAL_INTERFACE" ] ; then if [ -n "$PHYSICAL_INTERFACE_IP" -a -n "$PHYSICAL_INTERFACE" ] ; then

2
elements/quantum-openvswitch-agent/os-refresh-config/configure.d/80-quantum-openvswitch-agent → elements/neutron-openvswitch-agent/os-refresh-config/configure.d/80-neutron-openvswitch-agent
View File

@ -1,3 +1,3 @@
#!/bin/bash #!/bin/bash
set -eux set -eux
init-quantum-ovs init-neutron-ovs

3
elements/neutron-openvswitch-agent/os-refresh-config/post-configure.d/80-neutron-openvswitch-agent Executable file
View File

@ -0,0 +1,3 @@
#!/bin/bash
set -eux
service neutron-openvswitch-agent restart

1
elements/neutron-server/README.md Normal file
View File

@ -0,0 +1 @@
Install and configure Neutron server components.

1
elements/neutron-server/element-deps Normal file
View File

@ -0,0 +1 @@
neutron

3
elements/neutron-server/install.d/80-neutron-server Executable file
View File

@ -0,0 +1,3 @@
#!/bin/bash
os-svc-daemon neutron-server neutron neutron-server \
"--config-file /etc/neutron/neutron.conf --config-file /etc/neutron/plugins/openvswitch/ovs_neutron_plugin.ini --config-dir /etc/neutron"

3
elements/neutron-server/os-refresh-config/post-configure.d/80-neutron-server Executable file
View File

@ -0,0 +1,3 @@
#!/bin/bash
set -eux
service neutron-server restart

1
elements/neutron/README.md Normal file
View File

@ -0,0 +1 @@
Install neutron service from git.

0
elements/quantum/element-deps → elements/neutron/element-deps
View File

21
elements/neutron/install.d/76-neutron Executable file
View File

@ -0,0 +1,21 @@
#!/bin/bash
set -eux
DISTRO=`lsb_release -si` || true
install-packages openvswitch-switch openvswitch-datapath-dkms
os-svc-install -n neutron -u neutron -r https://github.com/openstack/neutron.git
mkdir -p /var/lib/neutron && chown -R neutron:neutron /var/lib/neutron
ln -sf /opt/stack/venvs/neutron/bin/neutron-rootwrap /usr/bin/neutron-rootwrap
ln -sf /opt/stack/venvs/neutron/etc/neutron/rootwrap.d /etc/neutron/rootwrap.d
echo "neutron ALL=(root) NOPASSWD:ALL" > /etc/sudoers.d/neutron
chmod 0440 /etc/sudoers.d/neutron
visudo -c
if [ $DISTRO = "Fedora" ]; then
systemctl enable openvswitch.service
fi

6
elements/neutron/install.d/99-neutronclient Executable file
View File

@ -0,0 +1,6 @@
#!/bin/bash
set -eux
# Due to trunk neutron relying on trunk neutronclient, we need
# trunk neutronclient - https://bugs.launchpad.net/neutron/+bug/1182732
/opt/stack/venvs/neutron/bin/pip install -U git+https://github.com/openstack/python-neutronclient

28
elements/quantum/os-config-applier/etc/quantum/api-paste.ini → elements/neutron/os-config-applier/etc/neutron/api-paste.ini
View File

@ -4,32 +4,32 @@
## Please submit patches for any setting that should be deleted or Heat-configurable. ## Please submit patches for any setting that should be deleted or Heat-configurable.
## https://github.com/stackforge/diskimage-builder ## https://github.com/stackforge/diskimage-builder
[composite:quantum] [composite:neutron]
use = egg:Paste#urlmap use = egg:Paste#urlmap
/: quantumversions /: neutronversions
/v2.0: quantumapi_v2_0 /v2.0: neutronapi_v2_0
[composite:quantumapi_v2_0] [composite:neutronapi_v2_0]
use = call:quantum.auth:pipeline_factory use = call:neutron.auth:pipeline_factory
noauth = extensions quantumapiapp_v2_0 noauth = extensions neutronapiapp_v2_0
keystone = authtoken keystonecontext extensions quantumapiapp_v2_0 keystone = authtoken keystonecontext extensions neutronapiapp_v2_0
[filter:keystonecontext] [filter:keystonecontext]
paste.filter_factory = quantum.auth:QuantumKeystoneContext.factory paste.filter_factory = neutron.auth:NeutronKeystoneContext.factory
[filter:authtoken] [filter:authtoken]
paste.filter_factory = keystoneclient.middleware.auth_token:filter_factory paste.filter_factory = keystoneclient.middleware.auth_token:filter_factory
auth_host = {{keystone.host}} auth_host = {{keystone.host}}
auth_port = 35357 auth_port = 35357
admin_tenant_name = service admin_tenant_name = service
admin_user = quantum admin_user = neutron
admin_password = {{service-password}} admin_password = {{service-password}}
[filter:extensions] [filter:extensions]
paste.filter_factory = quantum.api.extensions:plugin_aware_extension_middleware_factory paste.filter_factory = neutron.api.extensions:plugin_aware_extension_middleware_factory
[app:quantumversions] [app:neutronversions]
paste.app_factory = quantum.api.versions:Versions.factory paste.app_factory = neutron.api.versions:Versions.factory
[app:quantumapiapp_v2_0] [app:neutronapiapp_v2_0]
paste.app_factory = quantum.api.v2.router:APIRouter.factory paste.app_factory = neutron.api.v2.router:APIRouter.factory

8
elements/quantum/os-config-applier/etc/quantum/dhcp_agent.ini → elements/neutron/os-config-applier/etc/neutron/dhcp_agent.ini
View File

@ -6,8 +6,8 @@
[DEFAULT] [DEFAULT]
debug = True debug = True
state_path = /var/run/quantum state_path = /var/run/neutron
interface_driver = quantum.agent.linux.interface.OVSInterfaceDriver interface_driver = neutron.agent.linux.interface.OVSInterfaceDriver
dhcp_driver = quantum.agent.linux.dhcp.Dnsmasq dhcp_driver = neutron.agent.linux.dhcp.Dnsmasq
root_helper = sudo /usr/bin/quantum-rootwrap /etc/quantum/rootwrap.conf root_helper = sudo /usr/bin/neutron-rootwrap /etc/neutron/rootwrap.conf
use_namespaces = True use_namespaces = True

6
elements/quantum/os-config-applier/etc/quantum/l3_agent.ini → elements/neutron/os-config-applier/etc/neutron/l3_agent.ini
View File

@ -7,12 +7,12 @@
[DEFAULT] [DEFAULT]
debug = True debug = True
interface_driver = quantum.agent.linux.interface.OVSInterfaceDriver interface_driver = neutron.agent.linux.interface.OVSInterfaceDriver
state_path = /var/run/quantum state_path = /var/run/neutron
auth_url = http://{{keystone.host}}:35357/v2.0 auth_url = http://{{keystone.host}}:35357/v2.0
admin_tenant_name = service admin_tenant_name = service
admin_user = quantum admin_user = neutron
admin_password = {{service-password}} admin_password = {{service-password}}
use_namespaces = True use_namespaces = True

6
elements/quantum/os-config-applier/etc/quantum/metadata_agent.ini → elements/neutron/os-config-applier/etc/neutron/metadata_agent.ini
View File

@ -2,10 +2,10 @@
auth_url = http://{{keystone.host}}:35357/v2.0 auth_url = http://{{keystone.host}}:35357/v2.0
auth_region = RegionOne auth_region = RegionOne
admin_tenant_name = service admin_tenant_name = service
admin_user = quantum admin_user = neutron
admin_password = {{admin-password}} admin_password = {{admin-password}}
metadata_proxy_shared_secret = {{quantum.metadata_proxy_shared_secret}} metadata_proxy_shared_secret = {{neutron.metadata_proxy_shared_secret}}
nova_metadata_ip = {{nova.host}} nova_metadata_ip = {{nova.host}}
nova_metadata_port = 8775 nova_metadata_port = 8775
state_path = /var/run/quantum state_path = /var/run/neutron

14
elements/quantum/os-config-applier/etc/quantum/quantum.conf → elements/neutron/os-config-applier/etc/neutron/neutron.conf
View File

@ -11,10 +11,10 @@ auth_strategy = keystone
allow_overlapping_ips = False allow_overlapping_ips = False
debug = True debug = True
verbose = True verbose = True
core_plugin = quantum.plugins.openvswitch.ovs_quantum_plugin.OVSQuantumPluginV2 core_plugin = neutron.plugins.openvswitch.ovs_neutron_plugin.OVSNeutronPluginV2
rabbit_host = {{rabbit.host}} rabbit_host = {{rabbit.host}}
rabbit_password = {{rabbit.password}} rabbit_password = {{rabbit.password}}
rpc_backend = quantum.openstack.common.rpc.impl_kombu rpc_backend = neutron.openstack.common.rpc.impl_kombu
bind_host = 0.0.0.0 bind_host = 0.0.0.0
@ -22,15 +22,15 @@ bind_port = 9696
api_paste_config = api-paste.ini api_paste_config = api-paste.ini
control_exchange = quantum control_exchange = neutron
notification_driver = quantum.openstack.common.notifier.rpc_notifier notification_driver = neutron.openstack.common.notifier.rpc_notifier
notification_topics = notifications notification_topics = notifications
[QUOTAS] [QUOTAS]
quota_driver = quantum.db.quota_db.DbQuotaDriver quota_driver = neutron.db.quota_db.DbQuotaDriver
[DEFAULT_SERVICETYPE] [DEFAULT_SERVICETYPE]
@ -44,6 +44,6 @@ auth_port = 35357
auth_protocol = http auth_protocol = http
auth_protocol = http auth_protocol = http
admin_tenant_name = service admin_tenant_name = service
admin_user = quantum admin_user = neutron
admin_password = {{service-password}} admin_password = {{service-password}}
signing_dir = /var/lib/quantum/keystone-signing signing_dir = /var/lib/neutron/keystone-signing

23
elements/neutron/os-config-applier/etc/neutron/plugins/openvswitch/ovs_neutron_plugin.ini Normal file
View File

@ -0,0 +1,23 @@
[DATABASE]
sql_connection = {{neutron.ovs_db}}
reconnect_interval = 2
[OVS]
bridge_mappings = {{neutron.ovs.bridge_mappings}}
network_vlan_ranges = {{neutron.ovs.network_vlan_ranges}}
tenant_network_type = {{neutron.ovs.tenant_network_type}}
tunnel_id_ranges = 1:1000
enable_tunneling = {{neutron.ovs.enable_tunneling}}
integration_bridge = br-int
tunnel_bridge = br-tun
local_ip = {{neutron.ovs.local_ip}}
[AGENT]
root_helper = sudo
polling_interval = 2
[SECURITYGROUP]
firewall_driver = neutron.agent.linux.iptables_firewall.OVSHybridIptablesFirewallDriver

0
elements/quantum/os-config-applier/etc/quantum/policy.json → elements/neutron/os-config-applier/etc/neutron/policy.json
View File

2
elements/quantum/os-config-applier/etc/quantum/rootwrap.conf → elements/neutron/os-config-applier/etc/neutron/rootwrap.conf
View File

@ -1,4 +1,4 @@
[DEFAULT] [DEFAULT]
# List of directories to load filter definitions from (separated by ','). # List of directories to load filter definitions from (separated by ',').
# These directories MUST all be only writeable by root ! # These directories MUST all be only writeable by root !
filters_path=/etc/quantum/rootwrap.d,/usr/share/quantum/rootwrap filters_path=/etc/neutron/rootwrap.d,/usr/share/neutron/rootwrap

10
elements/nova/os-apply-config/etc/nova/nova.conf
View File

@ -38,18 +38,18 @@ vncserver_listen=0.0.0.0
# Networking # # Networking #
network_api_class=nova.network.quantumv2.api.API network_api_class=nova.network.quantumv2.api.API
quantum_url=http://{{quantum.host}}:9696 quantum_url=http://{{neutron.host}}:9696
quantum_auth_strategy=keystone quantum_auth_strategy=keystone
quantum_admin_tenant_name=service quantum_admin_tenant_name=service
quantum_admin_username=quantum quantum_admin_username=neutron
quantum_admin_password={{service-password}} quantum_admin_password={{service-password}}
quantum_admin_auth_url=http://{{keystone.host}}:35357/v2.0 quantum_admin_auth_url=http://{{keystone.host}}:35357/v2.0
linuxnet_interface_driver=nova.network.linux_net.LinuxOVSInterfaceDriver linuxnet_interface_driver=nova.network.linux_net.LinuxOVSInterfaceDriver
fixed_range = 192.0.2.32/29 fixed_range = 192.0.2.32/29
service_quantum_metadata_proxy={{nova.metadata-proxy}} service_quantum_metadata_proxy={{nova.metadata-proxy}}
{{#quantum.metadata_proxy_shared_secret}} {{#neutron.metadata_proxy_shared_secret}}
quantum_metadata_proxy_shared_secret={{quantum.metadata_proxy_shared_secret}} quantum_metadata_proxy_shared_secret={{neutron.metadata_proxy_shared_secret}}
{{/quantum.metadata_proxy_shared_secret}} {{/neutron.metadata_proxy_shared_secret}}
dhcpbridge_flagfile=/etc/nova/nova.conf dhcpbridge_flagfile=/etc/nova/nova.conf
dhcpbridge=/usr/bin/nova-dhcpbridge dhcpbridge=/usr/bin/nova-dhcpbridge

2
elements/openstack-clients/README.md
View File

@ -8,4 +8,4 @@ Installed clients are:
python-glanceclient python-glanceclient
python-heatclient python-heatclient
python-novaclient python-novaclient
python-quantumclient python-neutronclient

2
elements/openstack-db/install.d/50-openstack-db
View File

@ -16,4 +16,4 @@ os-svc-install -u keystone -r https://github.com/openstack/keystone.git
os-svc-install -u cinder -r https://github.com/openstack/cinder.git os-svc-install -u cinder -r https://github.com/openstack/cinder.git
os-svc-install -u nova -r https://github.com/openstack/nova.git os-svc-install -u nova -r https://github.com/openstack/nova.git
os-svc-install -u glance -r https://github.com/openstack/glance.git os-svc-install -u glance -r https://github.com/openstack/glance.git
os-svc-install -u quantum -r https://github.com/openstack/quantum.git os-svc-install -u neutron -r https://github.com/openstack/neutron.git

2
elements/quantum-network-node/element-deps
View File

@ -1,2 +0,0 @@
quantum
quantum-openvswitch-agent

9
elements/quantum-network-node/install.d/80-quantum-networking
View File

@ -1,9 +0,0 @@
#!/bin/bash
set -eux
os-svc-daemon -n quantum-l3-agent -u quantum -c quantum-l3-agent -- --config-file /etc/quantum/l3_agent.ini --config-dir /etc/quantum
os-svc-daemon -n quantum-dhcp-agent -u quantum -c quantum-dhcp-agent -- --config-file /etc/quantum/dhcp_agent.ini --config-dir /etc/quantum
os-svc-daemon -n quantum-metadata-agent -u quantum -c quantum-metadata-agent -- --config-file /etc/quantum/metadata_agent.ini --config-dir /etc/quantum
# This has to be on the path of the agent that runs it http://pad.lv/1182704
ln -sf /opt/stack/venvs/quantum/bin/quantum-ns-metadata-proxy /usr/bin

1
elements/quantum-openvswitch-agent/element-deps
View File

@ -1 +0,0 @@
quantum

5
elements/quantum-openvswitch-agent/install.d/80-quantum-openvswitch-agent
View File

@ -1,5 +0,0 @@
#!/bin/bash
set -eux
install -m 0755 -o root -g root -t /usr/local/bin $(dirname $0)/../quantum-ovs-agent-bin/*
os-svc-daemon quantum-openvswitch-agent quantum quantum-openvswitch-agent \
"--config-file /etc/quantum/quantum.conf --config-file /etc/quantum/plugins/openvswitch/ovs_quantum_plugin.ini --config-dir /etc/quantum"

3
elements/quantum-openvswitch-agent/os-refresh-config/post-configure.d/80-quantum-openvswitch-agent
View File

@ -1,3 +0,0 @@
#!/bin/bash
set -eux
service quantum-openvswitch-agent restart

1
elements/quantum-server/README.md
View File

@ -1 +0,0 @@
Install and configure Quantum server components.

1
elements/quantum-server/element-deps
View File

@ -1 +0,0 @@
quantum

3
elements/quantum-server/install.d/80-quantum-server
View File

@ -1,3 +0,0 @@
#!/bin/bash
os-svc-daemon quantum-server quantum quantum-server \
"--config-file /etc/quantum/quantum.conf --config-file /etc/quantum/plugins/openvswitch/ovs_quantum_plugin.ini --config-dir /etc/quantum"

3
elements/quantum-server/os-refresh-config/post-configure.d/80-quantum-server
View File

@ -1,3 +0,0 @@
#!/bin/bash
set -eux
service quantum-server restart

1
elements/quantum/README.md
View File

@ -1 +0,0 @@
Install quantum service from git.

21
elements/quantum/install.d/76-quantum
View File

@ -1,21 +0,0 @@
#!/bin/bash
set -eux
DISTRO=`lsb_release -si` || true
install-packages openvswitch-switch openvswitch-datapath-dkms
os-svc-install -n quantum -u quantum -r https://github.com/openstack/neutron.git
mkdir -p /var/lib/quantum && chown -R quantum:quantum /var/lib/quantum
ln -sf /opt/stack/venvs/quantum/bin/quantum-rootwrap /usr/bin/quantum-rootwrap
ln -sf /opt/stack/venvs/quantum/etc/quantum/rootwrap.d /etc/quantum/rootwrap.d
echo "quantum ALL=(root) NOPASSWD:ALL" > /etc/sudoers.d/quantum
chmod 0440 /etc/sudoers.d/quantum
visudo -c
if [ $DISTRO = "Fedora" ]; then
systemctl enable openvswitch.service
fi

6
elements/quantum/install.d/99-quantumclient
View File

@ -1,6 +0,0 @@
#!/bin/bash
set -eux
# Due to trunk quantum relying on trunk quantumclient, we need
# trunk quantumclient - https://bugs.launchpad.net/quantum/+bug/1182732
/opt/stack/venvs/quantum/bin/pip install -U git+https://github.com/openstack/python-quantumclient

23
elements/quantum/os-config-applier/etc/quantum/plugins/openvswitch/ovs_quantum_plugin.ini
View File

@ -1,23 +0,0 @@
[DATABASE]
sql_connection = {{quantum.ovs_db}}
reconnect_interval = 2
[OVS]
bridge_mappings = {{quantum.ovs.bridge_mappings}}
network_vlan_ranges = {{quantum.ovs.network_vlan_ranges}}
tenant_network_type = {{quantum.ovs.tenant_network_type}}
tunnel_id_ranges = 1:1000
enable_tunneling = {{quantum.ovs.enable_tunneling}}
integration_bridge = br-int
tunnel_bridge = br-tun
local_ip = {{quantum.ovs.local_ip}}
[AGENT]
root_helper = sudo
polling_interval = 2
[SECURITYGROUP]
firewall_driver = quantum.agent.linux.iptables_firewall.OVSHybridIptablesFirewallDriver

2
elements/seed-stack-config/README.md
View File

@ -15,7 +15,7 @@ Usage
Edit config.json to customise it for your deployment environment. The default Edit config.json to customise it for your deployment environment. The default
is configured for nova-baremetal operation in a seed VM. The configuration is configured for nova-baremetal operation in a seed VM. The configuration
options are documented in the actual elements that use the configuration - e.g. options are documented in the actual elements that use the configuration - e.g.
nova, quantum etc. nova, neutron etc.
Configuration keys Configuration keys
------------------ ------------------

4
elements/seed-stack-config/config.json
View File

@ -48,9 +48,9 @@
"db": "mysql://cinder:unset@localhost/cinder", "db": "mysql://cinder:unset@localhost/cinder",
"volume_size_mb": "5000" "volume_size_mb": "5000"
}, },
"quantum": { "neutron": {
"host": "127.0.0.1", "host": "127.0.0.1",
"ovs_db": "mysql://quantum:unset@localhost/ovs_quantum?charset=utf8", "ovs_db": "mysql://neutron:unset@localhost/ovs_neutron?charset=utf8",
"ovs": { "ovs": {
"bridge_mappings": "ctlplane:br-ctlplane", "bridge_mappings": "ctlplane:br-ctlplane",
"dnsmasq_range": ["192.0.2.4", "192.0.2.4"], "dnsmasq_range": ["192.0.2.4", "192.0.2.4"],