Merge "Add ironic files to .gitignore"
diff --git a/.gitignore b/.gitignore
index 76ad830..2778a65 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,6 +12,7 @@
doc/build
files/*.gz
files/*.qcow2
+files/*.img
files/images
files/pip-*
files/get-pip.py*
diff --git a/README.md b/README.md
index 53de970..039ce3e 100644
--- a/README.md
+++ b/README.md
@@ -264,10 +264,10 @@
# Heat
-Heat is enabled by default (see `stackrc` file). To disable it explicitly
+Heat is disabled by default (see `stackrc` file). To enable it explicitly
you'll need the following settings in your `localrc` section:
- disable_service heat h-api h-api-cfn h-api-cw h-eng
+ enable_service heat h-api h-api-cfn h-api-cw h-eng
Heat can also run in standalone mode, and be configured to orchestrate
on an external OpenStack cloud. To launch only Heat in standalone mode
diff --git a/functions-common b/functions-common
index f442211..f8543c1 100644
--- a/functions-common
+++ b/functions-common
@@ -1256,8 +1256,13 @@
# sleep to allow bash to be ready to be send the command - we are
# creating a new window in screen and then sends characters, so if
- # bash isn't running by the time we send the command, nothing happens
- sleep 3
+ # bash isn't running by the time we send the command, nothing
+ # happens. This sleep was added originally to handle gate runs
+ # where we needed this to be at least 3 seconds to pass
+ # consistently on slow clouds. Now this is configurable so that we
+ # can determine a reasonable value for the local case which should
+ # be much smaller.
+ sleep ${SCREEN_SLEEP:-3}
NL=`echo -ne '\015'`
# This fun command does the following:
diff --git a/lib/neutron_plugins/ovs_base b/lib/neutron_plugins/ovs_base
index 2997c6c..51999c6 100644
--- a/lib/neutron_plugins/ovs_base
+++ b/lib/neutron_plugins/ovs_base
@@ -93,11 +93,8 @@
sudo ip link set $Q_PUBLIC_VETH_EX up
sudo ip addr flush dev $Q_PUBLIC_VETH_EX
else
- # --no-wait causes a race condition if $PUBLIC_BRIDGE is not up when ip addr flush is called
sudo ovs-vsctl -- --may-exist add-br $PUBLIC_BRIDGE
sudo ovs-vsctl br-set-external-id $PUBLIC_BRIDGE bridge-id $PUBLIC_BRIDGE
- # ensure no IP is configured on the public bridge
- sudo ip addr flush dev $PUBLIC_BRIDGE
fi
}
diff --git a/lib/rpc_backend b/lib/rpc_backend
index 2b7c6cb..288987c 100644
--- a/lib/rpc_backend
+++ b/lib/rpc_backend
@@ -273,6 +273,12 @@
iniset $file oslo_messaging_rabbit rabbit_hosts $RABBIT_HOST
iniset $file oslo_messaging_rabbit rabbit_password $RABBIT_PASSWORD
iniset $file oslo_messaging_rabbit rabbit_userid $RABBIT_USERID
+ if [ -n "$RABBIT_HEARTBEAT_TIMEOUT_THRESHOLD" ]; then
+ iniset $file oslo_messaging_rabbit heartbeat_timeout_threshold $RABBIT_HEARTBEAT_TIMEOUT_THRESHOLD
+ fi
+ if [ -n "$RABBIT_HEARTBEAT_RATE" ]; then
+ iniset $file oslo_messaging_rabbit heartbeat_rate $RABBIT_HEARTBEAT_RATE
+ fi
fi
}
diff --git a/stack.sh b/stack.sh
index 9ecc49c..5cdcbdf 100755
--- a/stack.sh
+++ b/stack.sh
@@ -1214,6 +1214,10 @@
elif is_service_enabled $DATABASE_BACKENDS && is_service_enabled n-net; then
NM_CONF=${NOVA_CONF}
if is_service_enabled n-cell; then
+ # Both cells should have the same network uuid for server create
+ if [[ ! "$NETWORK_CREATE_ARGS" =~ "--uuid" ]]; then
+ NETWORK_CREATE_ARGS="$NETWORK_CREATE_ARGS --uuid $(uuidgen)"
+ fi
# Create a small network in the API cell
$NOVA_BIN_DIR/nova-manage --config-file $NM_CONF network create "$PRIVATE_NETWORK_NAME" $FIXED_RANGE 1 $FIXED_NETWORK_SIZE $NETWORK_CREATE_ARGS
# Everything else should go in the child cell