From 75ff9b4407cff88c32c079dde5a23383e3cd8f93 Mon Sep 17 00:00:00 2001
From: Michael Polenchuk <mpolenchuk@mirantis.com>
Date: Wed, 13 Sep 2017 12:18:19 +0400
Subject: [virtual] Setup nfs for nova instances

Configure nfs shared storage for nova instances
to support live migration feature.

Change-Id: I777d5725e45d03325507d3ecc8dd59a28cbc188f
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
---
 mcp/config/states/openstack                                 |  4 ++++
 .../cluster/virtual-mcp-ocata-common/openstack_compute.yml  |  8 ++++++++
 .../cluster/virtual-mcp-ocata-common/openstack_control.yml  | 13 +++++++++++++
 mcp/scripts/salt.sh                                         |  3 ++-
 4 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/mcp/config/states/openstack b/mcp/config/states/openstack
index eaab1353f..beb6abb63 100755
--- a/mcp/config/states/openstack
+++ b/mcp/config/states/openstack
@@ -1,6 +1,10 @@
 #!/bin/bash
 set -x
 
+salt -I 'nfs:server' file.mkdir /srv/nova/instances
+salt -I 'nfs:server' state.sls nfs
+salt -I 'nfs:client' state.sls nfs
+
 salt -I 'rabbitmq:server' state.sls rabbitmq
 salt -I 'rabbitmq:server' cmd.run "rabbitmqctl status"
 
diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/openstack_compute.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/openstack_compute.yml
index 2485d1ff2..978f468e6 100644
--- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/openstack_compute.yml
+++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/openstack_compute.yml
@@ -3,6 +3,7 @@ classes:
 - system.linux.system.repo.mcp.extra
 - system.linux.system.repo.saltstack.xenial
 - system.linux.storage.loopback
+- service.nfs.client
 - system.nova.compute.single
 - service.neutron.compute.single
 - service.cinder.volume.single
@@ -44,6 +45,13 @@ parameters:
         host: ${_param:cluster_local_address}
       message_queue:
         host: ${_param:cluster_local_address}
+  nfs:
+    client:
+      mount:
+        nfs:
+          path: /var/lib/nova/instances
+          fstype: nfs
+          device: ${_param:openstack_control_address}:/srv/nova/instances
   linux:
     network:
       bridge: openvswitch
diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/openstack_control.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/openstack_control.yml
index 5b68b7b62..64e6f4d00 100644
--- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/openstack_control.yml
+++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/openstack_control.yml
@@ -3,6 +3,7 @@ classes:
 - system.linux.system.repo.mcp.openstack
 - system.linux.system.repo.mcp.extra
 - system.linux.system.repo.saltstack.xenial
+- service.nfs.server
 - system.mongodb.server.single
 - system.mongodb.server.database.ceilometer
 - system.ceilometer.client
@@ -112,3 +113,15 @@ parameters:
         address: ${_param:cluster_local_address},127.0.0.1
       logging:
         verbose: v
+  nfs:
+    server:
+      share:
+        nova_instances:
+          path: /srv/nova/instances
+          host:
+            nova:
+              host: ${_param:single_address}/24
+              params:
+              - rw
+              - no_root_squash
+              - async
diff --git a/mcp/scripts/salt.sh b/mcp/scripts/salt.sh
index 7f2c3cac7..c6d8e73a7 100755
--- a/mcp/scripts/salt.sh
+++ b/mcp/scripts/salt.sh
@@ -47,7 +47,8 @@ ssh ${SSH_OPTS} "${SSH_SALT}" bash -s << SALT_INSTALL_END
   cd /srv/salt/scripts
   BOOTSTRAP_SALTSTACK_OPTS=" -r -dX stable 2016.11 " \
     MASTER_HOSTNAME=cfg01.${CLUSTER_DOMAIN} DISTRIB_REVISION=nightly \
-      ./salt-master-init.sh
+      EXTRA_FORMULAS="nfs" \
+        ./salt-master-init.sh
   salt-key -Ay
 
   cp -r ${OPNFV_FUEL_DIR}/mcp/salt-formulas/* /usr/share/salt-formulas/env
-- 
cgit 1.2.3-korg