summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarkos Chandras <mchandras@suse.de>2016-11-29 18:21:51 +0000
committerMarkos Chandras <mchandras@suse.de>2016-11-30 19:08:55 +0000
commit427e7a84cec1c732553bcd5c6a0327593d644656 (patch)
treec58b9aaff4492381c96daf0033a73a533a9c4079
parent8234e8264f51c03e58085e2c3765011802767ab8 (diff)
bifrost: test-bifrost-deployment.sh: Use the new 'openssh-server' dib element
This is a follow-up for b0a9b75e7481a24676c9488f17583c13b8b8026e ("Make use of the new 'openssh-server' dib element"). Remove the openssh-server package from the default packages and use the 'openssh-server' element instead. Change-Id: Ie14cdf93769ebefcae00f35d9e1ac149a31e7711 Signed-off-by: Markos Chandras <mchandras@suse.de>
-rwxr-xr-xprototypes/bifrost/scripts/test-bifrost-deployment.sh6
1 files changed, 3 insertions, 3 deletions
diff --git a/prototypes/bifrost/scripts/test-bifrost-deployment.sh b/prototypes/bifrost/scripts/test-bifrost-deployment.sh
index 63d851438..3f759d182 100755
--- a/prototypes/bifrost/scripts/test-bifrost-deployment.sh
+++ b/prototypes/bifrost/scripts/test-bifrost-deployment.sh
@@ -62,11 +62,11 @@ export DIB_DEV_USER_PASSWORD=devuser
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