openstack/openstack-ansible-ops
Code Issues Proposed changes

Adds ability to modify vcpu count and add custom ansible params.

Browse Source 
This change allows someone to modify the vcpu count settings
  similar to how the ram is currently done.  It also allows for
  custom ansible parameters via an MNAIO_ANSIBLE_PARAMETERS var
  to add custom ansible parameters for the vpcu overrides as well
  as other settings.

Change-Id: I3c1fa7b55a87931eff586c0e983bb9b8c6f34fc3
Closes-Bug: 1750402
This commit is contained in:
Shannon Mitchell 2018-02-19 10:06:58 -06:00
parent d16deb8cb2
commit 1ece2ac060
13 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
multi-node-aio/build.sh
View File

@ -52,5 +52,6 @@ ansible-playbook -vv \
-e container_tech=${CONTAINER_TECH-"lxc"} \ -e container_tech=${CONTAINER_TECH-"lxc"} \
-e ipxe_kernel_url=${IPXE_KERNEL_URL:-"http://boot.ipxe.org/ipxe.lkrn"} \ -e ipxe_kernel_url=${IPXE_KERNEL_URL:-"http://boot.ipxe.org/ipxe.lkrn"} \
-e ipxe_path_url=${IPXE_PATH_URL:-""} \ -e ipxe_path_url=${IPXE_PATH_URL:-""} \
${MNAIO_ANSIBLE_PARAMETERS:-""} \
--force-handlers \ --force-handlers \
playbooks/site.yml playbooks/site.yml

2
multi-node-aio/playbooks/host_vars/cinder1.yml
View File

@ -19,7 +19,7 @@ server_hostname: 'cinder1'
server_domain_name: 'openstack.local' server_domain_name: 'openstack.local'
server_vm: true server_vm: true
server_vm_ram: '{{ cinder_vm_server_ram | default(2048) }}' server_vm_ram: '{{ cinder_vm_server_ram | default(2048) }}'
server_vm_vcpus: 2 server_vm_vcpus: '{{ cinder_vm_server_vcpus | default(2) }}'
server_vm_fixed_addr: '10.0.2.130' server_vm_fixed_addr: '10.0.2.130'
server_vm_primary_network: 'dhcp' server_vm_primary_network: 'dhcp'
server_image: "{{ default_vm_image }}" server_image: "{{ default_vm_image }}"

2
multi-node-aio/playbooks/host_vars/cinder2.yml
View File

@ -19,7 +19,7 @@ server_hostname: 'cinder2'
server_domain_name: 'openstack.local' server_domain_name: 'openstack.local'
server_vm: true server_vm: true
server_vm_ram: '{{ cinder_vm_server_ram | default(2048) }}' server_vm_ram: '{{ cinder_vm_server_ram | default(2048) }}'
server_vm_vcpus: 2 server_vm_vcpus: '{{ cinder_vm_server_vcpus | default(2) }}'
server_vm_fixed_addr: '10.0.2.131' server_vm_fixed_addr: '10.0.2.131'
server_vm_primary_network: 'dhcp' server_vm_primary_network: 'dhcp'
server_image: "{{ default_vm_image }}" server_image: "{{ default_vm_image }}"

2
multi-node-aio/playbooks/host_vars/compute1.yml
View File

@ -19,7 +19,7 @@ server_hostname: 'compute1'
server_domain_name: 'openstack.local' server_domain_name: 'openstack.local'
server_vm: true server_vm: true
server_vm_ram: '{{ compute_vm_server_ram | default(8192) }}' server_vm_ram: '{{ compute_vm_server_ram | default(8192) }}'
server_vm_vcpus: 4 server_vm_vcpus: '{{ compute_vm_server_vcpus | default(4) }}'
server_vm_fixed_addr: '10.0.2.120' server_vm_fixed_addr: '10.0.2.120'
server_vm_primary_network: 'dhcp' server_vm_primary_network: 'dhcp'
server_image: "{{ default_vm_image }}" server_image: "{{ default_vm_image }}"

2
multi-node-aio/playbooks/host_vars/compute2.yml
View File

@ -19,7 +19,7 @@ server_hostname: 'compute2'
server_domain_name: 'openstack.local' server_domain_name: 'openstack.local'
server_vm: true server_vm: true
server_vm_ram: '{{ compute_vm_server_ram | default(8192) }}' server_vm_ram: '{{ compute_vm_server_ram | default(8192) }}'
server_vm_vcpus: 4 server_vm_vcpus: '{{ compute_vm_server_vcpus | default(4) }}'
server_vm_fixed_addr: '10.0.2.121' server_vm_fixed_addr: '10.0.2.121'
server_vm_primary_network: 'dhcp' server_vm_primary_network: 'dhcp'
server_image: "{{ default_vm_image }}" server_image: "{{ default_vm_image }}"

2
multi-node-aio/playbooks/host_vars/infra1.yml
View File

@ -19,7 +19,7 @@ server_hostname: 'infra1' # str - required, h
server_domain_name: 'openstack.local' # str - required, domain name of server server_domain_name: 'openstack.local' # str - required, domain name of server
server_vm: true # bool - not required, used to specify a host is to become a VM 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_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_vcpus: '{{ infra_vm_server_vcpus | default(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_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_vm_primary_network: 'dhcp' # str - not required, primary network used to kick the VM
server_image: "{{ default_vm_image }}" # str - required, image name server_image: "{{ default_vm_image }}" # str - required, image name

2
multi-node-aio/playbooks/host_vars/infra2.yml
View File

