Fix problems with adding new NFS

This commit fixes following issues: 1. NFS should be deployed on RGW hosts only. We support it by suggesting to deploy RGW on the side. 2. ceph-rest-api does not install keyrings, need to execute ceph-client before. Change-Id: I2943de3b8d081dbafaede5f7fab8a7d1def95787
Mirantis · Apr 11, 2017 · d836d15 · d836d15
1 parent 2c64040
commit d836d15
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 4 deletions.
diff --git a/backend/common/decapod_common/playbooks/plays/deploy_restapi.yaml b/backend/common/decapod_common/playbooks/plays/deploy_restapi.yaml
@@ -17,6 +17,13 @@
 
 - include: "{{ decapod_common_playbooks }}/plays/add_ceph_ansible_role.yaml"
 
+- hosts: restapis
+  become: true
+  vars:
+    user_config: false
+  roles:
+  - ceph-client
+
 - hosts: restapis
   become: true
   roles:

diff --git a/plugins/playbook/add_nfs/decapod_plugin_playbook_add_nfs/playbook.yaml b/plugins/playbook/add_nfs/decapod_plugin_playbook_add_nfs/playbook.yaml
@@ -15,7 +15,7 @@
 # limitations under the License.
 
 
-- include: "{{ decapod_common_playbooks }}/plays/add_ceph_ansible_role.yaml"
+- include: "{{ decapod_common_playbooks }}/plays/deploy_rgw.yaml"
 
 - hosts: nfss
   become: true

diff --git a/plugins/playbook/add_nfs/decapod_plugin_playbook_add_nfs/plugin.py b/plugins/playbook/add_nfs/decapod_plugin_playbook_add_nfs/plugin.py
@@ -47,6 +47,12 @@
         "typename": "boolean",
         "type": "boolean",
         "default_value": False
+    },
+    "deploy_rgw": {
+        "description": "Deploy Rados Gateway on the same machines",
+        "typename": "boolean",
+        "type": "boolean",
+        "default_value": True
     }
 }
 """Schema for playbook hints."""
@@ -132,9 +138,14 @@ def get_inventory_groups(self, cluster, servers, hints):
             for item in cluster.configuration.state if item["role"] == "mons"
         ]
 
+        rgws = []
+        if hints["deploy_rgw"]:
+            rgws = servers
+
         return {
             "mons": mons,
             "nfss": servers,
+            "rgws": rgws,
             "already_deployed": list(cluster_servers.values())
         }
 

diff --git a/plugins/playbook/add_rgw/decapod_plugin_playbook_add_rgw/plugin.py b/plugins/playbook/add_rgw/decapod_plugin_playbook_add_rgw/plugin.py
@@ -23,9 +23,7 @@
 from decapod_common.models import server
 
 
-DESCRIPTION = """\
-add_rgw plugin for Decapod
-""".strip()
+DESCRIPTION = "Add Rados Gateway to the cluster"
 """Plugin description."""
 
 HINTS_SCHEMA = {