Merge remote-tracking branch 'upstream/master' into cluster_name_for_ceph_fetch_keys

generate_group_vars_sample.sh

@@ -11,7 +11,7 @@ for role in "$basedir"/roles/ceph-*; do
   elif [[ $rolename == "ceph-agent" ]]; then
       output="agent.sample"
   elif [[ $rolename == "ceph-fetch-keys" ]]; then
-      continue
+      output="ceph-fetch-keys.sample"
   else
       output="${rolename:5}s.sample"
   fi

group_vars/ceph-fetch-keys.sample

@@ -0,0 +1,12 @@
+---
+# Variables here are applicable to all host groups NOT roles
+
+# This sample file generated by generate_group_vars_sample.sh
+
+# Dummy variable to avoid error because ansible does not recognize the
+# file as a good configuration file when no variable in it.
+dummy:
+
+
+#fetch_directory: fetch/
+

roles/ceph-rgw/tasks/openstack-keystone.yml

@@ -1,13 +1,13 @@
 ---
-- name: install libnss3-tools on redhat
+- name: install nss-tools on redhat
   yum:
-    name: libnss3-tools
+    name: nss-tools
     state: present
   when: ansible_pkg_mgr == "yum"
 
-- name: install libnss3-tools on redhat
+- name: install nss-tools on redhat
   dnf:
-    name: libnss3-tools
+    name: nss-tools
     state: present
   when: ansible_pkg_mgr == "dnf"