openstack/openstack-ansible-ops
Code Issues Proposed changes

fix vm server ip typo and isolate hosts into ip blocks

Browse Source 
Change-Id: I27d4b9a304241c7572f3c634fb7d3ef4eaed6a3e
Signed-off-by: Kevin Carter <kevin.carter@rackspace.com>
This commit is contained in:
Kevin Carter 2017-08-01 12:59:48 -05:00
parent 369f68832e
commit 6dbba8a3f8
No known key found for this signature in database
GPG Key ID: 69FEFFC5E2D9273F
11 changed files with 100 additions and 93 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -35,12 +35,12 @@ server_networks:
mgmt: mgmt:
iface: 'eth1' iface: 'eth1'
inet_type: 'static' inet_type: 'static'
address: '10.0.236.107/22' address: '10.0.236.130/22'
vm_int_iface: vm-br-eth1 vm_int_iface: vm-br-eth1
flat: flat:
iface: 'eth2' iface: 'eth2'
inet_type: 'static' inet_type: 'static'
address: '10.0.248.107/22' address: '10.0.248.130/22'
vm_int_iface: vm-br-eth2 vm_int_iface: vm-br-eth2
vlan: vlan:
iface: 'eth3' iface: 'eth3'
@ -49,10 +49,10 @@ server_networks:
vxlan: vxlan:
iface: 'eth4' iface: 'eth4'
inet_type: 'static' inet_type: 'static'
address: '10.0.240.107/22' address: '10.0.240.130/22'
vm_int_iface: vm-br-eth4 vm_int_iface: vm-br-eth4
storage: storage:
iface: 'eth5' iface: 'eth5'
inet_type: 'static' inet_type: 'static'
address: '10.0.244.107/22' address: '10.0.244.130/22'
vm_int_iface: vm-br-eth5 vm_int_iface: vm-br-eth5

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

@ -35,12 +35,12 @@ server_networks:
mgmt: mgmt:
iface: 'eth1' iface: 'eth1'
inet_type: 'static' inet_type: 'static'
address: '10.0.236.108/22' address: '10.0.236.131/22'
vm_int_iface: vm-br-eth1 vm_int_iface: vm-br-eth1
flat: flat:
iface: 'eth2' iface: 'eth2'
inet_type: 'static' inet_type: 'static'
address: '10.0.248.108/22' address: '10.0.248.131/22'
vm_int_iface: vm-br-eth2 vm_int_iface: vm-br-eth2
vlan: vlan:
iface: 'eth3' iface: 'eth3'
@ -49,10 +49,10 @@ server_networks:
vxlan: vxlan:
iface: 'eth4' iface: 'eth4'
inet_type: 'static' inet_type: 'static'
address: '10.0.240.108/22' address: '10.0.240.131/22'
vm_int_iface: vm-br-eth4 vm_int_iface: vm-br-eth4
storage: storage:
iface: 'eth5' iface: 'eth5'
inet_type: 'static' inet_type: 'static'
address: '10.0.244.108/22' address: '10.0.244.131/22'
vm_int_iface: vm-br-eth5 vm_int_iface: vm-br-eth5

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

@ -35,12 +35,12 @@ server_networks:
mgmt: mgmt:
iface: 'eth1' iface: 'eth1'
inet_type: 'static' inet_type: 'static'
address: '10.0.236.105/22' address: '10.0.236.120/22'
vm_int_iface: vm-br-eth1 vm_int_iface: vm-br-eth1
flat: flat:
iface: 'eth2' iface: 'eth2'
inet_type: 'static' inet_type: 'static'
address: '10.0.248.105/22' address: '10.0.248.120/22'
vm_int_iface: vm-br-eth2 vm_int_iface: vm-br-eth2
vlan: vlan:
iface: 'eth3' iface: 'eth3'
@ -49,10 +49,10 @@ server_networks:
vxlan: vxlan:
iface: 'eth4' iface: 'eth4'
inet_type: 'static' inet_type: 'static'
address: '10.0.240.105/22' address: '10.0.240.120/22'
vm_int_iface: vm-br-eth4 vm_int_iface: vm-br-eth4
storage: storage:
iface: 'eth5' iface: 'eth5'
inet_type: 'static' inet_type: 'static'
address: '10.0.244.105/22' address: '10.0.244.120/22'
vm_int_iface: vm-br-eth5 vm_int_iface: vm-br-eth5

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

