Skip to content

Commit 7cbb8cc

Browse files
committed
Allow skipping RDO repo setup
Currently we always try to setup the RDO repo, but if we run the script on a RHEL repo it will fail to find the URL. With this patch we allow not setting up the repository.
1 parent bf41a5a commit 7cbb8cc

File tree

2 files changed

+7
-0
lines changed

2 files changed

+7
-0
lines changed

Makefile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -421,6 +421,7 @@ DATAPLANE_EXTRA_NOVA_CONFIG_FILE ?= /dev/null
421421
DATAPLANE_SERVER_ROLE ?= compute
422422
DATAPLANE_TLS_ENABLED ?= true
423423
DATAPLANE_NOVA_NFS_PATH ?=
424+
DATAPLANE_SKIP_REPO_SETUP ?=
424425

425426
# Manila
426427
MANILA_IMG ?= quay.io/openstack-k8s-operators/manila-operator-index:${OPENSTACK_K8S_TAG}
@@ -835,6 +836,7 @@ edpm_deploy_prep: export HASH=${OPENSTACK_COMMIT_HASH}
835836
edpm_deploy_prep: export EDPM_TLS_ENABLED=${DATAPLANE_TLS_ENABLED}
836837
edpm_deploy_prep: export EDPM_NOVA_NFS_PATH=${DATAPLANE_NOVA_NFS_PATH}
837838
edpm_deploy_prep: export EDPM_POST_GEN_SCRIPT=${DATAPLANE_POST_GEN_SCRIPT}
839+
edpm_deploy_prep: export EDPM_SKIP_REPO_SETUP=${DATAPLANE_SKIP_REPO_SETUP}
838840
ifeq ($(NETWORK_BGP), true)
839841
ifeq ($(BGP_OVN_ROUTING), true)
840842
edpm_deploy_prep: export BGP=ovn

scripts/gen-edpm-kustomize.sh

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -95,10 +95,15 @@ cat <<EOF >>kustomization.yaml
9595
EOF
9696
fi
9797

98+
if [ -z "$EDPM_SKIP_REPO_SETUP" ]; then
9899
cat <<EOF >>kustomization.yaml
99100
- op: add
100101
path: /spec/services/0
101102
value: repo-setup
103+
EOF
104+
fi
105+
106+
cat <<EOF >>kustomization.yaml
102107
- op: replace
103108
path: /spec/nodeTemplate/ansible/ansibleVars/timesync_ntp_servers
104109
value:

0 commit comments

Comments
 (0)