From 093a88d54433a3f3ae23a0371df2b9bb8cad02ec Mon Sep 17 00:00:00 2001 From: Fatih Degirmenci Date: Tue, 18 Apr 2017 10:53:21 +0200 Subject: xci: Change cinder backend and move nfs to compute00 This change - switches cinder backend from lvm to nfs as examplified in [1]. - moves nfs shares from compute01 to compute00 in order to merge configure-targethosts.yml playbook in upcoming change. - updates openstack_user_config.yml to reflect the switch to nfs and move of nfs server to compute00. - removes exports file due to switching to lineinfile module. [1] https://docs.openstack.org/project-deploy-guide/openstack-ansible/draft/app-config-prod.html Change-Id: I0715c98a89ab124256e3857c1047e374f261e39b Signed-off-by: Fatih Degirmenci --- xci/file/exports | 14 ---------- xci/file/ha/configure-targethosts.yml | 2 +- xci/file/ha/openstack_user_config.yml | 45 ++++++++++++++++++++------------- xci/file/mini/configure-targethosts.yml | 4 +++ xci/file/mini/openstack_user_config.yml | 13 ++++++---- xci/file/noha/configure-targethosts.yml | 2 +- xci/file/noha/openstack_user_config.yml | 13 ++++++---- 7 files changed, 49 insertions(+), 44 deletions(-) delete mode 100644 xci/file/exports (limited to 'xci/file') diff --git a/xci/file/exports b/xci/file/exports deleted file mode 100644 index af64d618..00000000 --- a/xci/file/exports +++ /dev/null @@ -1,14 +0,0 @@ -# /etc/exports: the access control list for filesystems which may be exported -# to NFS clients. See exports(5). -# -# Example for NFSv2 and NFSv3: -# /srv/homes hostname1(rw,sync,no_subtree_check) hostname2(ro,sync,no_subtree_check) -# -# Example for NFSv4: -# /srv/nfs4 gss/krb5i(rw,sync,fsid=0,crossmnt,no_subtree_check) -# /srv/nfs4/homes gss/krb5i(rw,sync,no_subtree_check) -# -# glance images are stored on compute host and made available to image hosts via nfs -# see image_hosts section in openstack_user_config.yml for details -/images *(rw,sync,no_subtree_check,no_root_squash) - diff --git a/xci/file/ha/configure-targethosts.yml b/xci/file/ha/configure-targethosts.yml index b03891d0..50da1f22 100644 --- a/xci/file/ha/configure-targethosts.yml +++ b/xci/file/ha/configure-targethosts.yml @@ -29,7 +29,7 @@ # we need to force sync time with ntp or the nodes will be out of sync timewise - role: synchronize-time -- hosts: compute01 +- hosts: compute00 remote_user: root # TODO: this role is for configuring NFS on xenial and adjustment needed for other distros roles: diff --git a/xci/file/ha/openstack_user_config.yml b/xci/file/ha/openstack_user_config.yml index 0c43702c..09fb734c 100644 --- a/xci/file/ha/openstack_user_config.yml +++ b/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" @@ -218,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" diff --git a/xci/file/mini/configure-targethosts.yml b/xci/file/mini/configure-targethosts.yml index 7a20c0f6..50da1f22 100644 --- a/xci/file/mini/configure-targethosts.yml +++ b/xci/file/mini/configure-targethosts.yml @@ -28,5 +28,9 @@ - { role: configure-network, src: "../template/compute.interface.j2", dest: "/etc/network/interfaces" } # we need to force sync time with ntp or the nodes will be out of sync timewise - role: synchronize-time + +- hosts: compute00 + remote_user: root # TODO: this role is for configuring NFS on xenial and adjustment needed for other distros + roles: - role: configure-nfs diff --git a/xci/file/mini/openstack_user_config.yml b/xci/file/mini/openstack_user_config.yml index 70429cea..f9ccee24 100644 --- a/xci/file/mini/openstack_user_config.yml +++ b/xci/file/mini/openstack_user_config.yml @@ -160,8 +160,11 @@ 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.12" + share: "/volumes" diff --git a/xci/file/noha/configure-targethosts.yml b/xci/file/noha/configure-targethosts.yml index b03891d0..50da1f22 100644 --- a/xci/file/noha/configure-targethosts.yml +++ b/xci/file/noha/configure-targethosts.yml @@ -29,7 +29,7 @@ # we need to force sync time with ntp or the nodes will be out of sync timewise - role: synchronize-time -- hosts: compute01 +- hosts: compute00 remote_user: root # TODO: this role is for configuring NFS on xenial and adjustment needed for other distros roles: diff --git a/xci/file/noha/openstack_user_config.yml b/xci/file/noha/openstack_user_config.yml index 05de6a9c..8406d7b4 100644 --- a/xci/file/noha/openstack_user_config.yml +++ b/xci/file/noha/openstack_user_config.yml @@ -162,8 +162,11 @@ 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.12" + share: "/volumes" -- cgit