@ -35,12 +35,12 @@ server_networks:
mgmt: mgmt:
iface: 'eth1' iface: 'eth1'
inet_type: 'static' inet_type: 'static'
address: '10.0.236.106/22' address: '10.0.236.121/22'
vm_int_iface: vm-br-eth1 vm_int_iface: vm-br-eth1
flat: flat:
iface: 'eth2' iface: 'eth2'
inet_type: 'static' inet_type: 'static'
address: '10.0.248.106/22' address: '10.0.248.121/22'
vm_int_iface: vm-br-eth2 vm_int_iface: vm-br-eth2
vlan: vlan:
iface: 'eth3' iface: 'eth3'
@ -49,10 +49,10 @@ server_networks:
vxlan: vxlan:
iface: 'eth4' iface: 'eth4'
inet_type: 'static' inet_type: 'static'
address: '10.0.240.106/22' address: '10.0.240.121/22'
vm_int_iface: vm-br-eth4 vm_int_iface: vm-br-eth4
storage: storage:
iface: 'eth5' iface: 'eth5'
inet_type: 'static' inet_type: 'static'
address: '10.0.244.106/22' address: '10.0.244.121/22'
vm_int_iface: vm-br-eth5 vm_int_iface: vm-br-eth5

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

@ -19,7 +19,7 @@ server_hostname: 'loadbalancer1'
server_vm: true server_vm: true
server_vm_ram: 1024 server_vm_ram: 1024
server_vm_vcpus: 1 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_vm_primary_network: 'dhcp'
server_image: "{{ default_vm_image }}" server_image: "{{ default_vm_image }}"
server_default_interface: 'eth0' server_default_interface: 'eth0'
@ -35,12 +35,12 @@ server_networks:
mgmt: mgmt:
iface: 'eth1' iface: 'eth1'
inet_type: 'static' inet_type: 'static'
address: '10.0.236.112/22' address: '10.0.236.150/22'
vm_int_iface: vm-br-eth1 vm_int_iface: vm-br-eth1
flat: flat:
iface: 'eth2' iface: 'eth2'
inet_type: 'static' inet_type: 'static'
address: '10.0.248.112/22' address: '10.0.248.150/22'
vm_int_iface: vm-br-eth2 vm_int_iface: vm-br-eth2
vlan: vlan:
iface: 'eth3' iface: 'eth3'
@ -49,10 +49,10 @@ server_networks:
vxlan: vxlan:
iface: 'eth4' iface: 'eth4'
inet_type: 'static' inet_type: 'static'
address: '10.0.240.112/22' address: '10.0.240.150/22'
vm_int_iface: vm-br-eth4 vm_int_iface: vm-br-eth4
storage: storage:
iface: 'eth5' iface: 'eth5'
inet_type: 'static' inet_type: 'static'
address: '10.0.244.112/22' address: '10.0.244.150/22'
vm_int_iface: vm-br-eth5 vm_int_iface: vm-br-eth5

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

