diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-08-09 17:14:24 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-08-09 17:14:24 +0000 |
| commit | a1a3b55a06ac6effa94563b10b5adf5950392df2 (patch) | |
| tree | 3a9308df1afdf015db8c8a7635299bf4236ce708 /docker/common/nova/nova-network | |
| parent | bb03d5f6bffa1d6f8195d7a1b0561c2026c95963 (diff) | |
| parent | d6cdd9da20ca3337af9ec7bc3abc04221627c236 (diff) | |
| download | kolla-a1a3b55a06ac6effa94563b10b5adf5950392df2.tar.gz kolla-a1a3b55a06ac6effa94563b10b5adf5950392df2.zip | |
Merge "Remove config-internal for nova"
Diffstat (limited to 'docker/common/nova/nova-network')
| -rwxr-xr-x | docker/common/nova/nova-network/config-internal.sh | 8 | ||||
| -rwxr-xr-x | docker/common/nova/nova-network/config-nova-network.sh | 30 | ||||
| -rwxr-xr-x | docker/common/nova/nova-network/start.sh | 2 |
3 files changed, 1 insertions, 39 deletions
diff --git a/docker/common/nova/nova-network/config-internal.sh b/docker/common/nova/nova-network/config-internal.sh deleted file mode 100755 index 92381b720..000000000 --- a/docker/common/nova/nova-network/config-internal.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/bash - -set -e - -. /opt/kolla/config-nova-network.sh - -# Start nova-network -exec /usr/bin/nova-network --config-file /etc/nova/nova.conf diff --git a/docker/common/nova/nova-network/config-nova-network.sh b/docker/common/nova/nova-network/config-nova-network.sh deleted file mode 100755 index 6976d3a20..000000000 --- a/docker/common/nova/nova-network/config-nova-network.sh +++ /dev/null @@ -1,30 +0,0 @@ -#!/bin/bash - -. /opt/kolla/config-nova.sh - -cfg=/etc/nova/nova.conf - -# configure logging -crudini --set $cfg DEFAULT log_file "${NOVA_NETWORK_LOG_FILE}" - -# Configure eth1 as a physcial interface for nova flat network -cat > /etc/sysconfig/network-scripts/ifcfg-$FLAT_INTERFACE <<EOF -DEVICE="$FLAT_INTERFACE" -BOOTPROTO="none" -ONBOOT="yes" -TYPE="Ethernet" -EOF - -/usr/sbin/ifup $FLAT_INTERFACE - -cfg=/etc/nova/nova.conf - -crudini --set $cfg DEFAULT network_manager nova.network.manager.FlatDHCPManager -crudini --set $cfg DEFAULT firewall_driver nova.virt.libvirt.firewall.IptablesFirewallDriver -crudini --set $cfg DEFAULT network_size 254 -crudini --set $cfg DEFAULT allow_same_net_traffic False -crudini --set $cfg DEFAULT multi_host True -crudini --set $cfg DEFAULT send_arp_for_ha True -crudini --set $cfg DEFAULT share_dhcp_address True -crudini --set $cfg DEFAULT force_dhcp_release True -crudini --set $cfg DEFAULT flat_network_bridge br100 diff --git a/docker/common/nova/nova-network/start.sh b/docker/common/nova/nova-network/start.sh index b6faa8215..88f941b33 100755 --- a/docker/common/nova/nova-network/start.sh +++ b/docker/common/nova/nova-network/start.sh @@ -7,7 +7,7 @@ ARGS="" # Loading common functions. source /opt/kolla/kolla-common.sh -# Config-internal script exec out of this function, it does not return here. +# Execute config strategy set_configs exec $CMD $ARGS |
