diff options
author | Gary Wu <gary.i.wu@huawei.com> | 2018-07-30 15:27:14 -0700 |
---|---|---|
committer | Gary Wu <gary.i.wu@huawei.com> | 2018-07-30 15:27:14 -0700 |
commit | c3d9a46f357d3b083c99ffeeb23abf6fad8b111a (patch) | |
tree | cae3eedb2f2c479eec3ecf5aa2208830f6161938 /templates | |
parent | aecd888a9cc77bb99d6c93b8ab90838990c38e96 (diff) |
Refactor OOM robot changes into demo/testsuite
Refactor OOM-specific robot overrides to make them
generic to both HEAT and OOM; remove OOM-specific
robot overrides to prevent dual-maintenance between
OOM robot and HEAT robot.
Change-Id: I0030d8978cdbd50a12400aaba2f21778745f0431
Issue-ID: INT-605
Signed-off-by: Gary Wu <gary.i.wu@huawei.com>
Diffstat (limited to 'templates')
-rw-r--r-- | templates/configmap.yaml | 8 | ||||
-rw-r--r-- | templates/deployment.yaml | 12 |
2 files changed, 0 insertions, 20 deletions
diff --git a/templates/configmap.yaml b/templates/configmap.yaml index ab4a10b..e4096b0 100644 --- a/templates/configmap.yaml +++ b/templates/configmap.yaml @@ -23,14 +23,6 @@ data: apiVersion: v1 kind: ConfigMap metadata: - name: {{ include "common.fullname" . }}-resources-configmap - namespace: {{ include "common.namespace" . }} -data: -{{ tpl (.Files.Glob "resources/config/robot/resources/*").AsConfig . | indent 2 }} ---- -apiVersion: v1 -kind: ConfigMap -metadata: name: {{ include "common.fullname" . }}-lighttpd-authorization-configmap namespace: {{ include "common.namespace" . }} data: diff --git a/templates/deployment.yaml b/templates/deployment.yaml index e5cc1d3..1297760 100644 --- a/templates/deployment.yaml +++ b/templates/deployment.yaml @@ -69,15 +69,6 @@ spec: readOnly: true - name: robot-eteshare mountPath: /share/config - - name: robot-resources - mountPath: /var/opt/OpenECOMP_ETE/robot/resources/policy_interface.robot - subPath: policy_interface.robot - - name: robot-resources - mountPath: /var/opt/OpenECOMP_ETE/robot/resources/sdngc_interface.robot - subPath: sdngc_interface.robot - - name: robot-resources - mountPath: /var/opt/OpenECOMP_ETE/robot/resources/oof_interface.robot - subPath: oof_interface.robot - name: robot-lighttpd-authorization mountPath: /etc/lighttpd/authorization subPath: authorization @@ -110,9 +101,6 @@ spec: configMap: name: {{ include "common.fullname" . }}-eteshare-configmap defaultMode: 0755 - - name: robot-resources - configMap: - name: {{ include "common.fullname" . }}-resources-configmap - name: robot-lighttpd-authorization configMap: name: {{ include "common.fullname" . }}-lighttpd-authorization-configmap |