Streamlined networking, OpenShift recovery, Ganesha

1 files changed, 18 insertions, 7 deletions

diff --git a/opts.sh b/opts.sh
index 7e6d16f..ac1962a 100644
--- a/opts.sh
+++ b/opts.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 inventory="inventories/testing.erb"
-group="nodes"
+group="ands"
 
 usage() { 
     cat << END
@@ -23,14 +23,23 @@ Actions:
     configure           - configures OpenShift cluster (Storage, Users, OpenVPN tunnels)
     projects            - installs configuration files and OpenShift resources for KaaS and other configured projects
 
+ Additional services
+    ganesha             - provide external nfs access to gluster volumes
+
+ Maintenance
+    maintain            - check and fix running configuration
+    upgrade             - upgrade to a new version (Dangerous)
+    migrate <from> <to> - migrate GlusterFS bricks to a new server
+
  Scaling the cluster
+    masters             - complete action: prepares the masters/nodes, scales up the cluster, and reconfigures storage (if necessary)
     nodes               - complete action: prepares the nodes, scales up the cluster, and reconfigures storage (if necessary)
-    masters             - complete action: prepares the masters, scales up the cluster, and reconfigures storage
     prepare             - prepares the new nodes
+    openshift-masters   - scales OpenShift cluster with additional masters & nodes
     openshift-nodes     - scales OpenShift cluster with additional nodes
-    openshift-masters   - scales OpenShift cluster (master scallability is not checked)
+    openshift-etcd      - scales etcd cluster (if for some reason it was not performed during master/nodes scale-up)
+    openshift-gluster   - scale gluster pods and adapts heketi topology (if not performed during master/nodes scale-up)
     configure           - Configures new nodes (Storage, Users, OpenVPN tunnels)
-    upgrade             - Upgrade to a new version (Dangerous)
  
  Configuration of new resources, etc.
     users               - configure user roles & passwords
@@ -41,11 +50,13 @@ Actions:
     certs               - re-generate OpenShift x509 certificates
     check               - check current setup and report if any maintenace should be peformed
     setup <type>        - executes specific configuration task from ands-openshift
-                          Tasks: hostnames, users, ssh, storage, heketi
-
+                          Tasks: users, ssh, storage, heketi
  Custom actions
     playbook.yml        - execute the specified playbook (after ands_facts)
     role                - generates temporary playbook and executes the role
+
+ Ansible option
+    --limit <host>      - only execute rules on the specified host
     
 END
     echo
@@ -101,7 +112,7 @@ END
     fi
     
 #    ansible-playbook -vvv --vault-password-file .vault-pass -i $inventory $playbook $@
-    ansible-playbook --vault-password-file .vault-pass -i $inventory $playbook $@
+    ansible-playbook --vault-password-file .vault-pass -i $inventory $playbook "$@"
     
     if [ -n "$clean" ]; then
         rm -rf "$clean"