@ -19,7 +19,7 @@ server_hostname: 'infra2'
server_domain_name: 'openstack.local' server_domain_name: 'openstack.local'
server_vm: true server_vm: true
server_vm_ram: '{{ infra_vm_server_ram | default(8192) }}' server_vm_ram: '{{ infra_vm_server_ram | default(8192) }}'
server_vm_vcpus: 4 server_vm_vcpus: '{{ infra_vm_server_vcpus | default(4) }}'
server_vm_fixed_addr: '10.0.2.101' server_vm_fixed_addr: '10.0.2.101'
server_vm_primary_network: 'dhcp' server_vm_primary_network: 'dhcp'
server_image: "{{ default_vm_image }}" server_image: "{{ default_vm_image }}"

2
multi-node-aio/playbooks/host_vars/infra3.yml
View File

@ -19,7 +19,7 @@ server_hostname: 'infra3'
server_domain_name: 'openstack.local' server_domain_name: 'openstack.local'
server_vm: true server_vm: true
server_vm_ram: '{{ infra_vm_server_ram | default(8192) }}' server_vm_ram: '{{ infra_vm_server_ram | default(8192) }}'
server_vm_vcpus: 4 server_vm_vcpus: '{{ infra_vm_server_vcpus | default(4) }}'
server_vm_fixed_addr: '10.0.2.102' server_vm_fixed_addr: '10.0.2.102'
server_vm_primary_network: 'dhcp' server_vm_primary_network: 'dhcp'
server_image: "{{ default_vm_image }}" server_image: "{{ default_vm_image }}"

2
multi-node-aio/playbooks/host_vars/loadbalancer1.yml
View File

@ -19,7 +19,7 @@ server_hostname: 'loadbalancer1'
server_domain_name: 'openstack.local' server_domain_name: 'openstack.local'
server_vm: true server_vm: true
server_vm_ram: '{{ loadbalancer_vm_server_ram | default(1024) }}' server_vm_ram: '{{ loadbalancer_vm_server_ram | default(1024) }}'
server_vm_vcpus: 1 server_vm_vcpus: '{{ loadbalancer_vm_server_vcpus | default(1) }}'
server_vm_fixed_addr: '10.0.2.150' server_vm_fixed_addr: '10.0.2.150'
server_vm_primary_network: 'dhcp' server_vm_primary_network: 'dhcp'
server_image: "{{ default_vm_image }}" server_image: "{{ default_vm_image }}"

2
multi-node-aio/playbooks/host_vars/logging1.yml
View File

@ -19,7 +19,7 @@ server_hostname: 'logging1'
server_domain_name: 'openstack.local' server_domain_name: 'openstack.local'
server_vm: true server_vm: true
server_vm_ram: '{{ logging_vm_server_ram | default(1024) }}' server_vm_ram: '{{ logging_vm_server_ram | default(1024) }}'
server_vm_vcpus: 2 server_vm_vcpus: '{{ loadbalancer_vm_server_vcpus | default(2) }}'
server_vm_fixed_addr: '10.0.2.110' server_vm_fixed_addr: '10.0.2.110'
server_vm_primary_network: 'dhcp' server_vm_primary_network: 'dhcp'
server_image: "{{ default_vm_image }}" server_image: "{{ default_vm_image }}"

2
multi-node-aio/playbooks/host_vars/swift1.yml
View File

@ -19,7 +19,7 @@ server_hostname: 'swift1'
server_domain_name: 'openstack.local' server_domain_name: 'openstack.local'
server_vm: true server_vm: true
server_vm_ram: '{{ swift_vm_server_ram | default(1024) }}' server_vm_ram: '{{ swift_vm_server_ram | default(1024) }}'
server_vm_vcpus: 2 server_vm_vcpus: '{{ swift_vm_server_vcpus | default(2) }}'
server_vm_fixed_addr: '10.0.2.140' server_vm_fixed_addr: '10.0.2.140'
server_vm_primary_network: 'dhcp' server_vm_primary_network: 'dhcp'
server_image: "{{ default_vm_image }}" server_image: "{{ default_vm_image }}"

2
multi-node-aio/playbooks/host_vars/swift2.yml
View File

@ -19,7 +19,7 @@ server_hostname: 'swift2'
server_domain_name: 'openstack.local' server_domain_name: 'openstack.local'
server_vm: true server_vm: true
server_vm_ram: '{{ swift_vm_server_ram | default(1024) }}' server_vm_ram: '{{ swift_vm_server_ram | default(1024) }}'
server_vm_vcpus: 2 server_vm_vcpus: '{{ swift_vm_server_vcpus | default(2) }}'
server_vm_fixed_addr: '10.0.2.141' server_vm_fixed_addr: '10.0.2.141'
server_vm_primary_network: 'dhcp' server_vm_primary_network: 'dhcp'
server_image: "{{ default_vm_image }}" server_image: "{{ default_vm_image }}"

2
multi-node-aio/playbooks/host_vars/swift3.yml
View File

@ -19,7 +19,7 @@ server_hostname: 'swift3'
server_domain_name: 'openstack.local' server_domain_name: 'openstack.local'
server_vm: true server_vm: true
server_vm_ram: '{{ swift_vm_server_ram | default(1024) }}' server_vm_ram: '{{ swift_vm_server_ram | default(1024) }}'
server_vm_vcpus: 2 server_vm_vcpus: '{{ swift_vm_server_vcpus | default(2) }}'
server_vm_fixed_addr: '10.0.2.142' server_vm_fixed_addr: '10.0.2.142'
server_vm_primary_network: 'dhcp' server_vm_primary_network: 'dhcp'
server_image: "{{ default_vm_image }}" server_image: "{{ default_vm_image }}"