Merge "Add new oslo libraries"
diff --git a/doc/source/configuration.rst b/doc/source/configuration.rst
index 8e2e7ff..e91012f 100644
--- a/doc/source/configuration.rst
+++ b/doc/source/configuration.rst
@@ -201,7 +201,7 @@
| *Defaults: ``LOGFILE="" LOGDAYS=7 LOG_COLOR=True``*
| By default ``stack.sh`` output is only written to the console
- where is runs. It can be sent to a file in addition to the console
+ where it runs. It can be sent to a file in addition to the console
by setting ``LOGFILE`` to the fully-qualified name of the
destination log file. A timestamp will be appended to the given
filename for each run of ``stack.sh``.
diff --git a/lib/ceilometer b/lib/ceilometer
index d7888d9..ed9b933 100644
--- a/lib/ceilometer
+++ b/lib/ceilometer
@@ -341,7 +341,7 @@
fi
if [[ "$VIRT_DRIVER" = 'vsphere' ]]; then
- pip_instal_gr oslo.vmware
+ pip_install_gr oslo.vmware
fi
fi
diff --git a/lib/ironic b/lib/ironic
index 40a3460..cff20c9 100644
--- a/lib/ironic
+++ b/lib/ironic
@@ -658,6 +658,10 @@
# agent ramdisk gets instance image from swift
sudo iptables -I INPUT -d $HOST_IP -p tcp --dport ${SWIFT_DEFAULT_BIND_PORT:-8080} -j ACCEPT || true
fi
+
+ if [[ "$IRONIC_IPXE_ENABLED" == "True" ]] ; then
+ sudo iptables -I INPUT -d $HOST_IP -p tcp --dport $IRONIC_HTTP_PORT -j ACCEPT || true
+ fi
}
function configure_tftpd {
diff --git a/lib/tempest b/lib/tempest
index 5ea217f..a84ade2 100644
--- a/lib/tempest
+++ b/lib/tempest
@@ -379,6 +379,7 @@
iniset $TEMPEST_CONFIG compute-feature-enabled preserve_ports True
# TODO(gilliard): Remove the live_migrate_paused_instances flag when Juno is end of life.
iniset $TEMPEST_CONFIG compute-feature-enabled live_migrate_paused_instances True
+ iniset $TEMPEST_CONFIG compute-feature-enabled attach_encrypted_volume ${ATTACH_ENCRYPTED_VOLUME_AVAILABLE:-True}
# Network
iniset $TEMPEST_CONFIG network api_version 2.0
diff --git a/tools/worlddump.py b/tools/worlddump.py
index 0f1a6a1..628a69f 100755
--- a/tools/worlddump.py
+++ b/tools/worlddump.py
@@ -47,7 +47,7 @@
print cmd
print "-" * len(cmd)
print
- subprocess.Popen(cmd, shell=True)
+ Popen(cmd, shell=True)
def _header(name):