@ -35,12 +35,12 @@ server_networks:
mgmt: mgmt:
iface: 'eth1' iface: 'eth1'
inet_type: 'static' inet_type: 'static'
address: '10.0.236.103/22' address: '10.0.236.110/22'
vm_int_iface: vm-br-eth1 vm_int_iface: vm-br-eth1
flat: flat:
iface: 'eth2' iface: 'eth2'
inet_type: 'static' inet_type: 'static'
address: '10.0.248.103/22' address: '10.0.248.110/22'
vm_int_iface: vm-br-eth2 vm_int_iface: vm-br-eth2
vlan: vlan:
iface: 'eth3' iface: 'eth3'
@ -49,10 +49,10 @@ server_networks:
vxlan: vxlan:
iface: 'eth4' iface: 'eth4'
inet_type: 'static' inet_type: 'static'
address: '10.0.240.103/22' address: '10.0.240.110/22'
vm_int_iface: vm-br-eth4 vm_int_iface: vm-br-eth4
storage: storage:
iface: 'eth5' iface: 'eth5'
inet_type: 'static' inet_type: 'static'
address: '10.0.244.103/22' address: '10.0.244.110/22'
vm_int_iface: vm-br-eth5 vm_int_iface: vm-br-eth5

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

@ -35,12 +35,12 @@ server_networks:
mgmt: mgmt:
iface: 'eth1' iface: 'eth1'
inet_type: 'static' inet_type: 'static'
address: '10.0.236.109/22' address: '10.0.236.140/22'
vm_int_iface: vm-br-eth1 vm_int_iface: vm-br-eth1
flat: flat:
iface: 'eth2' iface: 'eth2'
inet_type: 'static' inet_type: 'static'
address: '10.0.248.109/22' address: '10.0.248.140/22'
vm_int_iface: vm-br-eth2 vm_int_iface: vm-br-eth2
vlan: vlan:
iface: 'eth3' iface: 'eth3'
@ -49,10 +49,10 @@ server_networks:
vxlan: vxlan:
iface: 'eth4' iface: 'eth4'
inet_type: 'static' inet_type: 'static'
address: '10.0.240.109/22' address: '10.0.240.140/22'
vm_int_iface: vm-br-eth4 vm_int_iface: vm-br-eth4
storage: storage:
iface: 'eth5' iface: 'eth5'
inet_type: 'static' inet_type: 'static'
address: '10.0.244.109/22' address: '10.0.244.140/22'
vm_int_iface: vm-br-eth5 vm_int_iface: vm-br-eth5

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

@ -19,7 +19,7 @@ server_hostname: 'swift2'
server_vm: true server_vm: true
server_vm_ram: 2048 server_vm_ram: 2048
server_vm_vcpus: 2 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_vm_primary_network: 'dhcp'
server_image: "{{ default_vm_image }}" server_image: "{{ default_vm_image }}"
server_default_interface: 'eth0' server_default_interface: 'eth0'
@ -35,12 +35,12 @@ server_networks:
mgmt: mgmt:
iface: 'eth1' iface: 'eth1'
inet_type: 'static' inet_type: 'static'
address: '10.0.236.110/22' address: '10.0.236.141/22'
vm_int_iface: vm-br-eth1 vm_int_iface: vm-br-eth1
flat: flat:
iface: 'eth2' iface: 'eth2'
inet_type: 'static' inet_type: 'static'
address: '10.0.248.110/22' address: '10.0.248.141/22'
vm_int_iface: vm-br-eth2 vm_int_iface: vm-br-eth2
vlan: vlan:
iface: 'eth3' iface: 'eth3'
@ -49,10 +49,10 @@ server_networks:
vxlan: vxlan:
iface: 'eth4' iface: 'eth4'
inet_type: 'static' inet_type: 'static'
address: '10.0.240.110/22' address: '10.0.240.141/22'
vm_int_iface: vm-br-eth4 vm_int_iface: vm-br-eth4
storage: storage:
iface: 'eth5' iface: 'eth5'
inet_type: 'static' inet_type: 'static'
address: '10.0.244.110/22' address: '10.0.244.141/22'
vm_int_iface: vm-br-eth5 vm_int_iface: vm-br-eth5

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

