openstack/manila-image-elements
Code Issues Proposed changes

Changes default behaviour for image creation script

Browse Source 
Commit ac84122598432fa1030a345e2b3b8caa193d6c96 refactoring
broke manila gate by changing the default behavior of the
image creation. The generic drivers requires CIFS+NFS, and
after this change the default image shipped NFS only.

This patch set adds a default value with CIFS+NFS.

Change-Id: Ia620c04f68d0a627b047616cf5a39e2ba681c77f
Closes-Bug: #1657121
This commit is contained in:
Victoria Martinez de la Cruz 2017-01-17 12:18:17 -03:00
parent 66ed94bade
commit e46c38a1b2
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.rst
View File

@ -36,7 +36,7 @@ You should only need to run this command:
tox -e buildimage
On completion, an Ubuntu minimal image with NFS will be available for use.
On completion, an Ubuntu minimal image with NFS+CIFS will be available for use.
Non-default image using tox
---------------------------

8
bin/manila-image-create
View File

@ -24,7 +24,7 @@ MANILA_IMG_OS_VER=${MANILA_IMG_OS_VER:-"trusty"}
MANILA_IMG_NAME=${MANILA_IMG_NAME:-"manila-service-image"}
# Manila image creation default
MANILA_SHARE_PROTO=${MANILA_SHARE_PROTO:-"nfs"}
MANILA_SHARE_PROTO=${MANILA_SHARE_PROTO:-"default"}
# Path to elements
SCRIPT_HOME="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
@ -100,7 +100,11 @@ configure() {
OPTIONAL_ELEMENTS=
OPTIONAL_DIB_ARGS=
if [ "$MANILA_SHARE_PROTO" = "nfs" ]; then
if [ "$MANILA_SHARE_PROTO" = "default" ]; then
# NOTE(vkmc) Generic driver uses 2 protocols by default
# NFS and CIFS. This is required by the gate.
OPTIONAL_ELEMENTS="$OPTIONAL_ELEMENTS manila-nfs manila-cifs"
elif [ "$MANILA_SHARE_PROTO" = "nfs" ]; then
OPTIONAL_ELEMENTS="$OPTIONAL_ELEMENTS manila-nfs"
elif [ "$MANILA_SHARE_PROTO" = "cifs" ]; then
OPTIONAL_ELEMENTS="$OPTIONAL_ELEMENTS manila-cifs"