From a3d39c43cbf2310b789f514138241c10259025c2 Mon Sep 17 00:00:00 2001
From: Kevin Carter <kevin.carter@rackspace.com>
Date: Mon, 31 Jul 2017 17:46:51 -0500
Subject: [PATCH] fix typo in osa user config for swift and inets

Change-Id: I0befea6c7e403ca847721de3a5a8338e0e734098
Signed-off-by: Kevin Carter <kevin.carter@rackspace.com>
---
 .../playbooks/osa/openstack_user_config.yml   |  6 +--
 multi-node-aio/playbooks/vars/main.yml        | 44 +++++++++----------
 2 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/multi-node-aio/playbooks/osa/openstack_user_config.yml b/multi-node-aio/playbooks/osa/openstack_user_config.yml
index 88d35adc..669a5bfb 100644
--- a/multi-node-aio/playbooks/osa/openstack_user_config.yml
+++ b/multi-node-aio/playbooks/osa/openstack_user_config.yml
@@ -134,10 +134,10 @@ swift_block: &swift_block
   swift1:
     ip: 10.0.236.109
 
-  swift1:
+  swift2:
     ip: 10.0.236.110
 
-  swift1:
+  swift3:
     ip: 10.0.236.111
 
 loadbalancer_block: &loadbalancer_block
@@ -209,4 +209,4 @@ storage_hosts: *cinder_block
 swift_hosts: *swift_block
 
 # swift infra hosts
-swift-proxy_hosts: *infra_block
\ No newline at end of file
+swift-proxy_hosts: *infra_block
diff --git a/multi-node-aio/playbooks/vars/main.yml b/multi-node-aio/playbooks/vars/main.yml
index 1415ab14..82d8188a 100644
--- a/multi-node-aio/playbooks/vars/main.yml
+++ b/multi-node-aio/playbooks/vars/main.yml
@@ -207,12 +207,12 @@ servers:
         vm_int_iface: vm-br-eth3
       vxlan:
         iface: 'eth4'
-        inet_type: 'manual'
+        inet_type: 'static'
         address: '10.0.240.101/22'
         vm_int_iface: vm-br-eth4
       storage:
         iface: 'eth5'
-        inet_type: 'manual'
+        inet_type: 'static'
         address: '10.0.244.101/22'
         vm_int_iface: vm-br-eth5
   - server_hostname: 'infra3'
@@ -246,12 +246,12 @@ servers:
         vm_int_iface: vm-br-eth3
       vxlan:
         iface: 'eth4'
-        inet_type: 'manual'
+        inet_type: 'static'
         address: '10.0.240.102/22'
         vm_int_iface: vm-br-eth4
       storage:
         iface: 'eth5'
-        inet_type: 'manual'
+        inet_type: 'static'
         address: '10.0.244.102/22'
         vm_int_iface: vm-br-eth5
   - server_hostname: 'logging1'
@@ -285,12 +285,12 @@ servers:
         vm_int_iface: vm-br-eth3
       vxlan:
         iface: 'eth4'
-        inet_type: 'manual'
+        inet_type: 'static'
         address: '10.0.240.103/22'
         vm_int_iface: vm-br-eth4
       storage:
         iface: 'eth5'
-        inet_type: 'manual'
+        inet_type: 'static'
         address: '10.0.244.103/22'
         vm_int_iface: vm-br-eth5
   - server_hostname: 'compute1'
@@ -324,12 +324,12 @@ servers:
         vm_int_iface: vm-br-eth3
       vxlan:
         iface: 'eth4'
-        inet_type: 'manual'
+        inet_type: 'static'
         address: '10.0.240.105/22'
         vm_int_iface: vm-br-eth4
       storage:
         iface: 'eth5'
-        inet_type: 'manual'
+        inet_type: 'static'
         address: '10.0.244.105/22'
         vm_int_iface: vm-br-eth5
   - server_hostname: 'compute2'
@@ -363,12 +363,12 @@ servers:
         vm_int_iface: vm-br-eth3
       vxlan:
         iface: 'eth4'
-        inet_type: 'manual'
+        inet_type: 'static'
         address: '10.0.240.106/22'
         vm_int_iface: vm-br-eth4
       storage:
         iface: 'eth5'
-        inet_type: 'manual'
+        inet_type: 'static'
         address: '10.0.244.106/22'
         vm_int_iface: vm-br-eth5
   - server_hostname: 'cinder1'
@@ -402,12 +402,12 @@ servers:
         vm_int_iface: vm-br-eth3
       vxlan:
         iface: 'eth4'
-        inet_type: 'manual'
+        inet_type: 'static'
         address: '10.0.240.107/22'
         vm_int_iface: vm-br-eth4
       storage:
         iface: 'eth5'
-        inet_type: 'manual'
+        inet_type: 'static'
         address: '10.0.244.107/22'
         vm_int_iface: vm-br-eth5
   - server_hostname: 'cinder2'
@@ -441,12 +441,12 @@ servers:
         vm_int_iface: vm-br-eth3
       vxlan:
         iface: 'eth4'
-        inet_type: 'manual'
+        inet_type: 'static'
         address: '10.0.240.108/22'
         vm_int_iface: vm-br-eth4
       storage:
         iface: 'eth5'
-        inet_type: 'manual'
+        inet_type: 'static'
         address: '10.0.244.108/22'
         vm_int_iface: vm-br-eth5
   - server_hostname: 'swift1'
@@ -480,12 +480,12 @@ servers:
         vm_int_iface: vm-br-eth3
       vxlan:
         iface: 'eth4'
-        inet_type: 'manual'
+        inet_type: 'static'
         address: '10.0.240.109/22'
         vm_int_iface: vm-br-eth4
       storage:
         iface: 'eth5'
-        inet_type: 'manual'
+        inet_type: 'static'
         address: '10.0.244.109/22'
         vm_int_iface: vm-br-eth5
   - server_hostname: 'swift2'
@@ -519,12 +519,12 @@ servers:
         vm_int_iface: vm-br-eth3
       vxlan:
         iface: 'eth4'
-        inet_type: 'manual'
+        inet_type: 'static'
         address: '10.0.240.110/22'
         vm_int_iface: vm-br-eth4
       storage:
         iface: 'eth5'
-        inet_type: 'manual'
+        inet_type: 'static'
         address: '10.0.244.110/22'
         vm_int_iface: vm-br-eth5
   - server_hostname: 'swift3'
@@ -558,12 +558,12 @@ servers:
         vm_int_iface: vm-br-eth3
       vxlan:
         iface: 'eth4'
-        inet_type: 'manual'
+        inet_type: 'static'
         address: '10.0.240.111/22'
         vm_int_iface: vm-br-eth4
       storage:
         iface: 'eth5'
-        inet_type: 'manual'
+        inet_type: 'static'
         address: '10.0.244.111/22'
         vm_int_iface: vm-br-eth5
   - server_hostname: 'loadbalancer1'
@@ -597,12 +597,12 @@ servers:
         vm_int_iface: vm-br-eth3
       vxlan:
         iface: 'eth4'
-        inet_type: 'manual'
+        inet_type: 'static'
         address: '10.0.240.112/22'
         vm_int_iface: vm-br-eth4
       storage:
         iface: 'eth5'
-        inet_type: 'manual'
+        inet_type: 'static'
         address: '10.0.244.112/22'
         vm_int_iface: vm-br-eth5
 ############### SERVERS ###############