@ -19,7 +19,7 @@ server_hostname: 'swift3'
server_vm: true server_vm: true
server_vm_ram: 2048 server_vm_ram: 2048
server_vm_vcpus: 2 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_vm_primary_network: 'dhcp'
server_image: "{{ default_vm_image }}" server_image: "{{ default_vm_image }}"
server_default_interface: 'eth0' server_default_interface: 'eth0'
@ -35,12 +35,12 @@ server_networks:
mgmt: mgmt:
iface: 'eth1' iface: 'eth1'
inet_type: 'static' inet_type: 'static'
address: '10.0.236.111/22' address: '10.0.236.142/22'
vm_int_iface: vm-br-eth1 vm_int_iface: vm-br-eth1
flat: flat:
iface: 'eth2' iface: 'eth2'
inet_type: 'static' inet_type: 'static'
address: '10.0.248.111/22' address: '10.0.248.142/22'
vm_int_iface: vm-br-eth2 vm_int_iface: vm-br-eth2
vlan: vlan:
iface: 'eth3' iface: 'eth3'
@ -49,10 +49,10 @@ server_networks:
vxlan: vxlan:
iface: 'eth4' iface: 'eth4'
inet_type: 'static' inet_type: 'static'
address: '10.0.240.111/22' address: '10.0.240.142/22'
vm_int_iface: vm-br-eth4 vm_int_iface: vm-br-eth4
storage: storage:
iface: 'eth5' iface: 'eth5'
inet_type: 'static' inet_type: 'static'
address: '10.0.244.111/22' address: '10.0.244.142/22'
vm_int_iface: vm-br-eth5 vm_int_iface: vm-br-eth5

18
multi-node-aio/playbooks/inventory
View File

@ -10,15 +10,15 @@ mnaio1 ansible_host=10.0.2.1 ansible_connection=local
infra1 ansible_host=10.0.236.100 infra1 ansible_host=10.0.236.100
infra2 ansible_host=10.0.236.101 infra2 ansible_host=10.0.236.101
infra3 ansible_host=10.0.236.102 infra3 ansible_host=10.0.236.102
cinder2 ansible_host=10.0.236.108 cinder1 ansible_host=10.0.236.130
logging1 ansible_host=10.0.236.103 cinder2 ansible_host=10.0.236.131
compute1 ansible_host=10.0.236.105 compute1 ansible_host=10.0.236.120
compute2 ansible_host=10.0.236.106 compute2 ansible_host=10.0.236.121
cinder1 ansible_host=10.0.236.107 loadbalancer1 ansible_host=10.0.236.150
swift1 ansible_host=10.0.236.109 logging1 ansible_host=10.0.236.110
swift2 ansible_host=10.0.236.110 swift1 ansible_host=10.0.236.140
swift3 ansible_host=10.0.236.111 swift2 ansible_host=10.0.236.141
loadbalancer1 ansible_host=10.0.236.112 swift3 ansible_host=10.0.236.142
################################# MNAIO HOSTS ################################# ################################# MNAIO HOSTS #################################

97
multi-node-aio/playbooks/osa/openstack_user_config.yml
View File

@ -12,8 +12,8 @@ used_ips:
- "10.0.248.0,10.0.248.200" - "10.0.248.0,10.0.248.200"
global_overrides: global_overrides:
internal_lb_vip_address: "10.0.236.112" internal_lb_vip_address: "10.0.236.150"
external_lb_vip_address: "10.0.2.142" external_lb_vip_address: "10.0.2.150"
tunnel_bridge: "br-vxlan" tunnel_bridge: "br-vxlan"
management_bridge: "br-mgmt" management_bridge: "br-mgmt"
provider_networks: provider_networks:
@ -86,9 +86,37 @@ global_overrides:
### ###
### Anchors ### Anchors
### ###
log_block: &log_block cinder_block: &cinder_block
logging1: cinder1:
ip: 10.0.236.103 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 infra_block: &infra_block
infra1: infra1:
@ -100,49 +128,28 @@ infra_block: &infra_block
infra3: infra3:
ip: 10.0.236.102 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 loadbalancer_block: &loadbalancer_block
loadbalancer1: 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
### ###