From decd358666cf60524734f6069350bfcf7241ac9d Mon Sep 17 00:00:00 2001 From: Brendan Early Date: Tue, 18 May 2021 15:51:38 -0500 Subject: [PATCH] packages-static: have the init script mange solr config openshift does not allow subdirectories in configmap volumes. --- .../fedora-packages-static/templates/configmap.yml | 4 ++-- .../templates/packages/{conf => }/solrconfig.xml | 0 .../fedora-packages-static/templates/solr-start.sh | 10 +++++++++- 3 files changed, 11 insertions(+), 3 deletions(-) rename roles/openshift-apps/fedora-packages-static/templates/packages/{conf => }/solrconfig.xml (100%) diff --git a/roles/openshift-apps/fedora-packages-static/templates/configmap.yml b/roles/openshift-apps/fedora-packages-static/templates/configmap.yml index 830901e2ce..0cd8c85dfc 100644 --- a/roles/openshift-apps/fedora-packages-static/templates/configmap.yml +++ b/roles/openshift-apps/fedora-packages-static/templates/configmap.yml @@ -17,8 +17,8 @@ metadata: labels: app: fedora-packages-static data: - conf/solrconfig.xml: |- - {{ load_file('packages/conf/solrconfig.xml') | indent }} + solrconfig.xml: |- + {{ load_file('packages/solrconfig.xml') | indent }} schema.xml: |- {{ load_file('packages/schema.xml') | indent }} --- diff --git a/roles/openshift-apps/fedora-packages-static/templates/packages/conf/solrconfig.xml b/roles/openshift-apps/fedora-packages-static/templates/packages/solrconfig.xml similarity index 100% rename from roles/openshift-apps/fedora-packages-static/templates/packages/conf/solrconfig.xml rename to roles/openshift-apps/fedora-packages-static/templates/packages/solrconfig.xml diff --git a/roles/openshift-apps/fedora-packages-static/templates/solr-start.sh b/roles/openshift-apps/fedora-packages-static/templates/solr-start.sh index d5428c13f7..45a272560b 100644 --- a/roles/openshift-apps/fedora-packages-static/templates/solr-start.sh +++ b/roles/openshift-apps/fedora-packages-static/templates/solr-start.sh @@ -13,7 +13,15 @@ fi . /opt/docker-solr/scripts/run-initdb -/opt/docker-solr/scripts/precreate-core "packages" /opt/solr/server/solr/configsets/packages +# Manually arrange config files into directory structure solr needs because openshift just won't let this be simple +mkdir -p /var/solr/openshift/packages +cp /opt/solr/server/solr/configsets/packages/schema.xml /var/solr/openshift/packages + +mkdir -p /var/solr/openshift/packages/conf +cp /opt/solr/server/solr/configsets/packages/solrconfig.xml /var/solr/openshift/packages/conf + +# Create the core +/opt/docker-solr/scripts/precreate-core "packages" /var/solr/openshift/packages #!/bin/bash #