Bug fix: NFS clients pointing to wrong server

We are deploying the NFS server in computes. In all flavors, node2
takes the role of compute00 and thus the NFS server is in
172.29.244.12. Therefore, the openstack config for ha is wrong

Change-Id: I5e82ddd670b44e291c0b866ba4fde57e74b68643
Signed-off-by: Manuel Buil <mbuil@suse.com>

diff --git a/xci/installer/osa/files/ha/openstack_user_config.yml b/xci/installer/osa/files/ha/openstack_user_config.yml
index 360aa5c..dc2ec18 100644 (file)
--- a/xci/installer/osa/files/ha/openstack_user_config.yml
+++ b/xci/installer/osa/files/ha/openstack_user_config.yml
@@ -77,18 +77,18 @@ shared-infra_hosts:
   controller00:
     ip: 172.29.236.11
   controller01:
-    ip: 172.29.236.12
+    ip: 172.29.236.14
   controller02:
-    ip: 172.29.236.13
+    ip: 172.29.236.15
 
 # repository (apt cache, python packages, etc)
 repo-infra_hosts:
   controller00:
     ip: 172.29.236.11
   controller01:
-    ip: 172.29.236.12
+    ip: 172.29.236.14
   controller02:
-    ip: 172.29.236.13
+    ip: 172.29.236.15
 
 # load balancer
 # Ideally the load balancer should not use the Infrastructure hosts.
@@ -97,9 +97,9 @@ haproxy_hosts:
   controller00:
     ip: 172.29.236.11
   controller01:
-    ip: 172.29.236.12
+    ip: 172.29.236.14
   controller02:
-    ip: 172.29.236.13
+    ip: 172.29.236.15
 
 # rsyslog server
 # log_hosts:
@@ -115,18 +115,18 @@ identity_hosts:
   controller00:
     ip: 172.29.236.11
   controller01:
-    ip: 172.29.236.12
+    ip: 172.29.236.14
   controller02:
-    ip: 172.29.236.13
+    ip: 172.29.236.15
 
 # cinder api services
 storage-infra_hosts:
   controller00:
     ip: 172.29.236.11
   controller01:
-    ip: 172.29.236.12
+    ip: 172.29.236.14
   controller02:
-    ip: 172.29.236.13
+    ip: 172.29.236.15
 
 # glance
 # The settings here are repeated for each infra host.
@@ -139,27 +139,27 @@ image_hosts:
     container_vars:
       limit_container_types: glance
       glance_nfs_client:
-        - server: "172.29.244.14"
+        - server: "172.29.244.12"
           remote_path: "/images"
           local_path: "/var/lib/glance/images"
           type: "nfs"
           options: "_netdev,auto"
   controller01:
-    ip: 172.29.236.12
+    ip: 172.29.236.14
     container_vars:
       limit_container_types: glance
       glance_nfs_client:
-        - server: "172.29.244.14"
+        - server: "172.29.244.12"
           remote_path: "/images"
           local_path: "/var/lib/glance/images"
           type: "nfs"
           options: "_netdev,auto"
   controller02:
-    ip: 172.29.236.13
+    ip: 172.29.236.15
     container_vars:
       limit_container_types: glance
       glance_nfs_client:
-        - server: "172.29.244.14"
+        - server: "172.29.244.12"
           remote_path: "/images"
           local_path: "/var/lib/glance/images"
           type: "nfs"
@@ -170,43 +170,43 @@ compute-infra_hosts:
   controller00:
     ip: 172.29.236.11
   controller01:
-    ip: 172.29.236.12
+    ip: 172.29.236.14
   controller02:
-    ip: 172.29.236.13
+    ip: 172.29.236.15
 
 # heat
 orchestration_hosts:
   controller00:
     ip: 172.29.236.11
   controller01:
-    ip: 172.29.236.12
+    ip: 172.29.236.14
   controller02:
-    ip: 172.29.236.13
+    ip: 172.29.236.15
 
 # horizon
 dashboard_hosts:
   controller00:
     ip: 172.29.236.11
   controller01:
-    ip: 172.29.236.12
+    ip: 172.29.236.14
   controller02:
-    ip: 172.29.236.13
+    ip: 172.29.236.15
 
 # neutron server, agents (L3, etc)
 network_hosts:
   controller00:
     ip: 172.29.236.11
   controller01:
-    ip: 172.29.236.12
+    ip: 172.29.236.14
   controller02:
-    ip: 172.29.236.13
+    ip: 172.29.236.15
 
 # nova hypervisors
 compute_hosts:
   compute00:
-    ip: 172.29.236.14
+    ip: 172.29.236.12
   compute01:
-    ip: 172.29.236.15
+    ip: 172.29.236.13
 
 # cinder volume hosts (NFS-backed)
 # The settings here are repeated for each infra host.
@@ -225,10 +225,10 @@ storage_hosts:
           nfs_mount_options: "rsize=65535,wsize=65535,timeo=1200,actimeo=120"
           nfs_shares_config: /etc/cinder/nfs_shares
           shares:
-            - ip: "172.29.244.14"
+            - ip: "172.29.244.12"
               share: "/volumes"
   controller01:
-    ip: 172.29.236.12
+    ip: 172.29.236.14
     container_vars:
       cinder_backends:
         limit_container_types: cinder_volume
@@ -238,10 +238,10 @@ storage_hosts:
           nfs_mount_options: "rsize=65535,wsize=65535,timeo=1200,actimeo=120"
           nfs_shares_config: /etc/cinder/nfs_shares
           shares:
-            - ip: "172.29.244.14"
+            - ip: "172.29.244.12"
               share: "/volumes"
   controller02:
-    ip: 172.29.236.13
+    ip: 172.29.236.15
     container_vars:
       cinder_backends:
         limit_container_types: cinder_volume
@@ -251,5 +251,5 @@ storage_hosts:
           nfs_mount_options: "rsize=65535,wsize=65535,timeo=1200,actimeo=120"
           nfs_shares_config: /etc/cinder/nfs_shares
           shares:
-            - ip: "172.29.244.14"
+            - ip: "172.29.244.12"
               share: "/volumes"