magnum_devstack_setup

devstack_git_log

/opt/stack/devstack# git log --oneline
b01a3c3 Merge "Followup comment fix from alt_demo user creation"
c6b5fe3 Merge "Skip ovs_ and ebtables_dump if needed commands not present"
6c888d2 Merge "localize user/project variables in tempest"

devstack_neutron_changes

# git status
On branch neutron_lib_fixup
Changes not staged for commit:
  (use "git add <file>..." to update what will be committed)
  (use "git checkout -- <file>..." to discard changes in working directory)

	modified:   lib/neutron-legacy

no changes added to commit (use "git add" and/or "git commit -a")
root@kolla28:/opt/stack/devstack# git diff -w
diff --git a/lib/neutron-legacy b/lib/neutron-legacy
index 7d6e881..59a6e9e 100644
--- a/lib/neutron-legacy
+++ b/lib/neutron-legacy
@@ -1372,12 +1372,14 @@ function _neutron_configure_router_v4 {
             local testcmd="ip -o link | grep -q $ext_gw_interface"
             test_with_retry "$testcmd" "$ext_gw_interface creation failed"
             if [[ $(ip addr show dev $ext_gw_interface | grep -c $ext_gw_ip) == 0 && ( $Q_USE_PROVIDERNET_FOR_PUBLIC == "False" || $Q_USE_PUBLIC_VETH
-                sudo ip addr add $ext_gw_ip/$cidr_len dev $ext_gw_interface
+                #sudo ip addr add $ext_gw_ip/$cidr_len dev $ext_gw_interface
+                echo *** SKIPPING SETTING OF IP ADDR ON $ext_gw_inerface ***
                 sudo ip link set $ext_gw_interface up
             fi
             ROUTER_GW_IP=`neutron port-list -c fixed_ips -c device_owner | grep router_gateway | awk -F'ip_address'  '{ print $2 }' | cut -f3 -d\" | 
             die_if_not_set $LINENO ROUTER_GW_IP "Failure retrieving ROUTER_GW_IP"
-            sudo ip route replace  $FIXED_RANGE via $ROUTER_GW_IP
+            echo *** SKIPPING ROUTE REPLACE FOR FIXED_RANGE $FIXED_RANGE ***
+            #sudo ip route replace  $FIXED_RANGE via $ROUTER_GW_IP
         fi
         _neutron_set_router_id
     fi

local.conf

# Note: Some setting are specific to my dev env. Pls review carefully.
# cat /opt/stack/devstack/local.conf 
[[local|localrc]]
VOLUME_BACKING_FILE_SIZE=100G
HOST_IP=172.29.74.86
MYSQL_PASSWORD=nova
RABBIT_PASSWORD=nova
SERVICE_TOKEN=nova
SERVICE_PASSWORD=nova
ADMIN_PASSWORD=nova
DATABASE_PASSWORD=nova
RABBIT_PASSWORD=nova
SERVICE_TOKEN=nova
ENABLED_SERVICES=g-api,g-reg,key,n-api,n-crt,n-obj,n-cpu,n-cond,cinder,c-sch,c-api,c-vol,n-sch,n-novnc,n-xvnc,n-cauth,horizon,rabbit
enable_service mysql
disable_service n-net
enable_service q-svc
enable_service q-agt
enable_service q-l3
enable_service q-dhcp
enable_service q-meta
enable_service neutron
enable_service heat
FIXED_RANGE=192.168.0.0/24
NETWORK_GATEWAY=192.168.0.1
Q_FLOATING_ALLOCATION_POOL=start=10.30.118.132,end=10.30.118.152
FLOATING_RANGE=10.30.118.128/27
PUBLIC_NETWORK_GATEWAY=10.30.118.129
NOVA_USE_QUANTUM_API=v2
VERBOSE=True
DEBUG=True
#LOG_COLOR=False
LOGFILE=/opt/stack/logs/stack.sh.log
SCREEN_LOGDIR=/opt/stack/logs
#RECLONE=no
#OFFLINE=True
enable_plugin magnum https://github.com/openstack/magnum
PUBLIC_INTERFACE=p6p1

magnum_git_log

git log --oneline
b0b3a3d Init oslo_context before magnum context init
6fbae6c Merge "Add trust info into heat params"
b7b2535 Merge "Create a trustee user for each bay"