Merge "Adapt compute node local.conf to OVN"
diff --git a/.zuul.yaml b/.zuul.yaml
index 248a56b..5a58d74 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -619,7 +619,9 @@
# Keep enabeling the services here to run with system scope
CINDER_ENFORCE_SCOPE: true
GLANCE_ENFORCE_SCOPE: true
- NEUTRON_ENFORCE_SCOPE: true
+ # TODO(slaweq): Enable enforce scopes in Neutron when bug
+ # https://bugs.launchpad.net/neutron/+bug/1959196 will be fixed
+ # NEUTRON_ENFORCE_SCOPE: true
- job:
name: devstack-multinode
diff --git a/doc/source/guides/multinode-lab.rst b/doc/source/guides/multinode-lab.rst
index f62e7a9..81c5945 100644
--- a/doc/source/guides/multinode-lab.rst
+++ b/doc/source/guides/multinode-lab.rst
@@ -395,7 +395,7 @@
3. Verify that login via ssh works without a password::
- ssh -i /root/.ssh/id_rsa.pub stack@DESTINATION
+ ssh -i /root/.ssh/id_rsa stack@DESTINATION
In essence, this means that every compute node's root user's public RSA key
must exist in every other compute node's stack user's authorized_keys file and
diff --git a/tools/install_pip.sh b/tools/install_pip.sh
index 259375a..e9c52ea 100755
--- a/tools/install_pip.sh
+++ b/tools/install_pip.sh
@@ -38,7 +38,7 @@
# [1] https://opendev.org/openstack/project-config/src/branch/master/nodepool/elements/cache-devstack/source-repository-pip
PIP_GET_PIP_URL=${PIP_GET_PIP_URL:-"https://bootstrap.pypa.io/get-pip.py"}
-LOCAL_PIP="$FILES/$(basename $PIP_GET_PIP_URL)"
+PIP_GET_PIP36_URL=${PIP_GET_PIP36_URL:-"https://bootstrap.pypa.io/pip/3.6/get-pip.py"}
GetDistro
echo "Distro: $DISTRO"
@@ -57,12 +57,21 @@
function install_get_pip {
+ if [[ "$PYTHON3_VERSION" = "3.6" ]]; then
+ _pip_url=$PIP_GET_PIP36_URL
+ _local_pip="$FILES/$(basename $_pip_url)-py36"
+ else
+ _pip_url=$PIP_GET_PIP_URL
+ _local_pip="$FILES/$(basename $_pip_url)"
+ fi
+
+
# If get-pip.py isn't python, delete it. This was probably an
# outage on the server.
- if [[ -r $LOCAL_PIP ]]; then
- if ! head -1 $LOCAL_PIP | grep -q '#!/usr/bin/env python'; then
- echo "WARNING: Corrupt $LOCAL_PIP found removing"
- rm $LOCAL_PIP
+ if [[ -r $_local_pip ]]; then
+ if ! head -1 $_local_pip | grep -q '#!/usr/bin/env python'; then
+ echo "WARNING: Corrupt $_local_pip found removing"
+ rm $_local_pip
fi
fi
@@ -76,20 +85,20 @@
# Thus we use curl's "-z" feature to always check the modified
# since and only download if a new version is out -- but only if
# it seems we downloaded the file originally.
- if [[ ! -r $LOCAL_PIP || -r $LOCAL_PIP.downloaded ]]; then
+ if [[ ! -r $_local_pip || -r $_local_pip.downloaded ]]; then
# only test freshness if LOCAL_PIP is actually there,
# otherwise we generate a scary warning.
local timecond=""
- if [[ -r $LOCAL_PIP ]]; then
- timecond="-z $LOCAL_PIP"
+ if [[ -r $_local_pip ]]; then
+ timecond="-z $_local_pip"
fi
curl -f --retry 6 --retry-delay 5 \
- $timecond -o $LOCAL_PIP $PIP_GET_PIP_URL || \
+ $timecond -o $_local_pip $_pip_url || \
die $LINENO "Download of get-pip.py failed"
- touch $LOCAL_PIP.downloaded
+ touch $_local_pip.downloaded
fi
- sudo -H -E python${PYTHON3_VERSION} $LOCAL_PIP
+ sudo -H -E python${PYTHON3_VERSION} $_local_pip
}
@@ -129,6 +138,8 @@
# For general sanity, we just use the packaged pip. It should be
# recent enough anyway. This is included via rpms/general
: # Simply fall through
+elif is_ubuntu; then
+ : # pip on Ubuntu 20.04 is new enough, too
else
install_get_pip
fi