Hello community,
here is the log from the commit of package openstack-quickstart for
openSUSE:Factory checked in at 2014-04-18 11:08:46
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/openstack-quickstart (Old)
and /work/SRC/openSUSE:Factory/.openstack-quickstart.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "openstack-quickstart"
Changes:
--------
---
/work/SRC/openSUSE:Factory/openstack-quickstart/openstack-quickstart.changes
2014-04-14 20:38:17.000000000 +0200
+++
/work/SRC/openSUSE:Factory/.openstack-quickstart.new/openstack-quickstart.changes
2014-04-18 12:25:25.000000000 +0200
@@ -1,0 +2,20 @@
+Wed Apr 16 23:50:55 UTC 2014 - [email protected]
+
+- Update to version 2013.2+git.1397635681.d4c5efd:
+ + Fix defaults to match upstream more closely
+ + Reduce memory pressure a bit
+
+-------------------------------------------------------------------
+Mon Apr 14 09:20:25 UTC 2014 - [email protected]
+
+- Update to version 2013.2+git.1397467158.cff5036:
+ + Fix FwaaS instantiation
+
+-------------------------------------------------------------------
+Tue Apr 8 00:08:09 UTC 2014 - [email protected]
+
+- Update to version 2013.2+git.1396864561.397b081:
+ + Configure FWaaS plugin
+ + Set up communication with Nova
+
+-------------------------------------------------------------------
Old:
----
openstack-quickstart-2013.2+git.1395248710.2704f7d.tar.gz
New:
----
openstack-quickstart-2013.2+git.1397635681.d4c5efd.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ openstack-quickstart.spec ++++++
--- /var/tmp/diff_new_pack.awbRGX/_old 2014-04-18 12:25:31.000000000 +0200
+++ /var/tmp/diff_new_pack.awbRGX/_new 2014-04-18 12:25:31.000000000 +0200
@@ -17,7 +17,7 @@
Name: openstack-quickstart
-Version: 2013.2+git.1395248710.2704f7d
+Version: 2013.2+git.1397635681.d4c5efd
Release: 0
Summary: OpenStack Quickstart
License: MIT
++++++ _service ++++++
--- /var/tmp/diff_new_pack.awbRGX/_old 2014-04-18 12:25:31.000000000 +0200
+++ /var/tmp/diff_new_pack.awbRGX/_new 2014-04-18 12:25:31.000000000 +0200
@@ -4,7 +4,7 @@
<param name="scm">git</param>
<param name="exclude">.git</param>
<param name="versionformat">@PARENT_TAG@+git.%ct.%h</param>
- <param name="revision">master</param>
+ <param name="revision">stable/icehouse</param>
<param name="changesgenerate">enable</param>
</service>
<service mode="disabled" name="recompress">
++++++ _servicedata ++++++
--- /var/tmp/diff_new_pack.awbRGX/_old 2014-04-18 12:25:31.000000000 +0200
+++ /var/tmp/diff_new_pack.awbRGX/_new 2014-04-18 12:25:31.000000000 +0200
@@ -1,7 +1,7 @@
<servicedata>
<service name="tar_scm">
<param
name="url">git://github.com/SUSE-Cloud/openstack-quickstart.git</param>
- <param name="changesrevision">2704f7d139</param>
+ <param name="changesrevision">d4c5efddf8</param>
</service>
<service name="tar_scm">
<param name="url">git://github.com/openstack-dev/devstack.git</param>
++++++ openstack-quickstart-2013.2+git.1395248710.2704f7d.tar.gz ->
openstack-quickstart-2013.2+git.1397635681.d4c5efd.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/openstack-quickstart-2013.2+git.1395248710.2704f7d/scripts/openstack-quickstart-demosetup
new/openstack-quickstart-2013.2+git.1397635681.d4c5efd/scripts/openstack-quickstart-demosetup
---
old/openstack-quickstart-2013.2+git.1395248710.2704f7d/scripts/openstack-quickstart-demosetup
2014-03-20 02:42:40.000000000 +0100
+++
new/openstack-quickstart-2013.2+git.1397635681.d4c5efd/scripts/openstack-quickstart-demosetup
2014-04-17 01:50:54.000000000 +0200
@@ -357,6 +357,11 @@
crudini --set /etc/nova/nova.conf DEFAULT allow_resize_to_same_host True
crudini --set /etc/nova/nova.conf DEFAULT default_floating_pool ext
crudini --set /etc/nova/nova.conf DEFAULT my_ip "$IP"
+crudini --set /etc/nova/nova.conf DEFAULT osapi_compute_workers "1"
+crudini --set /etc/nova/nova.conf DEFAULT ec2_workers "1"
+crudini --set /etc/nova/nova.conf DEFAULT metadata_workers "1"
+crudini --set /etc/nova/nova.conf conductor workers "1"
+
metadata_secret=$(uuidgen)
crudini --set /etc/nova/nova.conf DEFAULT neutron_metadata_proxy_shared_secret
$metadata_secret
@@ -415,7 +420,17 @@
## setup neutron configuration
#-----------------------------------------
-crudini --set /etc/neutron/neutron.conf database connection
$DB://neutron:$mpw@$IP/neutron
+SERVICE_TENANT_ID=`get_service_tenant_id`
+c=/etc/neutron/neutron.conf
+crudini --set $c database connection $DB://neutron:$mpw@$IP/neutron
+crudini --set $c DEFAULT allow_overlapping_ips true
+crudini --set $c DEFAULT notify_nova_on_port_status_change true
+crudini --set $c DEFAULT notify_nova_on_port_data_changes true
+crudini --set $c DEFAULT nova_url "http://$SERVICE_HOST:8774/v2";
+crudini --set $c DEFAULT nova_admin_username nova
+crudini --set $c DEFAULT nova_admin_password $ADMIN_PASSWORD
+crudini --set $c DEFAULT nova_admin_tenant_id $SERVICE_TENANT_ID
+crudini --set $c DEFAULT nova_admin_auth_url $KEYSTONE_PUBLIC_ENDPOINT
crudini --set /etc/neutron/plugins/linuxbridge/linuxbridge_conf.ini
linux_bridge physical_interface_mappings root-bridge:vefq,physnet1:eth0
crudini --set /etc/neutron/plugins/linuxbridge/linuxbridge_conf.ini
securitygroup firewall_driver
neutron.agent.linux.iptables_firewall.IptablesFirewallDriver
@@ -423,11 +438,10 @@
crudini --set /etc/neutron/plugins/ml2/ml2_conf.ini ml2_type_vlan
network_vlan_ranges root-bridge,physnet1
crudini --set /etc/neutron/dhcp_agent.ini DEFAULT use_namespaces true
crudini --set /etc/neutron/l3_agent.ini DEFAULT use_namespaces true
-crudini --set /etc/neutron/neutron.conf DEFAULT allow_overlapping_ips true
crudini --set /etc/neutron/metadata_agent.ini DEFAULT
metadata_proxy_shared_secret $metadata_secret
if [ "x$with_tempest" = "xyes" ]; then
- crudini --set /etc/neutron/neutron.conf DEFAULT service_plugins
"neutron.services.loadbalancer.plugin.LoadBalancerPlugin,
neutron.services.l3_router.l3_router_plugin.L3RouterPlugin,
neutron.services.vpn.plugin.VPNDriverPlugin,
neutron.services.metering.metering_plugin.MeteringPlugin"
+ crudini --set /etc/neutron/neutron.conf DEFAULT service_plugins
"neutron.services.loadbalancer.plugin.LoadBalancerPlugin,
neutron.services.l3_router.l3_router_plugin.L3RouterPlugin,
neutron.services.vpn.plugin.VPNDriverPlugin,
neutron.services.metering.metering_plugin.MeteringPlugin,
neutron.services.firewall.fwaas_plugin.FirewallPlugin"
fi
start_and_enable_service rabbitmq-server
@@ -459,7 +473,6 @@
done
### create subnets
## fixed
-SERVICE_TENANT_ID=`get_service_tenant_id`
neutron net-create fixed --tenant-id $SERVICE_TENANT_ID --shared
--provider:network_type flat --provider:physical_network root-bridge
neutron subnet-create --name fixed --dns-nameserver 8.8.8.8 --dns-nameserver
8.8.4.4 fixed $testnet
neutron router-create --tenant-id $SERVICE_TENANT_ID public
@@ -555,6 +568,10 @@
crudini --set /etc/tempest/tempest.conf identity admin_username admin
crudini --set /etc/tempest/tempest.conf identity admin_tenant_name admin
crudini --set /etc/tempest/tempest.conf identity admin_password $pw
+ crudini --set /etc/tempest/tempest.conf compute-feature-enabled
change_password False
+ crudini --set /etc/tempest/tempest.conf compute-feature-enabled
live_migration False
+ crudini --set /etc/tempest/tempest.conf compute-feature-enabled
vnc_console true
+ crudini --set /etc/tempest/tempest.conf compute-feature-enabled resize true
crudini --set /etc/tempest/tempest.conf compute allow_tenant_isolation
false
crudini --set /etc/tempest/tempest.conf compute fixed_network_name fixed
crudini --set /etc/tempest/tempest.conf compute network_for_ssh ext
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/openstack-quickstart-2013.2+git.1395248710.2704f7d/scripts/tripleo-setup-seednode
new/openstack-quickstart-2013.2+git.1397635681.d4c5efd/scripts/tripleo-setup-seednode
---
old/openstack-quickstart-2013.2+git.1395248710.2704f7d/scripts/tripleo-setup-seednode
2014-03-20 02:42:40.000000000 +0100
+++
new/openstack-quickstart-2013.2+git.1397635681.d4c5efd/scripts/tripleo-setup-seednode
1970-01-01 01:00:00.000000000 +0100
@@ -1,363 +0,0 @@
-#!/bin/bash
-
-set -eux
-cd /
-
-# Setup the insecure defaults
-
-REGION="regionOne"
-PASSWORD="unset"
-SERVICE_TOKEN="unset"
-ENDPOINT="192.0.2.1"
-ADMIN_EMAIL="[email protected]"
-DEBUG=""
-
-# Functions
-
-register-endpoint()
-{
- DESCRIPTION=$1
- NAME=$2
- TYPE=$3
- PUBLIC_URL=$4
-
- if [ "ec2" = "$TYPE" ]; then
- SUFFIX="/services/Cloud"
- ADMIN_SUFFIX="/services/Admin"
- elif [ "image" = "$TYPE" ]; then
- SUFFIX="/v1"
- ADMIN_SUFFIX="$SUFFIX"
- elif [ "baremetal" = "$TYPE" ]; then
- SUFFIX="/"
- ADMIN_SUFFIX="$SUFFIX"
- elif [ "orchestration" = "$TYPE" ]; then
- SUFFIX="/v1/%(tenant_id)s"
- ADMIN_SUFFIX="$SUFFIX"
- elif [ "identity" = "$TYPE" ]; then
- SUFFIX="/v2.0"
- ADMIN_SUFFIX="$SUFFIX"
- elif [ "network" = "$TYPE" ]; then
- SUFFIX="/"
- ADMIN_SUFFIX="$SUFFIX"
- elif [ "compute" = "$TYPE" ]; then
- SUFFIX="/v2/\$(tenant_id)s"
- ADMIN_SUFFIX="$SUFFIX"
- else
- echo "Unknown service type" >&2
- exit 1
- fi
-
- INTERNAL_URL="$PUBLIC_URL"
- ADMIN_URL="$INTERNAL_URL"
-
- ADMIN_ROLE=$(keystone role-list | awk '/ admin / {print $2}')
- if [ -z "$ADMIN_ROLE" ]; then
- echo "Could not find admin role" >&2
- exit 1
- fi
-
- SERVICE_TENANT=$(keystone $DEBUG tenant-list | awk '/ service / {print
$2}')
- PASSWORD="unset"
- SVC_USER=$(keystone $DEBUG user-create --name=$NAME --pass=$PASSWORD
--tenant-id $SERVICE_TENANT [email protected] | awk ' / id / {print
$4}')
-
- keystone user-role-add $DEBUG --tenant-id $SERVICE_TENANT --user-id
$SVC_USER --role-id $ADMIN_ROLE
-
- SERVICE_ID=$(keystone $DEBUG service-create --name=$NAME --type=$TYPE
--description="$DESCRIPTION" | awk '/ id / {print $4}')
- keystone endpoint-create $DEBUG --region "$REGION" --service-id
$SERVICE_ID \
- --publicurl "${PUBLIC_URL}/${SUFFIX}" \
- --adminurl "${ADMIN_URL}/${ADMIN_SUFFIX}" \
- --internalurl "${INTERNAL_URL}/${SUFFIX}"
-
- echo "Service $TYPE created with password $PASSWORD"
-}
-
-
-# Setup an openSUSE package based seed cloud
-
-##
-------------------------------------------------------------------------------
-## init-keystone -p unset unset 192.0.2.1 [email protected] [email protected]
-##
-------------------------------------------------------------------------------
-
-export SERVICE_ENDPOINT=http://$ENDPOINT:35357/v2.0
-export SERVICE_TOKEN
-
-keystone-manage pki_setup --keystone-user openstack-keystone --keystone-group
openstack-keystone
-crudini --set /etc/keystone/keystone.conf DEFAULT admin_token $SERVICE_TOKEN
-rcopenstack-keystone restart
-
-echo "Waiting for keystone to initialise..."
-if ! keystone tenant-get admin; then
- keystone tenant-create --name=admin
-fi
-ADMIN_TENANT_ID=$(keystone tenant-get admin | awk '$2=="id" {print $4}')
-SERVICE_TENANT_ID=$(keystone tenant-create --name=service | awk '$2=="id"
{print $4}')
-
-# Roles
-ADMIN_ROLE_ID=$(keystone role-create --name=admin | awk '$2=="id" {print $4}')
-MEMBER_ROLE_ID=$(keystone role-create --name=Member | awk '$2=="id" {print
$4}')
-
-# Users
-ADMIN_USER_ID=$(keystone user-create --name=admin \
- --pass="$PASSWORD" \
- --email="$ADMIN_EMAIL" | awk '$2=="id" {print $4}')
-
-# User Roles
-keystone user-role-add --user-id $ADMIN_USER_ID --role-id $ADMIN_ROLE_ID
--tenant-id $ADMIN_TENANT_ID
-
-register-endpoint "Keystone Identity Service" keystone identity
http://$ENDPOINT:5000 -a http://$ENDPOINT:35357
-
-##
-------------------------------------------------------------------------------
-## setup-endpoints 192.0.2.1 --glance-password unset --heat-password unset
--neutron-password unset --nova-password unset
-##
-------------------------------------------------------------------------------
-
-CINDER_PASSWORD="unset"
-HEAT_PASSWORD="unset"
-GLANCE_PASSWORD="unset"
-NEUTRON_PASSWORD="unset"
-NOVA_PASSWORD="unset"
-
-PASSWORD=$HEAT_PASSWORD register-endpoint "Heat Service" heat orchestration
http://$ENDPOINT:8004
-PASSWORD=$NEUTRON_PASSWORD register-endpoint "Neutron Service" neutron network
http://$ENDPOINT:9696
-PASSWORD=$GLANCE_PASSWORD register-endpoint "Glance Image Service" glance
image http://$ENDPOINT:9292
-register-endpoint $DEBUG "EC2 Compatibility Layer" ec2 ec2
http://$ENDPOINT:8773
-PASSWORD=$NOVA_PASSWORD register-endpoint "Nova Compute Service" nova compute
http://$ENDPOINT:8774
-
-##
-------------------------------------------------------------------------------
-
-keystone role-create --name heat_stack_user
-
-##
-------------------------------------------------------------------------------
-## use regular keystone authentication
-
-cat - > ~/.seedrc <<EOF
-export NOVA_VERSION=1.1
-export OS_PASSWORD=unset
-export OS_AUTH_URL=http://192.0.2.1:5000/v2.0
-export OS_USERNAME=admin
-export OS_TENANT_NAME=admin
-export COMPUTE_API_VERSION=1.1
-export OS_NO_CACHE=True
-export OS_CLOUDNAME=seed
-EOF
-
-. ~/.seedrc
-
-if [ ! -e ~/.ssh/id_rsa.pub ]; then
- ssh-keygen -t rsa -P '' -f ~/.ssh/id_rsa
-fi
-
-for c in /etc/glance/glance-api.conf /etc/glance/glance-registry.conf \
- /etc/neutron/neutron.conf /etc/heat/heat.conf /etc/nova/nova.conf ; do
- crudini --set $c keystone_authtoken auth_host "192.0.2.1"
- crudini --set $c keystone_authtoken auth_port 35357
- crudini --set $c keystone_authtoken auth_protocol http
- crudini --set $c keystone_authtoken auth_uri $OS_AUTH_URL
- crudini --set $c keystone_authtoken admin_tenant_name service
- crudini --set $c keystone_authtoken admin_user $OS_USERNAME
- crudini --set $c keystone_authtoken admin_password $OS_PASSWORD
-done
-
-for c in /etc/glance/glance-api.conf /etc/glance/glance-registry.conf ; do
- crudini --set $c keystone_authtoken admin_user glance
-done
-
-crudini --set /etc/neutron/neutron.conf keystone_authtoken admin_user neutron
-crudini --set /etc/heat/heat.conf keystone_authtoken admin_user heat
-crudini --set /etc/nova/nova.conf keystone_authtoken admin_user nova
-
-##
-------------------------------------------------------------------------------
-## setup rabbitmq
-##
-------------------------------------------------------------------------------
-
-rcrabbitmq-server restart
-
-##
-------------------------------------------------------------------------------
-## setup glance
-##
-------------------------------------------------------------------------------
-
-for c in /etc/glance/glance-api.conf /etc/glance/glance-registry.conf; do
- crudini --set $c DEFAULT sql_connection
'sqlite:////var/lib/glance/glance.sqlite'
-done
-
-rcopenstack-glance-api restart
-rcopenstack-glance-registry restart
-
-KERNEL=/root/tripleo-deploy.x86_64-1.12.1.kernel.3.0.76-0.11-default
-RAMDISK=/root/tripleo-deploy.x86_64-1.12.1.gz
-deploy_kernel_id=$(glance image-create --name bm-vmlinuz --public
--disk-format aki < $KERNEL \
- | grep ' id ' | awk '{print $4}')
-deploy_ramdisk_id=$(glance image-create --name bm-initrd --public
--disk-format ari < $RAMDISK \
- | grep ' id ' | awk '{print $4}')
-
-if [ ! -e /root/undercloud.qcow2 ]; then
- qemu-img create -f qcow2 /root/undercloud.qcow2 10G
-fi
-
-
-##
-------------------------------------------------------------------------------
-## setup neutron
-##
-------------------------------------------------------------------------------
-
-c=/etc/neutron/plugins/linuxbridge/linuxbridge_conf.ini
-
-crudini --set $c vlans tenant_network_type 'vlan'
-crudini --set $c vlans network_vlan_ranges 'ctlplane:1000:2000'
-crudini --set $c linux_bridge physical_interface_mappings 'ctlplane:eth1'
-crudini --set $c securitygroup firewall_driver
'neutron.agent.linux.iptables_firewall.IptablesFirewallDriver'
-
-rcopenstack-neutron restart
-
-##
-------------------------------------------------------------------------------
-## setup heat
-##
-------------------------------------------------------------------------------
-
-c=/etc/heat/heat.conf
-
-crudini --set $c DEFAULT heat_metadata_server_url 'http://192.0.2.1:8000'
-crudini --set $c DEFAULT heat_waitcondition_server_url
'http://192.0.2.1:8000/v1/waitcondition'
-crudini --set $c DEFAULT heat_watch_server_url 'http://192.0.2.1:8003'
-crudini --set $c DEFAULT auth_encryption_key 'unset'
-
-crudini --set $c DEFAULT admin_tenant_name 'service'
-
-crudini --set $c ec2authtoken auth_uri 'http://192.0.2.1:5000/v2.0'
-
-rcopenstack-heat-api restart
-rcopenstack-heat-api-cfn restart
-rcopenstack-heat-engine restart
-
-
-##
-------------------------------------------------------------------------------
-## setup nova
-##
-------------------------------------------------------------------------------
-
-c=/etc/nova/nova.conf
-
-crudini --set $c baremetal arch 'x86_64'
-crudini --set $c baremetal power_manager
'nova.virt.baremetal.virtual_power_driver.VirtualPowerManager'
-#crudini --set $c baremetal power_manager
'nova.virt.baremetal.fake.FakePowerManager'
-crudini --set $c baremetal virtual_power_host_user 'stack'
-crudini --set $c baremetal virtual_power_host_key
'/opt/stack/boot-stack/virtual-power-key'
-crudini --set $c baremetal virtual_power_ssh_host '192.168.122.1'
-crudini --set $c baremetal virtual_power_type 'virsh'
-crudini --set $c baremetal virtual_power_libvirt_uri 'qemu:///system'
-crudini --set $c baremetal driver 'nova.virt.baremetal.pxe.PXE'
-crudini --set $c baremetal instance_type_extra_specs 'cpu_arch:x86_64'
-crudini --set $c baremetal sql_connection
'sqlite:////var/lib/nova/nova_bm.sqlite'
-crudini --set $c baremetal tftp_root '/srv/tftpboot'
-
-crudini --set $c DEFAULT host 'seed'
-crudini --set $c DEFAULT neutron_admin_password 'unset'
-crudini --set $c DEFAULT neutron_admin_tenant_name 'service'
-crudini --set $c DEFAULT metadata-proxy 'false'
-crudini --set $c DEFAULT service-password 'unset'
-crudini --set $c DEFAULT compute_driver 'baremetal.driver.BareMetalDriver'
-crudini --set $c DEFAULT my_ip '192.0.2.1'
-crudini --set $c DEFAULT firewall_driver
'nova.virt.firewall.NoopFirewallDriver'
-crudini --set $c DEFAULT scheduler_host_manager
'nova.scheduler.baremetal_host_manager.BaremetalHostManager'
-crudini --set $c DEFAULT ram_allocation_ratio '1.0'
-crudini --set $c DEFAULT reserved_host_memory_mb '0'
-
-# Enable baremetal related services
-mkdir -p /srv/tftpboot/pxelinux.cfg/
-cp /usr/share/syslinux/pxelinux.0 /srv/tftpboot/
-chown -R openstack-nova /srv/tftpboot
-
-dnsmasq --conf-file= --port=0 --enable-tftp --tftp-root=/srv/tftpboot \
- --dhcp-boot=pxelinux.0 --bind-interfaces --pid-file=/var/run/dnsmasq.pid \
- --interface=eth1 --dhcp-range=192.0.2.10,192.0.2.20
-
-# baremetal driver is used
-su openstack-nova -s /bin/sh -c "nova-baremetal-manage db sync"
-
-rcopenstack-nova-api restart
-rcopenstack-nova-scheduler restart
-rcopenstack-nova-conductor restart
-rcopenstack-nova-baremetal-deploy-helper restart
-rcopenstack-nova-compute restart
-
-for i in $(seq 1 10); do
- sleep 1
- nova list &> /dev/null && break
-done
-
-nova keypair-add --pub-key ~/.ssh/id_rsa.pub default
-
-# While we can't mix hypervisors, having non-baremetal flavors will just
-# confuse things.
-nova flavor-delete m1.tiny || true
-nova flavor-delete m1.small || true
-nova flavor-delete m1.medium || true
-nova flavor-delete m1.large || true
-nova flavor-delete m1.xlarge || true
-
-nova flavor-delete baremetal || true
-
-MEM=2048
-DISK=20
-CPU=1
-ARCH='x86_64'
-
-nova flavor-create baremetal auto $(($MEM/4)) $(($DISK/4)) $CPU
-nova flavor-key baremetal set "cpu_arch"="$ARCH" \
- "baremetal:deploy_kernel_id"="$deploy_kernel_id" \
- "baremetal:deploy_ramdisk_id"="$deploy_ramdisk_id"
-
-glance image-create --name undercloud --public --disk-format qcow2 \
- --container-format bare --property kernel_id="$deploy_kernel_id" \
- --property ramdisk_id="$deploy_ramdisk_id" --file /root/undercloud.qcow2
-
-##
-------------------------------------------------------------------------------
-## setup-neutron 192.0.2.2 192.0.2.3 192.0.2.0/24 192.0.2.1 ctlplane
-##
-------------------------------------------------------------------------------
-
-# Start of DHCP range
-ALLOCATION_START="192.0.2.2"
-# End of DHCP range
-ALLOCATION_END="192.0.2.3"
-# Network CIDR
-NETWORK_CIDR="192.0.2.0/24"
-# Where to route traffic
-NETWORK_GATEWAY="192.0.2.1"
-# If non-empty create a provider flat network with this name otherwise create a
-# virtual network and setup a router etc.
-PHYSICAL_NETWORK="ctlplane"
-# Start of floating range
-FLOATING_START=""
-# End of floating range
-FLOATING_END=""
-# Floating CIDR
-FLOATING_CIDR=""
-
-ALLOCATION_POOL="start=${ALLOCATION_START},end=${ALLOCATION_END}"
-
-TENANT_ID=$(keystone tenant-list | grep ' admin ' | awk '{print $2}')
-
-if [ -n "$PHYSICAL_NETWORK" ] ; then
- # Underclouds
- NET_NAME=$PHYSICAL_NETWORK
- NET_EXTRA="--tenant_id $TENANT_ID --provider:network_type flat
--provider:physical_network $PHYSICAL_NETWORK"
- SUBNET_EXTRA="--tenant_id $TENANT_ID"
-else
- # Overclouds
- NET_NAME="default-net"
- NET_EXTRA="--shared"
- SUBNET_EXTRA=""
-fi
-
-NET_ID=$(neutron net-create $NET_NAME $NET_EXTRA | grep ' id ' | awk '{print
$4}')
-SUBNET_ID=$(neutron subnet-create $SUBNET_EXTRA --ip_version 4
${ALLOCATION_POOL:+--allocation-pool $ALLOCATION_POOL}
${NETWORK_GATEWAY:+--gateway $NETWORK_GATEWAY} $NET_ID $NETWORK_CIDR | grep '
id ' | awk '{print $4}')
-
-if [ -z "$PHYSICAL_NETWORK" ] ; then
- neutron router-create default-router
- neutron router-interface-add default-router $SUBNET_ID
-fi
-
-if [ -n "$FLOATING_START" -a -n "$FLOATING_END" -a -n "$FLOATING_CIDR" ] ; then
- neutron net-create ext-net --router:external=True
- SUBNET_ID=$(neutron subnet-create ext-net $FLOATING_CIDR --disable-dhcp \
- --allocation-pool start=$FLOATING_START,end=$FLOATING_END)
- neutron router-gateway-set default-router ext-net
-fi
-
-
--
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
