Merge "bifrost: test-bifrost-deployment.sh: Use the new 'openssh-server' dib element"

diff --combined prototypes/bifrost/scripts/test-bifrost-deployment.sh
index 6e751fe,3f759d1..90f014c
--- 1/prototypes/bifrost/scripts/test-bifrost-deployment.sh
--- 2/prototypes/bifrost/scripts/test-bifrost-deployment.sh
+++ b/prototypes/bifrost/scripts/test-bifrost-deployment.sh
@@@ -18,7 -18,7 +18,7 @@@ ENABLE_VENV="false
  USE_DHCP="false"
  USE_VENV="false"
  BUILD_IMAGE=true
 -PROVISION_WAIT_TIMEOUT=${PROVISION_WAIT_TIMEOUT:-2400}
 +PROVISION_WAIT_TIMEOUT=${PROVISION_WAIT_TIMEOUT:-3600}
  
  # Set defaults for ansible command-line options to drive the different
  # tests.
@@@ -62,11 -62,11 +62,11 @@@ export DIB_DEV_USER_PASSWORD=devuse
  export DIB_OS_RELEASE=${DIB_OS_RELEASE:-trusty}
  export DIB_OS_ELEMENT=${DIB_OS_ELEMENT:-ubuntu-minimal}
  
- # for centos 7: "openssh-server,vim,less,bridge-utils,iputils,rsyslog,curl"
- export DIB_OS_PACKAGES=${DIB_OS_PACKAGES:-"openssh-server,vlan,vim,less,bridge-utils,language-pack-en,iputils-ping,rsyslog,curl"}
+ # for centos 7: "vim,less,bridge-utils,iputils,rsyslog,curl"
+ export DIB_OS_PACKAGES=${DIB_OS_PACKAGES:-"vlan,vim,less,bridge-utils,language-pack-en,iputils-ping,rsyslog,curl"}
  
  # Additional dib elements
- export EXTRA_DIB_ELEMENTS=${EXTRA_DIB_ELEMENTS:-}
+ export EXTRA_DIB_ELEMENTS=${EXTRA_DIB_ELEMENTS:-"openssh-server"}
  
  # Source Ansible
  # NOTE(TheJulia): Ansible stable-1.9 source method tosses an error deep