From 64d6d2d24bf99d428f6e0a076f92ce7aaa3fdda3 Mon Sep 17 00:00:00 2001 From: Bob Ball Date: Wed, 17 Feb 2016 15:21:16 +0000 Subject: [PATCH] Fix dom0_mem syntax; readme update --- install_master.sh | 1 + nodepool/scripts/prepare_node_devstack_xen.sh | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/install_master.sh b/install_master.sh index e66ae0d..2f323bc 100644 --- a/install_master.sh +++ b/install_master.sh @@ -34,6 +34,7 @@ DATA_PATH=/root/os-ext-data # 6) The jobs need an additional plugin in Jenkins to generate correctly, so: # -- Install Post-Build Script jenkins plugin (including restarting Jenkins) # -- Regenerate jenkins jobs: jenkins-jobs update --delete-old /etc/jenkins_jobs/config +# -- Enable HTML: Manage Jenkins -> Configure Global Security -> Markup Formatter -> Raw HTML # 7) Start processes # -- service zuul start; service zuul-merger start # -- Wait for a bit, check there are 3 zuul processes (1 merger, 2 servers) diff --git a/nodepool/scripts/prepare_node_devstack_xen.sh b/nodepool/scripts/prepare_node_devstack_xen.sh index b4aedeb..660de05 100644 --- a/nodepool/scripts/prepare_node_devstack_xen.sh +++ b/nodepool/scripts/prepare_node_devstack_xen.sh @@ -20,7 +20,7 @@ EOC sudo mv /etc/default/grub.d/xen.cfg{,.bak} sudo tee /etc/default/grub.d/xen.cfg << EOC echo "Including Xen overrides from /etc/default/grub.d/xen.cfg" -GRUB_CMDLINE_XEN="dom0_mem=7680M:max=7680M dom0_max_vcpus=4 max-console=vga" +GRUB_CMDLINE_XEN="dom0_mem=7680M,max:7680M dom0_max_vcpus=4 max-console=vga" GRUB_DEFAULT="Ubuntu GNU/Linux, with Xen hypervisor" EOC -- 2.39.5