From 704e737187a1ea4610731e23b2ec73fae23b5696 Mon Sep 17 00:00:00 2001 From: Kevin Carter Date: Wed, 27 Sep 2017 09:29:15 -0500 Subject: [PATCH] Add the option to configure VM server ram The VMs deployed are using a very conservative setting for RAM. If a user has the memory to spare they should have the option to set this based on their needs. Change-Id: Ib0fcdada64f009ad5924db171831840120a3eaee Signed-off-by: Kevin Carter --- .../playbooks/host_vars/cinder1.yml | 2 +- .../playbooks/host_vars/cinder2.yml | 2 +- .../playbooks/host_vars/compute1.yml | 2 +- .../playbooks/host_vars/compute2.yml | 2 +- multi-node-aio/playbooks/host_vars/infra1.yml | 22 +++++++++---------- multi-node-aio/playbooks/host_vars/infra2.yml | 2 +- multi-node-aio/playbooks/host_vars/infra3.yml | 2 +- .../playbooks/host_vars/loadbalancer1.yml | 2 +- .../playbooks/host_vars/logging1.yml | 2 +- multi-node-aio/playbooks/host_vars/swift1.yml | 2 +- multi-node-aio/playbooks/host_vars/swift2.yml | 2 +- multi-node-aio/playbooks/host_vars/swift3.yml | 2 +- 12 files changed, 22 insertions(+), 22 deletions(-) diff --git a/multi-node-aio/playbooks/host_vars/cinder1.yml b/multi-node-aio/playbooks/host_vars/cinder1.yml index cb5ea1c4..cbeefa8d 100644 --- a/multi-node-aio/playbooks/host_vars/cinder1.yml +++ b/multi-node-aio/playbooks/host_vars/cinder1.yml @@ -17,7 +17,7 @@ ansible_os_family: "{{ images[default_vm_image]['image_type'] }}" server_hostname: 'cinder1' server_vm: true -server_vm_ram: 2048 +server_vm_ram: '{{ cinder_vm_server_ram | default(2048) }}' server_vm_vcpus: 2 server_vm_fixed_addr: '10.0.2.130' server_vm_primary_network: 'dhcp' diff --git a/multi-node-aio/playbooks/host_vars/cinder2.yml b/multi-node-aio/playbooks/host_vars/cinder2.yml index 1cf85095..a9ae7fec 100644 --- a/multi-node-aio/playbooks/host_vars/cinder2.yml +++ b/multi-node-aio/playbooks/host_vars/cinder2.yml @@ -17,7 +17,7 @@ ansible_os_family: "{{ images[default_vm_image]['image_type'] }}" server_hostname: 'cinder2' server_vm: true -server_vm_ram: 2048 +server_vm_ram: '{{ cinder_vm_server_ram | default(2048) }}' server_vm_vcpus: 2 server_vm_fixed_addr: '10.0.2.131' server_vm_primary_network: 'dhcp' diff --git a/multi-node-aio/playbooks/host_vars/compute1.yml b/multi-node-aio/playbooks/host_vars/compute1.yml index 301781da..735bfa47 100644 --- a/multi-node-aio/playbooks/host_vars/compute1.yml +++ b/multi-node-aio/playbooks/host_vars/compute1.yml @@ -17,7 +17,7 @@ ansible_os_family: "{{ images[default_vm_image]['image_type'] }}" server_hostname: 'compute1' server_vm: true -server_vm_ram: 8192 +server_vm_ram: '{{ compute_vm_server_ram | default(8192) }}' server_vm_vcpus: 4 server_vm_fixed_addr: '10.0.2.120' server_vm_primary_network: 'dhcp' diff --git a/multi-node-aio/playbooks/host_vars/compute2.yml b/multi-node-aio/playbooks/host_vars/compute2.yml index 79484e80..50f855cf 100644 --- a/multi-node-aio/playbooks/host_vars/compute2.yml +++ b/multi-node-aio/playbooks/host_vars/compute2.yml @@ -17,7 +17,7 @@ ansible_os_family: "{{ images[default_vm_image]['image_type'] }}" server_hostname: 'compute2' server_vm: true -server_vm_ram: 8192 +server_vm_ram: '{{ compute_vm_server_ram | default(8192) }}' server_vm_vcpus: 4 server_vm_fixed_addr: '10.0.2.121' server_vm_primary_network: 'dhcp' diff --git a/multi-node-aio/playbooks/host_vars/infra1.yml b/multi-node-aio/playbooks/host_vars/infra1.yml index 43891060..50a6fe38 100644 --- a/multi-node-aio/playbooks/host_vars/infra1.yml +++ b/multi-node-aio/playbooks/host_vars/infra1.yml @@ -15,17 +15,17 @@ ansible_os_family: "{{ images[default_vm_image]['image_type'] }}" -server_hostname: 'infra1' # str - required, hostname of server -server_vm: true # bool - not required, used to specify a host is to become a VM -server_vm_ram: 8192 # int - not required, used to specify ram when provisioning a VM -server_vm_vcpus: 4 # int - not required, used to specify vcpus when provisioning a VM -server_vm_fixed_addr: '10.0.2.100' # str - not required, used to specify fixed address when using internal DHCPD -server_vm_primary_network: 'dhcp' # str - not required, primary network used to kick the VM -server_image: "{{ default_vm_image }}" # str - required, image name -server_default_interface: 'eth0' # str - required, default interface -server_mac_address: '52:54:00:bd:80:00' # str - required, mac address of default interface -server_preseed_ks: 'vm' # str - required, name of preseed/kickstart file -server_extra_options: '' # str - not required, added kernel options +server_hostname: 'infra1' # str - required, hostname of server +server_vm: true # bool - not required, used to specify a host is to become a VM +server_vm_ram: '{{ infra_vm_server_ram | default(8192) }}' # int - not required, used to specify ram when provisioning a VM +server_vm_vcpus: 4 # int - not required, used to specify vcpus when provisioning a VM +server_vm_fixed_addr: '10.0.2.100' # str - not required, used to specify fixed address when using internal DHCPD +server_vm_primary_network: 'dhcp' # str - not required, primary network used to kick the VM +server_image: "{{ default_vm_image }}" # str - required, image name +server_default_interface: 'eth0' # str - required, default interface +server_mac_address: '52:54:00:bd:80:00' # str - required, mac address of default interface +server_preseed_ks: 'vm' # str - required, name of preseed/kickstart file +server_extra_options: '' # str - not required, added kernel options server_networks: # dict - required, hash of networks, can be empty, key is used to name the networks. dhcp: diff --git a/multi-node-aio/playbooks/host_vars/infra2.yml b/multi-node-aio/playbooks/host_vars/infra2.yml index a1646646..46d243b5 100644 --- a/multi-node-aio/playbooks/host_vars/infra2.yml +++ b/multi-node-aio/playbooks/host_vars/infra2.yml @@ -17,7 +17,7 @@ ansible_os_family: "{{ images[default_vm_image]['image_type'] }}" server_hostname: 'infra2' server_vm: true -server_vm_ram: 8192 +server_vm_ram: '{{ infra_vm_server_ram | default(8192) }}' server_vm_vcpus: 4 server_vm_fixed_addr: '10.0.2.101' server_vm_primary_network: 'dhcp' diff --git a/multi-node-aio/playbooks/host_vars/infra3.yml b/multi-node-aio/playbooks/host_vars/infra3.yml index db7855e8..b5c76a41 100644 --- a/multi-node-aio/playbooks/host_vars/infra3.yml +++ b/multi-node-aio/playbooks/host_vars/infra3.yml @@ -17,7 +17,7 @@ ansible_os_family: "{{ images[default_vm_image]['image_type'] }}" server_hostname: 'infra3' server_vm: true -server_vm_ram: 8192 +server_vm_ram: '{{ infra_vm_server_ram | default(8192) }}' server_vm_vcpus: 4 server_vm_fixed_addr: '10.0.2.102' server_vm_primary_network: 'dhcp' diff --git a/multi-node-aio/playbooks/host_vars/loadbalancer1.yml b/multi-node-aio/playbooks/host_vars/loadbalancer1.yml index d1c6c507..3c58a3c1 100644 --- a/multi-node-aio/playbooks/host_vars/loadbalancer1.yml +++ b/multi-node-aio/playbooks/host_vars/loadbalancer1.yml @@ -17,7 +17,7 @@ ansible_os_family: "{{ images[default_vm_image]['image_type'] }}" server_hostname: 'loadbalancer1' server_vm: true -server_vm_ram: 1024 +server_vm_ram: '{{ loadbalancer_vm_server_ram | default(1024) }}' server_vm_vcpus: 1 server_vm_fixed_addr: '10.0.2.150' server_vm_primary_network: 'dhcp' diff --git a/multi-node-aio/playbooks/host_vars/logging1.yml b/multi-node-aio/playbooks/host_vars/logging1.yml index b8edfd51..e30f12f0 100644 --- a/multi-node-aio/playbooks/host_vars/logging1.yml +++ b/multi-node-aio/playbooks/host_vars/logging1.yml @@ -17,7 +17,7 @@ ansible_os_family: "{{ images[default_vm_image]['image_type'] }}" server_hostname: 'logging1' server_vm: true -server_vm_ram: 1024 +server_vm_ram: '{{ logging_vm_server_ram | default(1024) }}' server_vm_vcpus: 2 server_vm_fixed_addr: '10.0.2.110' server_vm_primary_network: 'dhcp' diff --git a/multi-node-aio/playbooks/host_vars/swift1.yml b/multi-node-aio/playbooks/host_vars/swift1.yml index 60a07ae0..54366e0c 100644 --- a/multi-node-aio/playbooks/host_vars/swift1.yml +++ b/multi-node-aio/playbooks/host_vars/swift1.yml @@ -17,7 +17,7 @@ ansible_os_family: "{{ images[default_vm_image]['image_type'] }}" server_hostname: 'swift1' server_vm: true -server_vm_ram: 2048 +server_vm_ram: '{{ swift_vm_server_ram | default(1024) }}' server_vm_vcpus: 2 server_vm_fixed_addr: '10.0.2.140' server_vm_primary_network: 'dhcp' diff --git a/multi-node-aio/playbooks/host_vars/swift2.yml b/multi-node-aio/playbooks/host_vars/swift2.yml index 94231f5a..29240e67 100644 --- a/multi-node-aio/playbooks/host_vars/swift2.yml +++ b/multi-node-aio/playbooks/host_vars/swift2.yml @@ -17,7 +17,7 @@ ansible_os_family: "{{ images[default_vm_image]['image_type'] }}" server_hostname: 'swift2' server_vm: true -server_vm_ram: 2048 +server_vm_ram: '{{ swift_vm_server_ram | default(1024) }}' server_vm_vcpus: 2 server_vm_fixed_addr: '10.0.2.141' server_vm_primary_network: 'dhcp' diff --git a/multi-node-aio/playbooks/host_vars/swift3.yml b/multi-node-aio/playbooks/host_vars/swift3.yml index f060f91e..15576483 100644 --- a/multi-node-aio/playbooks/host_vars/swift3.yml +++ b/multi-node-aio/playbooks/host_vars/swift3.yml @@ -17,7 +17,7 @@ ansible_os_family: "{{ images[default_vm_image]['image_type'] }}" server_hostname: 'swift3' server_vm: true -server_vm_ram: 2048 +server_vm_ram: '{{ swift_vm_server_ram | default(1024) }}' server_vm_vcpus: 2 server_vm_fixed_addr: '10.0.2.142' server_vm_primary_network: 'dhcp'