From dd1e2e794af4d4a3d3a6a21ad1675d7b23178dac Mon Sep 17 00:00:00 2001 From: Alex-Welsh Date: Fri, 26 Jan 2024 11:26:39 +0000 Subject: [PATCH] Better pulp deployment automation --- README.rst | 6 ------ templates/deploy-openstack.tpl | 2 ++ 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/README.rst b/README.rst index c874a7a..8c9d5ee 100644 --- a/README.rst +++ b/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: -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 ---------------- diff --git a/templates/deploy-openstack.tpl b/templates/deploy-openstack.tpl index a811f0b..9850c94 100644 --- a/templates/deploy-openstack.tpl +++ b/templates/deploy-openstack.tpl @@ -48,6 +48,8 @@ if $(which apt 2>/dev/null >/dev/null); then sudo apt -y install uuid-runtime fi +%{ 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