summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-03-24 14:36:18 +0000
committerGerrit Code Review <review@openstack.org>2016-03-24 14:36:18 +0000
commiteab4cbd1e1d8b9374b448dbe447ecd5deee9b5a7 (patch)
treebc4136aa3594340f939bfbed9830635178947c49
parent2a2f949c3f9f22791c91ac04355d7b9bd0b50522 (diff)
parent192fe804fab054a518d1d0556ed04ef50415834d (diff)
Merge "MOS8.0 Make changes to let it work with liberty 1. change glance image-create command's param 2. fix file injection problem"
-rwxr-xr-xdeployment_scripts/compute_post_deployment.py2
-rwxr-xr-xdeployment_scripts/controller_post_deployment.sh4
2 files changed, 3 insertions, 3 deletions
diff --git a/deployment_scripts/compute_post_deployment.py b/deployment_scripts/compute_post_deployment.py
index c078990..df81efc 100755
--- a/deployment_scripts/compute_post_deployment.py
+++ b/deployment_scripts/compute_post_deployment.py
@@ -181,7 +181,7 @@ def create_novacompute_conf(himn, username, password, public_ip):
181 template = '\n'.join([ 181 template = '\n'.join([
182 '[DEFAULT]', 182 '[DEFAULT]',
183 'compute_driver=xenapi.XenAPIDriver', 183 'compute_driver=xenapi.XenAPIDriver',
184 'force_config_drive=always', 184 'force_config_drive=True',
185 'novncproxy_base_url=https://%s:6080/vnc_auto.html', 185 'novncproxy_base_url=https://%s:6080/vnc_auto.html',
186 'vncserver_proxyclient_address=%s', 186 'vncserver_proxyclient_address=%s',
187 '[xenserver]', 187 '[xenserver]',
diff --git a/deployment_scripts/controller_post_deployment.sh b/deployment_scripts/controller_post_deployment.sh
index af77651..f52b4f4 100755
--- a/deployment_scripts/controller_post_deployment.sh
+++ b/deployment_scripts/controller_post_deployment.sh
@@ -31,7 +31,7 @@ function create_image {
31 --container-format ovf \ 31 --container-format ovf \
32 --disk-format vhd \ 32 --disk-format vhd \
33 --property vm_mode="$vm_mode" \ 33 --property vm_mode="$vm_mode" \
34 --is-public True \ 34 --visibility public \
35 --file "$image_file" \ 35 --file "$image_file" \
36 &>> $LOG_FILE 36 &>> $LOG_FILE
37 37
@@ -64,4 +64,4 @@ create_image "TestVM" "xen" "http://ca.downloads.xensource.com/OpenStack/cirros-
64create_image "F17-x86_64-cfntools" "hvm" "http://ca.downloads.xensource.com/OpenStack/F21-x86_64-cfntools.tgz" 64create_image "F17-x86_64-cfntools" "hvm" "http://ca.downloads.xensource.com/OpenStack/F21-x86_64-cfntools.tgz"
65glance image-list >> $LOG_FILE 65glance image-list >> $LOG_FILE
66 66
67mod_novnc \ No newline at end of file 67mod_novnc