openstack/project-config
Code Issues Proposed changes

Merge "XenServer: Enable injection of XVA and ISO urls"

Browse Source
This commit is contained in:
Jenkins 2014-12-23 17:17:25 +00:00 committed by Gerrit Code Review
commit ed9dd54128
2 changed files with 7 additions and 3 deletions

2
nodepool/scripts/convert_node_to_xenserver.sh

@ -72,9 +72,9 @@ LOG_FILE="${THIS_FILE}.log"
ADDITIONAL_PARAMETERS="$@"
XENSERVER_PASSWORD="$1"
XENSERVER_ISO_URL="http://downloadns.citrix.com.edgesuite.net/akdlm/8159/XenServer-6.2.0-install-cd.iso"
STAGING_APPLIANCE_URL="$2"
APPLIANCE_NAME="$3"
XENSERVER_ISO_URL="$4"
FILE_TO_TOUCH_ON_COMPLETION="/var/run/xenserver.ready"
# It is assumed, that the appliance has a user, DOMZERO_USER, and by

8
nodepool/scripts/install_xenserver.sh

@ -17,7 +17,11 @@
# See the License for the specific language governing permissions and
# limitations under the License.
XENSERVER_XVA_URL=${NODEPOOL_XENSERVER_XVA_URL:-http://downloads.vmd.citrix.com/OpenStack/xenapi-in-the-cloud-appliances/prod_ci}
XENSERVER_ISO_URL=${NODEPOOL_XENSERVER_ISO_URL:-http://downloadns.citrix.com.edgesuite.net/akdlm/8159/XenServer-6.2.0-install-cd.iso}
./convert_node_to_xenserver.sh \
password \
http://downloads.vmd.citrix.com/OpenStack/xenapi-in-the-cloud-appliances/1.1.4.xva \
devstack
"$XENSERVER_XVA_URL" \
devstack \
"$XENSERVER_ISO_URL"