Remove the deploy vm and use the log node instead

This reduces the resource consumption by removing the deploy node and
using the log node instead. This also ups the ram allocation to the
infra hosts which will improve the deployment experience by ensuring we
don't run out of memory.

Change-Id: Id38ff386669308ac3fd1e539ae37c969f00353b8
Signed-off-by: Kevin Carter <kevin.carter@rackspace.com>

multi-node-aio/playbooks/deploy-osa.yml

@@ -216,12 +216,13 @@
         - tmux send-keys "ulimit -n 10240" C-m
         - tmux send-keys "openstack-ansible setup-everything.yml" C-m
       when:
+        - inventory_hostname == groups['deploy_hosts'][0]
         - run_osa | default(true) | bool
 
     - name: Finished notice
       debug:
         msg: |
           OSA deploy running. To check on the state of this deployment, login
-          to the deploy1 VM and attach to the "build-osa" tmux session.
+          to the {{ groups['deploy_hosts'][0] }} VM and attach to the "build-osa" tmux session.
       when:
         - run_osa | default(true) | bool

multi-node-aio/playbooks/inventory

@@ -13,7 +13,6 @@ cinder2 ansible_host=10.0.236.108
 swift1 ansible_host=10.0.236.109
 swift2 ansible_host=10.0.236.110
 swift3 ansible_host=10.0.236.111
-deploy1 ansible_host=10.0.236.112
 
 [pxe_hosts]
 mnaio1
@@ -25,7 +24,7 @@ mnaio1
 mnaio1
 
 [deploy_hosts]
-deploy1
+log1
 
 [swift_hosts]
 swift1
@@ -48,4 +47,3 @@ cinder1
 swift1
 swift2
 swift3
-deploy1

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.150"
+  internal_lb_vip_address: "10.0.2.110"
+  external_lb_vip_address: "10.0.236.103"
   tunnel_bridge: "br-vxlan"
   management_bridge: "br-mgmt"
   provider_networks:
@@ -86,6 +86,10 @@ global_overrides:
 ###
 ### Anchors
 ###
+log_block: &log_block
+  log1:
+    ip: 10.0.236.103
+
 infra_block: &infra_block
   infra1:
     ip: 10.0.236.100
@@ -147,14 +151,11 @@ shared-infra_hosts: *infra_block
 repo-infra_hosts: *infra_block
 
 # rsyslog server
-log_hosts:
-  log1:
-    ip: 10.0.236.103
+log_hosts: *log_block
+
 
 # load balancer
-haproxy_hosts:
-  deploy1:
-    ip: 10.0.236.112
+haproxy_hosts: *log_block
 
 ###
 ### OpenStack

multi-node-aio/playbooks/vars/main.yml

@@ -139,7 +139,7 @@ pxelinux_short_name: "syslinux-6.03"
 # List of servers to create specific mac address bound boot entries.
 servers:
   - server_hostname: 'infra1'               # str  - required, hostname of server
-    server_vm_ram: 4096                     # int  - not required, used to specify ram when provisioning a VM
+    server_vm_ram: 6144                     # 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
@@ -178,7 +178,7 @@ servers:
         address: '10.0.244.100/22'          # str  - not required, must be in CIDR format
         vm_int_iface: vm-br-eth5            # str  - not Required, used to specify an integration networks interface when provisioning a VM
   - server_hostname: 'infra2'
-    server_vm_ram: 4096
+    server_vm_ram: 6144
     server_vm_vcpus: 4
     server_vm_fixed_addr: '10.0.2.101'
     server_vm_primary_network: 'dhcp'
@@ -217,7 +217,7 @@ servers:
         address: '10.0.244.101/22'
         vm_int_iface: vm-br-eth5
   - server_hostname: 'infra3'
-    server_vm_ram: 4096
+    server_vm_ram: 6144
     server_vm_vcpus: 4
     server_vm_fixed_addr: '10.0.2.102'
     server_vm_primary_network: 'dhcp'
@@ -257,7 +257,7 @@ servers:
         vm_int_iface: vm-br-eth5
   - server_hostname: 'logging1'
     server_vm_ram: 2048
-    server_vm_vcpus: 1
+    server_vm_vcpus: 2
     server_vm_fixed_addr: '10.0.2.110'
     server_vm_primary_network: 'dhcp'
     server_image: "{{ default_vm_image }}"
@@ -567,45 +567,6 @@ servers:
         inet_type: 'manual'
         address: '10.0.244.111/22'
         vm_int_iface: vm-br-eth5
-  - server_hostname: 'deploy1'
-    server_vm_ram: 2048
-    server_vm_vcpus: 2
-    server_vm_fixed_addr: '10.0.2.150'
-    server_vm_primary_network: 'dhcp'
-    server_image: "{{ default_vm_image }}"
-    server_default_interface: 'eth0'
-    server_mac_address: '52:54:00:bd:80:12'
-    server_preseed_ks: 'vm'
-    server_extra_options: ''
-    server_networks:
-      dhcp:
-        iface: 'eth0'
-        inet_type: 'dhcp'
-        vm_int_iface: vm-br-dhcp
-      mgmt:
-        iface: 'eth1'
-        inet_type: 'static'
-        address: '10.0.236.112/22'
-        vm_int_iface: vm-br-eth1
-      flat:
-        iface: 'eth2'
-        inet_type: 'static'
-        address: '10.0.248.112/22'
-        vm_int_iface: vm-br-eth2
-      vlan:
-        iface: 'eth3'
-        inet_type: 'manual'
-        vm_int_iface: vm-br-eth3
-      vxlan:
-        iface: 'eth4'
-        inet_type: 'manual'
-        address: '10.0.240.112/22'
-        vm_int_iface: vm-br-eth4
-      storage:
-        iface: 'eth5'
-        inet_type: 'manual'
-        address: '10.0.244.112/22'
-        vm_int_iface: vm-br-eth5
 ############### SERVERS ###############