Skip to content

newly pull #71

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 7 commits into
base: master
Choose a base branch
from
Open

newly pull #71

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
5327c85
Update main.yml
athlonxpgzw Apr 22, 2016
87d89bc
Update main.yml
athlonxpgzw Apr 25, 2016
ecda600
Update main.yml
athlonxpgzw Apr 25, 2016
4c9d0d2
Update baremetalvm.xml.j2
athlonxpgzw Apr 25, 2016
1b56ae1
Update undercloudvm.xml.j2
athlonxpgzw Apr 25, 2016
b73df0b
Update main.yml
athlonxpgzw Apr 25, 2016
3e9eab1
Update quickstart.sh
athlonxpgzw Apr 25, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions playbooks/roles/common/defaults/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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: 1
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
Expand Down Expand Up @@ -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
4 changes: 3 additions & 1 deletion playbooks/roles/libvirt/setup/overcloud/templates/baremetalvm.xml.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,9 @@

{% if enable_vnc_console %}
<input type='mouse' bus='ps2'/>
<graphics type='vnc' port='-1' autoport='yes'/>
<graphics type='vnc' port='-1' autoport='yes' listen='0.0.0.0'>
<listen type='address' address='0.0.0.0'/>
</graphics>
<video>
<model type='cirrus' vram='9216' heads='1'/>
</video>
Expand Down
4 changes: 3 additions & 1 deletion playbooks/roles/libvirt/setup/undercloud/templates/undercloudvm.xml.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,9 @@

{% if enable_vnc_console %}
<input type='mouse' bus='ps2'/>
<graphics type='vnc' port='-1' autoport='yes'/>
<graphics type='vnc' port='-1' autoport='yes' listen='0.0.0.0'>
<listen type='address' address='0.0.0.0'/>
</graphics>
<video>
<model type='cirrus' vram='9216' heads='1'/>
</video>
Expand Down
2 changes: 1 addition & 1 deletion playbooks/roles/tripleo/overcloud/defaults/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion quickstart.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down