gistfile1.diff

diff --git a/scripts/files/elements/ubuntu-percona/pre-install.d/10-percona-apt-key b/scripts/files/elements/ubuntu-pe
index 7db291c..9133c37 100755
--- a/scripts/files/elements/ubuntu-percona/pre-install.d/10-percona-apt-key
+++ b/scripts/files/elements/ubuntu-percona/pre-install.d/10-percona-apt-key
@@ -14,7 +14,7 @@ if [ ! -e /home/${GUEST_USERNAME}/.gnupg ]; then
     mkdir -p /home/${GUEST_USERNAME}/.gnupg
 fi

-apt-key adv --keyserver hkp://keys.gnupg.net --recv-keys 1C4CBDCDCD2EFD2A
+apt-key adv --keyserver hkp://keys.gnupg.net:80 --recv-keys 1C4CBDCDCD2EFD2A

 # add Percona repo
 # creates the percona sources list
diff --git a/scripts/redstack.rc b/scripts/redstack.rc
index 7cec701..7e6deb8 100644
--- a/scripts/redstack.rc
+++ b/scripts/redstack.rc
@@ -23,8 +23,8 @@ PATH_DISKIMAGEBUILDER=$DEST/diskimage-builder
 PATH_TRIPLEO_ELEMENTS=$DEST/tripleo-image-elements

 # Devstack and OpenStack git repo source path
-REPO_DEVSTACK=git://git.openstack.org/openstack-dev/devstack.git
-OPENSTACK_GITSOURCE=git://git.openstack.org/openstack
+REPO_DEVSTACK=${REPO_DEVSTACK:-git://git.openstack.org/openstack-dev/devstack.git}
+OPENSTACK_GITSOURCE=${OPENSTACK_GITSOURCE:-git://git.openstack.org/openstack}

 # Destination for working data
 DATA_DIR=${DEST}/data