@@ -278,11 +278,6 @@ SWIFT3_DIR=$DEST/swift3
278278# https://bugs.launchpad.net/ubuntu/+source/linux/+bug/1023755
279279CINDER_SECURE_DELETE=` trueorfalse True $CINDER_SECURE_DELETE `
280280
281- # Name of the LVM volume group to use/create for iscsi volumes
282- VOLUME_GROUP=${VOLUME_GROUP:- stack-volumes}
283- VOLUME_NAME_PREFIX=${VOLUME_NAME_PREFIX:- volume-}
284- INSTANCE_NAME_PREFIX=${INSTANCE_NAME_PREFIX:- instance-}
285-
286281# Generic helper to configure passwords
287282function read_password {
288283 XTRACE=$( set +o | grep xtrace)
@@ -326,64 +321,6 @@ function read_password {
326321}
327322
328323
329- # Nova Network Configuration
330- # --------------------------
331-
332- # FIXME: more documentation about why these are important options. Also
333- # we should make sure we use the same variable names as the option names.
334-
335- if [ " $VIRT_DRIVER " = ' xenserver' ]; then
336- PUBLIC_INTERFACE_DEFAULT=eth3
337- # Allow ``build_domU.sh`` to specify the flat network bridge via kernel args
338- FLAT_NETWORK_BRIDGE_DEFAULT=$( grep -o ' flat_network_bridge=[[:alnum:]]*' /proc/cmdline | cut -d= -f 2 | sort -u)
339- GUEST_INTERFACE_DEFAULT=eth1
340- elif [ " $VIRT_DRIVER " = ' baremetal' ]; then
341- PUBLIC_INTERFACE_DEFAULT=eth0
342- FLAT_NETWORK_BRIDGE_DEFAULT=br100
343- FLAT_INTERFACE=${FLAT_INTERFACE:- eth0}
344- FORCE_DHCP_RELEASE=${FORCE_DHCP_RELEASE:- False}
345- NET_MAN=${NET_MAN:- FlatManager}
346- STUB_NETWORK=${STUB_NETWORK:- False}
347- else
348- PUBLIC_INTERFACE_DEFAULT=br100
349- FLAT_NETWORK_BRIDGE_DEFAULT=br100
350- GUEST_INTERFACE_DEFAULT=eth0
351- fi
352-
353- PUBLIC_INTERFACE=${PUBLIC_INTERFACE:- $PUBLIC_INTERFACE_DEFAULT }
354- NET_MAN=${NET_MAN:- FlatDHCPManager}
355- EC2_DMZ_HOST=${EC2_DMZ_HOST:- $SERVICE_HOST }
356- FLAT_NETWORK_BRIDGE=${FLAT_NETWORK_BRIDGE:- $FLAT_NETWORK_BRIDGE_DEFAULT }
357- VLAN_INTERFACE=${VLAN_INTERFACE:- $GUEST_INTERFACE_DEFAULT }
358- FORCE_DHCP_RELEASE=${FORCE_DHCP_RELEASE:- True}
359-
360- # Test floating pool and range are used for testing. They are defined
361- # here until the admin APIs can replace nova-manage
362- TEST_FLOATING_POOL=${TEST_FLOATING_POOL:- test}
363- TEST_FLOATING_RANGE=${TEST_FLOATING_RANGE:- 192.168.253.0/ 29}
364-
365- # ``MULTI_HOST`` is a mode where each compute node runs its own network node. This
366- # allows network operations and routing for a VM to occur on the server that is
367- # running the VM - removing a SPOF and bandwidth bottleneck.
368- MULTI_HOST=` trueorfalse False $MULTI_HOST `
369-
370- # If you are using the FlatDHCP network mode on multiple hosts, set the
371- # ``FLAT_INTERFACE`` variable but make sure that the interface doesn't already
372- # have an IP or you risk breaking things.
373- #
374- # **DHCP Warning**: If your flat interface device uses DHCP, there will be a
375- # hiccup while the network is moved from the flat interface to the flat network
376- # bridge. This will happen when you launch your first instance. Upon launch
377- # you will lose all connectivity to the node, and the VM launch will probably
378- # fail.
379- #
380- # If you are running on a single node and don't need to access the VMs from
381- # devices other than that node, you can set ``FLAT_INTERFACE=``
382- # This will stop nova from bridging any interfaces into ``FLAT_NETWORK_BRIDGE``.
383- FLAT_INTERFACE=${FLAT_INTERFACE-$GUEST_INTERFACE_DEFAULT }
384-
385- # # FIXME(ja): should/can we check that FLAT_INTERFACE is sane?
386-
387324# Database Configuration
388325# ----------------------
389326
@@ -983,48 +920,6 @@ if is_service_enabled nova; then
983920 elif is_service_enabled n-net; then
984921 create_nova_conf_nova_network
985922 fi
986- # All nova-compute workers need to know the vnc configuration options
987- # These settings don't hurt anything if n-xvnc and n-novnc are disabled
988- if is_service_enabled n-cpu; then
989- NOVNCPROXY_URL=${NOVNCPROXY_URL:- " http://$SERVICE_HOST :6080/vnc_auto.html" }
990- iniset $NOVA_CONF DEFAULT novncproxy_base_url " $NOVNCPROXY_URL "
991- XVPVNCPROXY_URL=${XVPVNCPROXY_URL:- " http://$SERVICE_HOST :6081/console" }
992- iniset $NOVA_CONF DEFAULT xvpvncproxy_base_url " $XVPVNCPROXY_URL "
993- SPICEHTML5PROXY_URL=${SPICEHTML5PROXY_URL:- " http://$SERVICE_HOST :6082/spice_auto.html" }
994- iniset $NOVA_CONF spice html5proxy_base_url " $SPICEHTML5PROXY_URL "
995- fi
996- if [ " $VIRT_DRIVER " = ' xenserver' ]; then
997- VNCSERVER_PROXYCLIENT_ADDRESS=${VNCSERVER_PROXYCLIENT_ADDRESS=169.254.0.1}
998- else
999- VNCSERVER_PROXYCLIENT_ADDRESS=${VNCSERVER_PROXYCLIENT_ADDRESS=127.0.0.1}
1000- fi
1001-
1002- if is_service_enabled n-novnc || is_service_enabled n-xvnc ; then
1003- # Address on which instance vncservers will listen on compute hosts.
1004- # For multi-host, this should be the management ip of the compute host.
1005- VNCSERVER_LISTEN=${VNCSERVER_LISTEN=127.0.0.1}
1006- iniset $NOVA_CONF DEFAULT vnc_enabled true
1007- iniset $NOVA_CONF DEFAULT vncserver_listen " $VNCSERVER_LISTEN "
1008- iniset $NOVA_CONF DEFAULT vncserver_proxyclient_address " $VNCSERVER_PROXYCLIENT_ADDRESS "
1009- else
1010- iniset $NOVA_CONF DEFAULT vnc_enabled false
1011- fi
1012-
1013- if is_service_enabled n-spice; then
1014- # Address on which instance spiceservers will listen on compute hosts.
1015- # For multi-host, this should be the management ip of the compute host.
1016- SPICESERVER_PROXYCLIENT_ADDRESS=${SPICESERVER_PROXYCLIENT_ADDRESS=127.0.0.1}
1017- SPICESERVER_LISTEN=${SPICESERVER_LISTEN=127.0.0.1}
1018- iniset $NOVA_CONF spice enabled true
1019- iniset $NOVA_CONF spice server_listen " $SPICESERVER_LISTEN "
1020- iniset $NOVA_CONF spice server_proxyclient_address " $SPICESERVER_PROXYCLIENT_ADDRESS "
1021- else
1022- iniset $NOVA_CONF spice enabled false
1023- fi
1024-
1025- iniset $NOVA_CONF DEFAULT ec2_dmz_host " $EC2_DMZ_HOST "
1026- iniset_rpc_backend nova $NOVA_CONF DEFAULT
1027- iniset $NOVA_CONF DEFAULT glance_api_servers " $GLANCE_HOSTPORT "
1028923
1029924
1030925 # XenServer
0 commit comments