From 96168b3c14641e61348023c462724ab276a31752 Mon Sep 17 00:00:00 2001 From: Larry Rensing Date: Mon, 13 Feb 2017 16:12:17 +0000 Subject: [PATCH] cleanup configmap names --- maas/templates/bin/_register-rack-controller.sh.tpl | 6 +++--- maas/templates/job-import.yaml | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/maas/templates/bin/_register-rack-controller.sh.tpl b/maas/templates/bin/_register-rack-controller.sh.tpl index 3445cc35fe..0c1d415a31 100644 --- a/maas/templates/bin/_register-rack-controller.sh.tpl +++ b/maas/templates/bin/_register-rack-controller.sh.tpl @@ -5,19 +5,19 @@ set -ex # show env env > /tmp/env -echo "register-rack-controller URL: "{{ .Values.service_name }}.{{ .Release.Namespace }} +echo "register-rack-controller URL: "{{ .Values.ui_service_name }}.{{ .Release.Namespace }} # note the secret must be a valid hex value # register forever while [ 1 ]; do - if maas-rack register --url=http://{{ .Values.service_name }}.{{ .Release.Namespace }}/MAAS --secret={{ .Values.secret | quote }}; + if maas-rack register --url=http://{{ .Values.ui_service_name }}.{{ .Release.Namespace }}/MAAS --secret={{ .Values.secret | quote }}; then echo "Successfully registered with MaaS Region Controller" break else - echo "Unable to register with http://{{ .Values.service_name }}.{{ .Release.Namespace }}/MAAS... will try again" + echo "Unable to register with http://{{ .Values.ui_service_name }}.{{ .Release.Namespace }}/MAAS... will try again" sleep 10 fi; diff --git a/maas/templates/job-import.yaml b/maas/templates/job-import.yaml index 2d5c9d30f6..419ab3c023 100644 --- a/maas/templates/job-import.yaml +++ b/maas/templates/job-import.yaml @@ -39,10 +39,10 @@ spec: volumes: - name: import-boot-resources configMap: - name: maas-region-bin + name: maas-bin - name: job-readiness configMap: - name: maas-region-bin + name: maas-bin - name: maas-dns-config configMap: - name: maas-region-etc + name: maas-etc