diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2017-09-13 17:08:01 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2017-09-13 17:08:01 +0000 |
| commit | 6d90d3be1fbb7526587a305167e3295bc956d5d4 (patch) | |
| tree | 916c9d61cc19b6f13ee9125d0462831c684be662 | |
| parent | 06d34f4086f0dcc515b6db0eab3fdeb2d15de640 (diff) | |
| parent | 75ff9b4407cff88c32c079dde5a23383e3cd8f93 (diff) | |
Merge "[virtual] Setup nfs for nova instances"
4 files changed, 27 insertions, 1 deletions
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 |