diff --git a/apb_devel/writing/getting_started.adoc b/apb_devel/writing/getting_started.adoc index 1ccafcb4b835..0a69b744a382 100644 --- a/apb_devel/writing/getting_started.adoc +++ b/apb_devel/writing/getting_started.adoc @@ -112,9 +112,14 @@ RUN chmod -R g=u /opt/{ansible,apb} USER apb ---- -. In the *_Dockerfile_*, you must now update `com.redhat.apb.spec` in the `LABEL` -instruction with a base64 encoded version of *_apb.yml_*. To do this, run `apb -prepare`: +. In the *_Dockerfile_*, there are two updates to make. The first is to change the +`FROM` directive to use the image from RHCC. The first line should now read: +---- +FROM openshift3/apb-base +---- + +. We must now update `com.redhat.apb.spec` in the `LABEL` instruction with a +base64 encoded version of *_apb.yml_*. To do this, run `apb prepare`: + ---- $ cd my-test-apb @@ -125,7 +130,7 @@ This updates the *_Dockerfile_* as follows: + .*_Dockerfile_* ---- -FROM ansibleplaybookbundle/apb-base +FROM openshift3/apb-base LABEL "com.redhat.apb.spec"=\ "dmVyc2lvbjogMS4wCm5hbWU6IG15LXRlc3QtYXBiCmRlc2NyaXB0aW9uOiBUaGlzIGlzIGEgc2Ft\ diff --git a/install_config/install/advanced_install.adoc b/install_config/install/advanced_install.adoc index f1ea291585e2..31a6d42ef3cd 100644 --- a/install_config/install/advanced_install.adoc +++ b/install_config/install/advanced_install.adoc @@ -1745,6 +1745,18 @@ endif::[] These settings create a persistent volume that is attached to the OAB's etcd instance during cluster installation. +==== Configuring the OpenShift Ansible Broker for local APB development + +In order to do APB development with the OpenShift Container Registry in conjunction +with the OAB, a whitelist must be defined. By default the whitelist is empty so that +a user cannot add APB images to the broker without a cluster administrator configuring +the broker. To whitelist all images that end in `-apb` we can add the following in the +`[OSEv3:vars]` section: + +---- +ansible_service_broker_local_registry_whitelist=['.*-apb$'] +---- + [[configuring-template-service-broker]] === Configuring the Template Service Broker