From b403767c46555b62524cbc398b97a9302db9e019 Mon Sep 17 00:00:00 2001 From: wrider Date: Thu, 5 Sep 2019 12:33:27 -0400 Subject: [PATCH] Minor fixes Signed-off-by: wrider Change-Id: I294dc5721319d2737a0bf7f1e7a29ffcd5a4a2e5 Signed-off-by: wrider --- RECIPE_EXAMPLE/RIC_INFRA_RECIPE_EXAMPLE | 2 +- ric-xapps/90-xApps/bin/install | 5 ++--- ric-xapps/90-xApps/etc/xapp.conf | 2 +- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/RECIPE_EXAMPLE/RIC_INFRA_RECIPE_EXAMPLE b/RECIPE_EXAMPLE/RIC_INFRA_RECIPE_EXAMPLE index 5dcdd963..7a66bb11 100644 --- a/RECIPE_EXAMPLE/RIC_INFRA_RECIPE_EXAMPLE +++ b/RECIPE_EXAMPLE/RIC_INFRA_RECIPE_EXAMPLE @@ -86,7 +86,7 @@ global: cluster: deployK8S: false deployNexus: false - deployK8SMonitoringStake: false + deployK8SMonitoringStack: false useLocalHelmRepo: true useLocalDockerRegistry: false diff --git a/ric-xapps/90-xApps/bin/install b/ric-xapps/90-xApps/bin/install index 3ed7fe60..aa177140 100755 --- a/ric-xapps/90-xApps/bin/install +++ b/ric-xapps/90-xApps/bin/install @@ -166,6 +166,5 @@ helm package -d /tmp /tmp/$CHART_NAME echo $HELM_REPO -curl -k -u $HELM_REPO_USERNAME:$HELM_REPO_PASSWORD $HELM_REPO --upload-file /tmp/$CHART_NAME-$CHART_VERSION.tgz -v - - +#curl -k -u $HELM_REPO_USERNAME:$HELM_REPO_PASSWORD $HELM_REPO --upload-file /tmp/$CHART_NAME-$CHART_VERSION.tgz -v +curl -Lk -u $HELM_REPO_USERNAME:$HELM_REPO_PASSWORD "$HELM_REPO"/api/charts --data-binary "@/tmp/$CHART_NAME-$CHART_VERSION.tgz" diff --git a/ric-xapps/90-xApps/etc/xapp.conf b/ric-xapps/90-xApps/etc/xapp.conf index 956b3671..5bd82f94 100644 --- a/ric-xapps/90-xApps/etc/xapp.conf +++ b/ric-xapps/90-xApps/etc/xapp.conf @@ -15,7 +15,7 @@ # limitations under the License. # ################################################################################ -default_helm_repo=https://helm-entry +default_helm_repo=https://$(hostname):32080/helm default_docker_registry=docker-entry -- 2.16.6