Merge pull request #286 from openstack-k8s-operators/csibbitt-patch-1

README.md fixes from trying to follow it

Author: openshift-merge-bot[bot]

README.md

@@ -36,7 +36,7 @@ To know when dataplane-operator finishes, you have to keep looking at "*-edpm" p
 
 You can also make your process wait until everything finishes:
 ```
-DATAPLANE_TOTAL_NODES=2 DATAPLANE_NTP_SERVER=clock.redhat.com make edpm_deploy_wait
+DATAPLANE_TOTAL_NODES=2 DATAPLANE_NTP_SERVER=clock.redhat.com make edpm_wait_deploy
 ```
 
 5.- Refresh Nova discover hosts
@@ -46,30 +46,43 @@ make edpm_nova_discover_hosts
 
 Now, we proceed to run our own telemetry-operator instance:
 
-6.- Remove Ceilometer deployment
+6.- Remove Telemetry deployment
 ```
-oc patch openstackcontrolplane openstack-galera-network-isolation --type='json' -p='[{"op": "replace", "path": "/spec/ceilometer/enabled", "value":false}]'
+oc patch openstackcontrolplane openstack-galera-network-isolation --type='json' -p='[{"op": "replace", "path": "/spec/telemetry/enabled", "value":false}]'
 ```
 
 7.- Remove telemetry-operator from the deployments
 ```
 oc project openstack-operators
-oc remove csv telemetry-operator.v0.0.1
+oc delete csv telemetry-operator.v0.0.1
 ```
 
 8.- Deploy custom telemetry-operator version
+
+NOTE: If you intend to deploy a custom telemetry object *with pre-populated image URLs*, you can use `make run` instead of `make run-with-webhook`, because the webhooks will not be required.
+
 ```
 cd telemetry-operator
 
 oc delete -f config/crd/bases/
 oc apply -f config/crd/bases/
 
 make manifests generate
-OPERATOR_TEMPLATES=$PWD/templates make run
+OPERATOR_TEMPLATES=$PWD/templates make run-with-webhook
 ```
 
-9.- Deploy Telemetry:
+
+9.- Deploy Telemetry
+
+There are two options, either let openstack-operator manage a telemetry object, or disable openstack-operator and manage it yourself.
+
+9a.- To continue running openstack-operator and use a telemetry object under its control, re-enable telemetry in the oscp:
+```
+oc patch openstackcontrolplane openstack-galera-network-isolation --type='json' -p='[{"op": "replace", "path": "/spec/telemetry/enabled", "value":true}]'
+```
+9b - To disable openstack-operator and use a custom telemetry object
 ```
+oc scale deploy/openstack-operator-controller-manager --replicas=0 -n openstack-operators
 oc apply -f config/samples/telemetry_v1beta1_telemetry.yaml
 ```