Better pulp deployment automation

Author: Alex-Welsh

README.rst

@@ -254,12 +254,6 @@ To set up a local pulp service on the seed, first obtain/generate a set of Ark c
    pulp_username: admin
    pulp_password: <randomly-generated-password-to-set-for-local-pulp-admin-user>
 
-Run the command below to automatically comment out the overrides in ``stackhpc-ci.yml`` for pointing to test pulp.
-
-.. code-block:: console
-
-   sed -i -e 's/^resolv_/#resolv_/g' -e 's/^stackhpc_repo_/#stackhpc_repo_/g' -e 's/^stackhpc_include/#stackhpc_include/g' -e 's/^stackhpc_docker_registry:/#stackhpc_docker_registry:/g' ~/src/kayobe-config/etc/kayobe/environments/ci-multinode/stackhpc-ci.yml
-
 Deploy OpenStack
 ----------------
 

templates/deploy-openstack.tpl

@@ -48,6 +48,9 @@ if $(which apt 2>/dev/null >/dev/null); then
     sudo apt -y install uuid-runtime
 fi
 
+# Edit config when deploying a local pulp repository
+%{ if deploy_pulp } sed -i -e 's/^resolv_/#resolv_/g' -e 's/^stackhpc_repo_/#stackhpc_repo_/g' -e 's/^stackhpc_include/#stackhpc_include/g' -e 's/^stackhpc_docker_registry:/#stackhpc_docker_registry:/g' $KAYOBE_CONFIG_PATH/environments/$KAYOBE_ENVIRONMENT/stackhpc-ci.yml %{ endif }
+
 # Configure hosts
 kayobe control host bootstrap
 kayobe seed host configure