Added -r option for update-openstack-resources.sh script

Also made a tiny fix in the cleanup script.

Related-PROD: PROD-37187

Change-Id: I91ba3e56640f0898e6fb50ebb8257d8fd88d84ed
diff --git a/cleanup.py b/cleanup.py
index 403e549..55a2f90 100644
--- a/cleanup.py
+++ b/cleanup.py
@@ -594,7 +594,6 @@
     cleanup_volume_group_types()
     cleanup_volume_types()
     cleanup_images()
-    cleanup_sec_groups()
     cleanup_keypairs()
     cleanup_users()
     cleanup_roles()
@@ -602,6 +601,7 @@
     cleanup_regions()
     cleanup_routers()
     cleanup_networks()
+    cleanup_sec_groups()
     if object_store_present:
         cleanup_containers()
     cleanup_floating_ips()