CORD-3028 Raise tosca-loader backoffLimit;
Bring container-vnf olt tosca up to compliance w/ rcord-lite
Change-Id: I2dd5eee25a32069167d538b0bcdd9d510315317f
diff --git a/xos-profiles/container-vnf/templates/tosca-deployment.yaml b/xos-profiles/container-vnf/templates/tosca-job.yaml
similarity index 89%
rename from xos-profiles/container-vnf/templates/tosca-deployment.yaml
rename to xos-profiles/container-vnf/templates/tosca-job.yaml
index 1dcc6b4..d06d950 100644
--- a/xos-profiles/container-vnf/templates/tosca-deployment.yaml
+++ b/xos-profiles/container-vnf/templates/tosca-job.yaml
@@ -14,8 +14,8 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-apiVersion: apps/v1beta2
-kind: Deployment
+apiVersion: batch/v1
+kind: Job
metadata:
name: {{ template "container-vnf.fullname" . }}-tosca-loader
labels:
@@ -24,11 +24,7 @@
release: {{ .Release.Name }}
heritage: {{ .Release.Service }}
spec:
- replicas: {{ .Values.replicaCount }}
- selector:
- matchLabels:
- app: {{ template "container-vnf.name" . }}
- release: {{ .Release.Name }}
+ backoffLimit: 12
template:
metadata:
labels:
@@ -37,6 +33,7 @@
annotations:
checksum/config: {{ include (print $.Template.BasePath "/tosca-configmap.yaml") . | sha256sum }}
spec:
+ restartPolicy: Never
containers:
- name: {{ .Chart.Name }}-tosca-loader
image: {{ .Values.httpieImage | quote }}
@@ -51,7 +48,6 @@
http --check-status --ignore-stdin POST http://xos-tosca:$XOS_TOSCA_SERVICE_PORT/run xos-username:{{ .Values.xosAdminUser }} xos-password:{{ .Values.xosAdminPassword }} @$recipe || exit 1
echo ''
done
- sleep 3600
volumeMounts:
- name: container-vnf-tosca
mountPath: /opt/tosca
diff --git a/xos-profiles/container-vnf/values.yaml b/xos-profiles/container-vnf/values.yaml
index fd62847..dce790d 100644
--- a/xos-profiles/container-vnf/values.yaml
+++ b/xos-profiles/container-vnf/values.yaml
@@ -241,10 +241,12 @@
type: tosca.nodes.VOLTService
properties:
name: volt
- voltha_url: voltha.voltha.svc.cluster.local:8882
- p_onos_url: onos-voltha-ui.voltha.svc.cluster.local:8181
- p_onos_user: karaf
- p_onos_pass: karaf
+ voltha_url: voltha.voltha.svc.cluster.local
+ voltha_port: 8882
+ onos_voltha_url: onos-voltha-ui.voltha.svc.cluster.local
+ onos_voltha_port: 8181
+ onos_voltha_user: karaf
+ onos_voltha_pass: karaf
service#vsg-hw:
type: tosca.nodes.VSGHWService
properties:
diff --git a/xos-profiles/rcord-lite/templates/tosca-job.yaml b/xos-profiles/rcord-lite/templates/tosca-job.yaml
index 5918716..f8dfaee 100644
--- a/xos-profiles/rcord-lite/templates/tosca-job.yaml
+++ b/xos-profiles/rcord-lite/templates/tosca-job.yaml
@@ -24,6 +24,7 @@
release: {{ .Release.Name }}
heritage: {{ .Release.Service }}
spec:
+ backoffLimit: 12
template:
metadata:
labels: