1. Change boot order of helm chart, make the sequence like postgres->redis->pubsub->watcher->api.
2. Add the parameter checkfirst for sqlalchemy create metadata.
Issue-ID: INF-254
Signed-off-by: Zhang Rong(Jon) <rong.zhang@windriver.com>
Change-Id: Ib72ceb963d5e1f7e4d7b111cff2ef76710bc4c8a
volumeMounts:\r
- name: scripts\r
mountPath: /opt\r
volumeMounts:\r
- name: scripts\r
mountPath: /opt\r
- - name: o2api\r
- image: "{{ .Values.o2ims.image.repository }}:{{ .Values.o2ims.image.tag }}"\r
+ - name: redis\r
+ image: redis:alpine\r
+ - containerPort: 6379\r
+ - name: o2pubsub\r
+ image: "{{ .Values.o2ims.image.repository }}:{{ .Values.o2ims.image.tag }}"\r
+ command: ["/bin/bash", "/opt/o2pubsub_start.sh"]\r
- - name: API_HOST\r
- value: api\r
- name: DB_HOST\r
value: postgres\r
- name: DB_PASSWORD\r
value: o2ims123\r
- name: DB_HOST\r
value: postgres\r
- name: DB_PASSWORD\r
value: o2ims123\r
- - name: FLASK_APP\r
- value: /root/o2/o2app/entrypoints/flask_application.py\r
- - name: FLASK_DEBUG\r
- value: {{ .Values.o2ims.logginglevel }}\r
- name: LOGGING_CONFIG_LEVEL\r
value: {{ .Values.o2ims.logginglevel }}\r
- name: OS_AUTH_URL\r
- name: LOGGING_CONFIG_LEVEL\r
value: {{ .Values.o2ims.logginglevel }}\r
- name: OS_AUTH_URL\r
+ value: {{ .Values.ocloud.OS_AUTH_URL }}\r
+ value: {{ .Values.ocloud.OS_PASSWORD }}\r
+ value: {{ .Values.ocloud.OS_USERNAME }}\r
- name: PYTHONDONTWRITEBYTECODE\r
value: "1"\r
- name: PYTHONDONTWRITEBYTECODE\r
value: "1"\r
- - name: PYTHONUNBUFFERED\r
- value: "1"\r
- name: REDIS_HOST\r
value: redis\r
- name: REDIS_HOST\r
value: redis\r
- command: ["/bin/bash", "/opt/o2api_start.sh"]\r
+ - name: K8S_KUBECONFIG\r
+ value: {{ .Values.ocloud.K8S_KUBECONFIG }}\r
volumeMounts:\r
- name: scripts\r
mountPath: /opt\r
volumeMounts:\r
- name: scripts\r
mountPath: /opt\r
- - name: redis\r
- image: redis:alpine\r
- ports:\r
- - containerPort: 6379\r
- name: watcher\r
image: "{{ .Values.o2ims.image.repository }}:{{ .Values.o2ims.image.tag }}"\r
command: ["/bin/bash", "/opt/o2watcher_start.sh"]\r
- name: watcher\r
image: "{{ .Values.o2ims.image.repository }}:{{ .Values.o2ims.image.tag }}"\r
command: ["/bin/bash", "/opt/o2watcher_start.sh"]\r
volumeMounts:\r
- name: scripts\r
mountPath: /opt\r
volumeMounts:\r
- name: scripts\r
mountPath: /opt\r
image: "{{ .Values.o2ims.image.repository }}:{{ .Values.o2ims.image.tag }}"\r
image: "{{ .Values.o2ims.image.repository }}:{{ .Values.o2ims.image.tag }}"\r
- command: ["/bin/bash", "/opt/o2pubsub_start.sh"]\r
+ ports:\r
+ - containerPort: 80\r
+ - name: API_HOST\r
+ value: api\r
- name: DB_HOST\r
value: postgres\r
- name: DB_PASSWORD\r
value: o2ims123\r
- name: DB_HOST\r
value: postgres\r
- name: DB_PASSWORD\r
value: o2ims123\r
+ - name: FLASK_APP\r
+ value: /root/o2/o2app/entrypoints/flask_application.py\r
+ - name: FLASK_DEBUG\r
+ value: {{ .Values.o2ims.logginglevel }}\r
- name: LOGGING_CONFIG_LEVEL\r
value: {{ .Values.o2ims.logginglevel }}\r
- name: OS_AUTH_URL\r
- name: LOGGING_CONFIG_LEVEL\r
value: {{ .Values.o2ims.logginglevel }}\r
- name: OS_AUTH_URL\r
- value: {{ .Values.ocloud.OS_AUTH_URL }}\r
- value: {{ .Values.ocloud.OS_PASSWORD }}\r
- value: {{ .Values.ocloud.OS_USERNAME }}\r
- name: PYTHONDONTWRITEBYTECODE\r
value: "1"\r
- name: PYTHONDONTWRITEBYTECODE\r
value: "1"\r
+ - name: PYTHONUNBUFFERED\r
+ value: "1"\r
- name: REDIS_HOST\r
value: redis\r
- name: REDIS_HOST\r
value: redis\r
- - name: K8S_KUBECONFIG\r
- value: {{ .Values.ocloud.K8S_KUBECONFIG }}\r
+ command: ["/bin/bash", "/opt/o2api_start.sh"]\r
volumeMounts:\r
- name: scripts\r
mountPath: /opt\r
volumeMounts:\r
- name: scripts\r
mountPath: /opt\r
mapper(dmsModel.NfOCloudVResource, nfOCloudVResource)\r
\r
if engine is not None:\r
mapper(dmsModel.NfOCloudVResource, nfOCloudVResource)\r
\r
if engine is not None:\r
- metadata.create_all(engine)\r
+ metadata.create_all(engine, checkfirst=True)\r
mapper(confModel.Configuration, configuration)\r
\r
if engine is not None:\r
mapper(confModel.Configuration, configuration)\r
\r
if engine is not None:\r
- metadata.create_all(engine)\r
+ metadata.create_all(engine, checkfirst=True)\r