From 5327c8515fceb3c14d447bda5daa83a7f0492d52 Mon Sep 17 00:00:00 2001 From: athlonxpgzw Date: Fri, 22 Apr 2016 16:51:55 +0800 Subject: [PATCH 1/7] Update main.yml Modified default_vcpu of the berametal VM --- playbooks/roles/common/defaults/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/playbooks/roles/common/defaults/main.yml b/playbooks/roles/common/defaults/main.yml index a23e385..6f72752 100644 --- a/playbooks/roles/common/defaults/main.yml +++ b/playbooks/roles/common/defaults/main.yml @@ -7,7 +7,7 @@ local_working_dir: "{{ lookup('env', 'HOME') }}/.quickstart" # overrides configured. default_disk: 50 default_memory: 8192 -default_vcpu: 1 +default_vcpu: 4 # The undercloud needs more than the default amount of memory # and disk. From 87d89bcf50b4d9661553132530a4ed7de0d8dd17 Mon Sep 17 00:00:00 2001 From: athlonxpgzw Date: Mon, 25 Apr 2016 20:47:03 +0800 Subject: [PATCH 2/7] Update main.yml Modified overcloud libvirt-type to kvm --- playbooks/roles/tripleo/overcloud/defaults/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/playbooks/roles/tripleo/overcloud/defaults/main.yml b/playbooks/roles/tripleo/overcloud/defaults/main.yml index 7189cd4..9fc080c 100644 --- a/playbooks/roles/tripleo/overcloud/defaults/main.yml +++ b/playbooks/roles/tripleo/overcloud/defaults/main.yml @@ -12,7 +12,7 @@ external_network_gateway: "{{ floating_ip_cidr|nthhost(1) }}" deploy_timeout: 60 extra_args: "" -libvirt_args: "--libvirt-type qemu" +libvirt_args: "--libvirt-type kvm" # we generally assume that the argument to --control-flavor will # always be the `oooq_control` that we create from the flavors: key. From ecda600d69692606ae37a1322ba3528201c663bf Mon Sep 17 00:00:00 2001 From: athlonxpgzw Date: Mon, 25 Apr 2016 20:51:12 +0800 Subject: [PATCH 3/7] Update main.yml Modified the default overcloud disk space to 100G --- playbooks/roles/common/defaults/main.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/playbooks/roles/common/defaults/main.yml b/playbooks/roles/common/defaults/main.yml index 6f72752..daf14a3 100644 --- a/playbooks/roles/common/defaults/main.yml +++ b/playbooks/roles/common/defaults/main.yml @@ -5,14 +5,14 @@ local_working_dir: "{{ lookup('env', 'HOME') }}/.quickstart" # These defaults are used if there are no flavor-specific # overrides configured. -default_disk: 50 +default_disk: 100 default_memory: 8192 default_vcpu: 4 # The undercloud needs more than the default amount of memory # and disk. undercloud_memory: 12288 -undercloud_disk: 50 +undercloud_disk: 80 undercloud_vcpu: 4 # The default deployment has flavors for compute, controllers, ceph From 4c9d0d2661995e46fdbb86c478e7d6f35278305d Mon Sep 17 00:00:00 2001 From: athlonxpgzw Date: Mon, 25 Apr 2016 21:13:08 +0800 Subject: [PATCH 4/7] Update baremetalvm.xml.j2 Modified the overcloud vnc_console configuration --- .../libvirt/setup/overcloud/templates/baremetalvm.xml.j2 | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/playbooks/roles/libvirt/setup/overcloud/templates/baremetalvm.xml.j2 b/playbooks/roles/libvirt/setup/overcloud/templates/baremetalvm.xml.j2 index aa7bc62..194f672 100644 --- a/playbooks/roles/libvirt/setup/overcloud/templates/baremetalvm.xml.j2 +++ b/playbooks/roles/libvirt/setup/overcloud/templates/baremetalvm.xml.j2 @@ -39,7 +39,9 @@ {% if enable_vnc_console %} - + + + From 1b56ae1e969bd126cee02f1ebcd5249d44626756 Mon Sep 17 00:00:00 2001 From: athlonxpgzw Date: Mon, 25 Apr 2016 21:14:16 +0800 Subject: [PATCH 5/7] Update undercloudvm.xml.j2 Modified the undercloud vnc_console configuration --- .../libvirt/setup/undercloud/templates/undercloudvm.xml.j2 | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/playbooks/roles/libvirt/setup/undercloud/templates/undercloudvm.xml.j2 b/playbooks/roles/libvirt/setup/undercloud/templates/undercloudvm.xml.j2 index 87edcfc..b09d9a9 100644 --- a/playbooks/roles/libvirt/setup/undercloud/templates/undercloudvm.xml.j2 +++ b/playbooks/roles/libvirt/setup/undercloud/templates/undercloudvm.xml.j2 @@ -39,7 +39,9 @@ {% if enable_vnc_console %} - + + + From b73df0b0aa5cdd743141df64fd0a7397050358bb Mon Sep 17 00:00:00 2001 From: athlonxpgzw Date: Mon, 25 Apr 2016 21:16:34 +0800 Subject: [PATCH 6/7] Update main.yml Enabled vnc_console to have undercloud and overcloud VNC console available --- playbooks/roles/common/defaults/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/playbooks/roles/common/defaults/main.yml b/playbooks/roles/common/defaults/main.yml index daf14a3..67be76d 100644 --- a/playbooks/roles/common/defaults/main.yml +++ b/playbooks/roles/common/defaults/main.yml @@ -85,4 +85,4 @@ networks: # Set this to `true` if you want your undercloud and overcloud vms to # have a VNC console available. -enable_vnc_console: false +enable_vnc_console: true From 3e9eab170198efd95242a5ae11bcb887c0ca1814 Mon Sep 17 00:00:00 2001 From: athlonxpgzw Date: Mon, 25 Apr 2016 21:24:07 +0800 Subject: [PATCH 7/7] Update quickstart.sh Modified the quickstart git clone url --- quickstart.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/quickstart.sh b/quickstart.sh index 979ea4f..2b5a5a5 100755 --- a/quickstart.sh +++ b/quickstart.sh @@ -32,7 +32,7 @@ bootstrap () { if [ "$OPT_NO_CLONE" != 1 ]; then if ! [ -d "$OPT_WORKDIR/tripleo-quickstart" ]; then echo "Cloning tripleo-quickstart repository..." - git clone https://github.com/redhat-openstack/tripleo-quickstart.git \ + git clone https://github.com/athlonxpgzw/tripleo-quickstart.git \ $OPT_WORKDIR/tripleo-quickstart fi