X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=prototypes%2Fxci%2Ffile%2Fha%2Fopenstack_user_config.yml;h=09fb734c1c583c9fce27e40716d85ee7566e3e33;hb=7a1a66c416c3e0331ceb39833c078f2279e2ce7f;hp=43e88c0d00332586cbaaa1d6ea61db163b110877;hpb=ed99c6b49f48373eb2709e2dfdb4663cee2174e6;p=releng.git

diff --git a/prototypes/xci/file/ha/openstack_user_config.yml b/prototypes/xci/file/ha/openstack_user_config.yml
index 43e88c0d0..09fb734c1 100644
--- a/prototypes/xci/file/ha/openstack_user_config.yml
+++ b/prototypes/xci/file/ha/openstack_user_config.yml
@@ -138,7 +138,7 @@ image_hosts:
     container_vars:
       limit_container_types: glance
       glance_nfs_client:
-        - server: "172.29.244.15"
+        - server: "172.29.244.14"
           remote_path: "/images"
           local_path: "/var/lib/glance/images"
           type: "nfs"
@@ -148,7 +148,7 @@ image_hosts:
     container_vars:
       limit_container_types: glance
       glance_nfs_client:
-        - server: "172.29.244.15"
+        - server: "172.29.244.14"
           remote_path: "/images"
           local_path: "/var/lib/glance/images"
           type: "nfs"
@@ -158,7 +158,7 @@ image_hosts:
     container_vars:
       limit_container_types: glance
       glance_nfs_client:
-        - server: "172.29.244.15"
+        - server: "172.29.244.14"
           remote_path: "/images"
           local_path: "/var/lib/glance/images"
           type: "nfs"
@@ -200,33 +200,6 @@ network_hosts:
   controller02:
     ip: 172.29.236.13
 
-# ceilometer (telemetry API)
-metering-infra_hosts:
-  controller00:
-    ip: 172.29.236.11
-  controller01:
-    ip: 172.29.236.12
-  controller02:
-    ip: 172.29.236.13
-
-# aodh (telemetry alarm service)
-metering-alarm_hosts:
-  controller00:
-    ip: 172.29.236.11
-  controller01:
-    ip: 172.29.236.12
-  controller02:
-    ip: 172.29.236.13
-
-# gnocchi (telemetry metrics storage)
-metrics_hosts:
-  controller00:
-    ip: 172.29.236.11
-  controller01:
-    ip: 172.29.236.12
-  controller02:
-    ip: 172.29.236.13
-
 # nova hypervisors
 compute_hosts:
   compute00:
@@ -234,12 +207,6 @@ compute_hosts:
   compute01:
     ip: 172.29.236.15
 
-# ceilometer compute agent (telemetry)
-metering-compute_hosts:
-  compute00:
-    ip: 172.29.236.14
-  compute01:
-    ip: 172.29.236.15
 # cinder volume hosts (NFS-backed)
 # The settings here are repeated for each infra host.
 # They could instead be applied as global settings in
@@ -251,28 +218,37 @@ storage_hosts:
     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: "172.29.244.11"
+        nfs_volume:
+          volume_backend_name: NFS_VOLUME1
+          volume_driver: cinder.volume.drivers.nfs.NfsDriver
+          nfs_mount_options: "rsize=65535,wsize=65535,timeo=1200,actimeo=120"
+          nfs_shares_config: /etc/cinder/nfs_shares
+          shares:
+            - ip: "172.29.244.14"
+              share: "/volumes"
   controller01:
     ip: 172.29.236.12
     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: "172.29.244.12"
+        nfs_volume:
+          volume_backend_name: NFS_VOLUME1
+          volume_driver: cinder.volume.drivers.nfs.NfsDriver
+          nfs_mount_options: "rsize=65535,wsize=65535,timeo=1200,actimeo=120"
+          nfs_shares_config: /etc/cinder/nfs_shares
+          shares:
+            - ip: "172.29.244.14"
+              share: "/volumes"
   controller02:
     ip: 172.29.236.13
     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: "172.29.244.13"
+        nfs_volume:
+          volume_backend_name: NFS_VOLUME1
+          volume_driver: cinder.volume.drivers.nfs.NfsDriver
+          nfs_mount_options: "rsize=65535,wsize=65535,timeo=1200,actimeo=120"
+          nfs_shares_config: /etc/cinder/nfs_shares
+          shares:
+            - ip: "172.29.244.14"
+              share: "/volumes"