split org and project actors

Author: JoshuaFox

README.md

@@ -107,18 +107,12 @@ through [this tutorial](https://cloud.google.com/appengine/docs/standard/python3
   * Copy `config.yaml.original` to `config.yaml`.
   * Optionally configure by editing the configuration files ([See more documentation below](#configuration).)
 * Run `./deploy.sh <PROJECT_ID> `.
-    * The above is the default. There are also command-line options, to be put  at the end of the command line after the project id.
-      * Org and project
-        * Use `-o -p`  to deploy org elements and also project elements. If you omit both, then the default behavior is to deploy both, as if  `-o -p`  were given.
-        * Use `-o`  to deploy only org elements like roles and log sinks. You might want to do this if you have different people controlling the org and the project. 
-        * Once org elements are set up, only `-p` is needed, to deploy the Iris app to App Engine 
-      * Cloud Scheduler
-        * To use *only* Cloud Scheduler cron (i.e., without labeling resources on-creation), also use  `-c`.
-        * To *not at all* use Cloud Scheduler, delete schedule in `cron.yaml`.
+    * The above is the default. There are also command-line options, to be put  at the end of the command line after the project id. Run `deploy.sh -h` for documentation.
 * When you redeploy different versions of Iris code on top of old ones:
     * If new plugins were added or some removed, the log sink *will* be updated to reflect this.
-    * If the parameters for subscriptions or topics were changed in a new version of the Iris code, the subscriptions or
-      topics will *not* be updated. You would have to delete them first.
+    * If the parameters for subscriptions or topics were changed in a new version of the Iris code, the subscriptions or  topics will *not* be updated. You would have to delete them first.
+* If you are changing to or from  Cloud-Scheduler-only with or without `-c`, be sure to run both org and project deployments.         
+*  See `deploy.sh` for configuring Iris to add labels only with  Cloud Scheduler and not on-creation, or without the Scheduler at all, or with both Scheduler and on-creation. The latter is the default.
 
 ### Configuration
 

deploy.sh

@@ -63,9 +63,12 @@ while getopts 'cpo' opt; do
                   The project to which Iris 3 will be deployed
           Options, to be given at end of line, after project ID.
             If neither -p nor -o is given, this is treated as the default, -p -o (i.e., do both):
-                  -c: Use only Cloud Scheduler cron to add labels; do not add labels on resource creation.
                   -p: Deploy Iris (to the project given by the arg)
                   -o: Set up org-level elements like Log Sink
+                  -c: Use only Cloud Scheduler cron to add labels; do not add labels on resource creation.
+                  If you are changing to be Cloud-Scheduler-only with -c or not Cloud_Scheduler-only
+                  without -c, be sure to run both org and project deployments.
+                  (To *not at all* use Cloud Scheduler, delete the schedule in `cron.yaml`.)
           Environment variable:
                   GAEVERSION (Optional) sets the Google App Engine Version.
 EOF

scripts/_deploy-org.sh

@@ -36,6 +36,7 @@ gcloud organizations add-iam-policy-binding "$ORGID" \
 
 if [[ "$CRON_ONLY" == "true" ]]; then
   echo >&2 "CRON_ONLY set to true."
+
   gcloud logging sinks delete -q  --organization="$ORGID" "$LOG_SINK" || true
 else
   # Create PubSub topic for receiving logs about new GCP objects