diff --git a/multi-node-aio/playbooks/host_vars/cinder1.yml b/multi-node-aio/playbooks/host_vars/cinder1.yml index 05044211..cb5ea1c4 100644 --- a/multi-node-aio/playbooks/host_vars/cinder1.yml +++ b/multi-node-aio/playbooks/host_vars/cinder1.yml @@ -35,12 +35,12 @@ server_networks: mgmt: iface: 'eth1' inet_type: 'static' - address: '10.0.236.107/22' + address: '10.0.236.130/22' vm_int_iface: vm-br-eth1 flat: iface: 'eth2' inet_type: 'static' - address: '10.0.248.107/22' + address: '10.0.248.130/22' vm_int_iface: vm-br-eth2 vlan: iface: 'eth3' @@ -49,10 +49,10 @@ server_networks: vxlan: iface: 'eth4' inet_type: 'static' - address: '10.0.240.107/22' + address: '10.0.240.130/22' vm_int_iface: vm-br-eth4 storage: iface: 'eth5' inet_type: 'static' - address: '10.0.244.107/22' + address: '10.0.244.130/22' vm_int_iface: vm-br-eth5 diff --git a/multi-node-aio/playbooks/host_vars/cinder2.yml b/multi-node-aio/playbooks/host_vars/cinder2.yml index c39db66f..1cf85095 100644 --- a/multi-node-aio/playbooks/host_vars/cinder2.yml +++ b/multi-node-aio/playbooks/host_vars/cinder2.yml @@ -35,12 +35,12 @@ server_networks: mgmt: iface: 'eth1' inet_type: 'static' - address: '10.0.236.108/22' + address: '10.0.236.131/22' vm_int_iface: vm-br-eth1 flat: iface: 'eth2' inet_type: 'static' - address: '10.0.248.108/22' + address: '10.0.248.131/22' vm_int_iface: vm-br-eth2 vlan: iface: 'eth3' @@ -49,10 +49,10 @@ server_networks: vxlan: iface: 'eth4' inet_type: 'static' - address: '10.0.240.108/22' + address: '10.0.240.131/22' vm_int_iface: vm-br-eth4 storage: iface: 'eth5' inet_type: 'static' - address: '10.0.244.108/22' + address: '10.0.244.131/22' vm_int_iface: vm-br-eth5 diff --git a/multi-node-aio/playbooks/host_vars/compute1.yml b/multi-node-aio/playbooks/host_vars/compute1.yml index 20522e8e..cc6779d9 100644 --- a/multi-node-aio/playbooks/host_vars/compute1.yml +++ b/multi-node-aio/playbooks/host_vars/compute1.yml @@ -35,12 +35,12 @@ server_networks: mgmt: iface: 'eth1' inet_type: 'static' - address: '10.0.236.105/22' + address: '10.0.236.120/22' vm_int_iface: vm-br-eth1 flat: iface: 'eth2' inet_type: 'static' - address: '10.0.248.105/22' + address: '10.0.248.120/22' vm_int_iface: vm-br-eth2 vlan: iface: 'eth3' @@ -49,10 +49,10 @@ server_networks: vxlan: iface: 'eth4' inet_type: 'static' - address: '10.0.240.105/22' + address: '10.0.240.120/22' vm_int_iface: vm-br-eth4 storage: iface: 'eth5' inet_type: 'static' - address: '10.0.244.105/22' + address: '10.0.244.120/22' vm_int_iface: vm-br-eth5 diff --git a/multi-node-aio/playbooks/host_vars/compute2.yml b/multi-node-aio/playbooks/host_vars/compute2.yml index fde20a25..cfe6d9ec 100644 --- a/multi-node-aio/playbooks/host_vars/compute2.yml +++ b/multi-node-aio/playbooks/host_vars/compute2.yml @@ -35,12 +35,12 @@ server_networks: mgmt: iface: 'eth1' inet_type: 'static' - address: '10.0.236.106/22' + address: '10.0.236.121/22' vm_int_iface: vm-br-eth1 flat: iface: 'eth2' inet_type: 'static' - address: '10.0.248.106/22' + address: '10.0.248.121/22' vm_int_iface: vm-br-eth2 vlan: iface: 'eth3' @@ -49,10 +49,10 @@ server_networks: vxlan: iface: 'eth4' inet_type: 'static' - address: '10.0.240.106/22' + address: '10.0.240.121/22' vm_int_iface: vm-br-eth4 storage: iface: 'eth5' inet_type: 'static' - address: '10.0.244.106/22' + address: '10.0.244.121/22' vm_int_iface: vm-br-eth5 diff --git a/multi-node-aio/playbooks/host_vars/loadbalancer1.yml b/multi-node-aio/playbooks/host_vars/loadbalancer1.yml index f179ac4b..d1c6c507 100644 --- a/multi-node-aio/playbooks/host_vars/loadbalancer1.yml +++ b/multi-node-aio/playbooks/host_vars/loadbalancer1.yml @@ -19,7 +19,7 @@ server_hostname: 'loadbalancer1' server_vm: true server_vm_ram: 1024 server_vm_vcpus: 1 -server_vm_fixed_addr: '10.0.2.142' +server_vm_fixed_addr: '10.0.2.150' server_vm_primary_network: 'dhcp' server_image: "{{ default_vm_image }}" server_default_interface: 'eth0' @@ -35,12 +35,12 @@ server_networks: mgmt: iface: 'eth1' inet_type: 'static' - address: '10.0.236.112/22' + address: '10.0.236.150/22' vm_int_iface: vm-br-eth1 flat: iface: 'eth2' inet_type: 'static' - address: '10.0.248.112/22' + address: '10.0.248.150/22' vm_int_iface: vm-br-eth2 vlan: iface: 'eth3' @@ -49,10 +49,10 @@ server_networks: vxlan: iface: 'eth4' inet_type: 'static' - address: '10.0.240.112/22' + address: '10.0.240.150/22' vm_int_iface: vm-br-eth4 storage: iface: 'eth5' inet_type: 'static' - address: '10.0.244.112/22' + address: '10.0.244.150/22' vm_int_iface: vm-br-eth5 diff --git a/multi-node-aio/playbooks/host_vars/logging1.yml b/multi-node-aio/playbooks/host_vars/logging1.yml index 793dc928..b8edfd51 100644 --- a/multi-node-aio/playbooks/host_vars/logging1.yml +++ b/multi-node-aio/playbooks/host_vars/logging1.yml @@ -35,12 +35,12 @@ server_networks: mgmt: iface: 'eth1' inet_type: 'static' - address: '10.0.236.103/22' + address: '10.0.236.110/22' vm_int_iface: vm-br-eth1 flat: iface: 'eth2' inet_type: 'static' - address: '10.0.248.103/22' + address: '10.0.248.110/22' vm_int_iface: vm-br-eth2 vlan: iface: 'eth3' @@ -49,10 +49,10 @@ server_networks: vxlan: iface: 'eth4' inet_type: 'static' - address: '10.0.240.103/22' + address: '10.0.240.110/22' vm_int_iface: vm-br-eth4 storage: iface: 'eth5' inet_type: 'static' - address: '10.0.244.103/22' + address: '10.0.244.110/22' vm_int_iface: vm-br-eth5 diff --git a/multi-node-aio/playbooks/host_vars/swift1.yml b/multi-node-aio/playbooks/host_vars/swift1.yml index d91b6b0d..60a07ae0 100644 --- a/multi-node-aio/playbooks/host_vars/swift1.yml +++ b/multi-node-aio/playbooks/host_vars/swift1.yml @@ -35,12 +35,12 @@ server_networks: mgmt: iface: 'eth1' inet_type: 'static' - address: '10.0.236.109/22' + address: '10.0.236.140/22' vm_int_iface: vm-br-eth1 flat: iface: 'eth2' inet_type: 'static' - address: '10.0.248.109/22' + address: '10.0.248.140/22' vm_int_iface: vm-br-eth2 vlan: iface: 'eth3' @@ -49,10 +49,10 @@ server_networks: vxlan: iface: 'eth4' inet_type: 'static' - address: '10.0.240.109/22' + address: '10.0.240.140/22' vm_int_iface: vm-br-eth4 storage: iface: 'eth5' inet_type: 'static' - address: '10.0.244.109/22' + address: '10.0.244.140/22' vm_int_iface: vm-br-eth5 diff --git a/multi-node-aio/playbooks/host_vars/swift2.yml b/multi-node-aio/playbooks/host_vars/swift2.yml index b17ff505..94231f5a 100644 --- a/multi-node-aio/playbooks/host_vars/swift2.yml +++ b/multi-node-aio/playbooks/host_vars/swift2.yml @@ -19,7 +19,7 @@ server_hostname: 'swift2' server_vm: true server_vm_ram: 2048 server_vm_vcpus: 2 -server_vm_fixed_addr: '10.0.2.140' +server_vm_fixed_addr: '10.0.2.141' server_vm_primary_network: 'dhcp' server_image: "{{ default_vm_image }}" server_default_interface: 'eth0' @@ -35,12 +35,12 @@ server_networks: mgmt: iface: 'eth1' inet_type: 'static' - address: '10.0.236.110/22' + address: '10.0.236.141/22' vm_int_iface: vm-br-eth1 flat: iface: 'eth2' inet_type: 'static' - address: '10.0.248.110/22' + address: '10.0.248.141/22' vm_int_iface: vm-br-eth2 vlan: iface: 'eth3' @@ -49,10 +49,10 @@ server_networks: vxlan: iface: 'eth4' inet_type: 'static' - address: '10.0.240.110/22' + address: '10.0.240.141/22' vm_int_iface: vm-br-eth4 storage: iface: 'eth5' inet_type: 'static' - address: '10.0.244.110/22' + address: '10.0.244.141/22' vm_int_iface: vm-br-eth5 diff --git a/multi-node-aio/playbooks/host_vars/swift3.yml b/multi-node-aio/playbooks/host_vars/swift3.yml index fab846d2..f060f91e 100644 --- a/multi-node-aio/playbooks/host_vars/swift3.yml +++ b/multi-node-aio/playbooks/host_vars/swift3.yml @@ -19,7 +19,7 @@ server_hostname: 'swift3' server_vm: true server_vm_ram: 2048 server_vm_vcpus: 2 -server_vm_fixed_addr: '10.0.2.141' +server_vm_fixed_addr: '10.0.2.142' server_vm_primary_network: 'dhcp' server_image: "{{ default_vm_image }}" server_default_interface: 'eth0' @@ -35,12 +35,12 @@ server_networks: mgmt: iface: 'eth1' inet_type: 'static' - address: '10.0.236.111/22' + address: '10.0.236.142/22' vm_int_iface: vm-br-eth1 flat: iface: 'eth2' inet_type: 'static' - address: '10.0.248.111/22' + address: '10.0.248.142/22' vm_int_iface: vm-br-eth2 vlan: iface: 'eth3' @@ -49,10 +49,10 @@ server_networks: vxlan: iface: 'eth4' inet_type: 'static' - address: '10.0.240.111/22' + address: '10.0.240.142/22' vm_int_iface: vm-br-eth4 storage: iface: 'eth5' inet_type: 'static' - address: '10.0.244.111/22' + address: '10.0.244.142/22' vm_int_iface: vm-br-eth5 diff --git a/multi-node-aio/playbooks/inventory b/multi-node-aio/playbooks/inventory index d5dc146d..0daf599e 100644 --- a/multi-node-aio/playbooks/inventory +++ b/multi-node-aio/playbooks/inventory @@ -10,15 +10,15 @@ mnaio1 ansible_host=10.0.2.1 ansible_connection=local infra1 ansible_host=10.0.236.100 infra2 ansible_host=10.0.236.101 infra3 ansible_host=10.0.236.102 -cinder2 ansible_host=10.0.236.108 -logging1 ansible_host=10.0.236.103 -compute1 ansible_host=10.0.236.105 -compute2 ansible_host=10.0.236.106 -cinder1 ansible_host=10.0.236.107 -swift1 ansible_host=10.0.236.109 -swift2 ansible_host=10.0.236.110 -swift3 ansible_host=10.0.236.111 -loadbalancer1 ansible_host=10.0.236.112 +cinder1 ansible_host=10.0.236.130 +cinder2 ansible_host=10.0.236.131 +compute1 ansible_host=10.0.236.120 +compute2 ansible_host=10.0.236.121 +loadbalancer1 ansible_host=10.0.236.150 +logging1 ansible_host=10.0.236.110 +swift1 ansible_host=10.0.236.140 +swift2 ansible_host=10.0.236.141 +swift3 ansible_host=10.0.236.142 ################################# MNAIO HOSTS ################################# diff --git a/multi-node-aio/playbooks/osa/openstack_user_config.yml b/multi-node-aio/playbooks/osa/openstack_user_config.yml index 479eb89c..2aeedb38 100644 --- a/multi-node-aio/playbooks/osa/openstack_user_config.yml +++ b/multi-node-aio/playbooks/osa/openstack_user_config.yml @@ -12,8 +12,8 @@ used_ips: - "10.0.248.0,10.0.248.200" global_overrides: - internal_lb_vip_address: "10.0.236.112" - external_lb_vip_address: "10.0.2.142" + internal_lb_vip_address: "10.0.236.150" + external_lb_vip_address: "10.0.2.150" tunnel_bridge: "br-vxlan" management_bridge: "br-mgmt" provider_networks: @@ -86,9 +86,37 @@ global_overrides: ### ### Anchors ### -log_block: &log_block - logging1: - ip: 10.0.236.103 +cinder_block: &cinder_block + cinder1: + ip: 10.0.236.130 + container_vars: + cinder_backends: + limit_container_types: cinder_volume + lvm: + volume_group: cinder-volumes + volume_driver: cinder.volume.drivers.lvm.LVMVolumeDriver + volume_backend_name: LVM_iSCSI + iscsi_ip_address: "10.0.244.130" + + cinder2: + ip: 10.0.236.131 + container_vars: + cinder_backends: + limit_container_types: cinder_volume + lvm: + volume_group: cinder-volumes + volume_driver: cinder.volume.drivers.lvm.LVMVolumeDriver + volume_backend_name: LVM_iSCSI + iscsi_ip_address: "10.0.244.131" + + +compute_block: &compute_block + compute1: + ip: 10.0.236.120 + + compute2: + ip: 10.0.236.121 + infra_block: &infra_block infra1: @@ -100,49 +128,28 @@ infra_block: &infra_block infra3: ip: 10.0.236.102 -compute_block: &compute_block - compute1: - ip: 10.0.236.105 - - compute2: - ip: 10.0.236.106 - -cinder_block: &cinder_block - cinder1: - ip: 10.0.236.107 - container_vars: - cinder_backends: - limit_container_types: cinder_volume - lvm: - volume_group: cinder-volumes - volume_driver: cinder.volume.drivers.lvm.LVMVolumeDriver - volume_backend_name: LVM_iSCSI - iscsi_ip_address: "10.0.244.107" - - cinder2: - ip: 10.0.236.108 - container_vars: - cinder_backends: - limit_container_types: cinder_volume - lvm: - volume_group: cinder-volumes - volume_driver: cinder.volume.drivers.lvm.LVMVolumeDriver - volume_backend_name: LVM_iSCSI - iscsi_ip_address: "10.0.244.108" - -swift_block: &swift_block - swift1: - ip: 10.0.236.109 - - swift2: - ip: 10.0.236.110 - - swift3: - ip: 10.0.236.111 loadbalancer_block: &loadbalancer_block loadbalancer1: - ip: 10.0.236.112 + ip: 10.0.236.150 + + +log_block: &log_block + logging1: + ip: 10.0.236.110 + + +swift_block: &swift_block + swift1: + ip: 10.0.236.140 + + swift2: + ip: 10.0.236.141 + + swift3: + ip: 10.0.236.142 + + ###