diff options
author | Tomáš Levora <t.levora@partner.samsung.com> | 2019-07-22 12:40:08 +0200 |
---|---|---|
committer | Tomáš Levora <t.levora@partner.samsung.com> | 2019-10-11 13:55:42 +0200 |
commit | 0ba2d82c40043b6f31afb7b9584d7568071673a6 (patch) | |
tree | 9cda687592a35b33f4da6c5839a8ab77acb14caa /patches | |
parent | e71a4a745f2ba906ab8a1f593c27923985d47e91 (diff) |
Remove patching from offline-installer
The patching of OOM should not be necessary to bypass offline state,
therefore this custom patching can be removed in offline-installer
Issue-ID: OOM-2014
Change-Id: I61b4cd48cfada613a7914ef5001bb64f7584815a
Signed-off-by: Tomáš Levora <t.levora@partner.samsung.com>
Diffstat (limited to 'patches')
-rw-r--r-- | patches/onap-patch-role/tasks/main.yml | 36 | ||||
-rw-r--r-- | patches/onap.patch | 50 |
2 files changed, 0 insertions, 86 deletions
diff --git a/patches/onap-patch-role/tasks/main.yml b/patches/onap-patch-role/tasks/main.yml deleted file mode 100644 index 474b8ed4..00000000 --- a/patches/onap-patch-role/tasks/main.yml +++ /dev/null @@ -1,36 +0,0 @@ ---- -# This role contains patching logic for OOM charts -# and is valid until OOM-1610 is implemented -- name: Check presence of files for NPM patching - stat: - path: "{{ app_helm_charts_infra_directory }}/{{ item }}" - loop: - - common/dgbuilder/templates/deployment.yaml - register: npm_files_check - -- name: Check presence of files for nexus domain resolving - stat: - path: "{{ app_helm_charts_infra_directory }}/{{ item }}" - loop: - - oof/charts/oof-cmso/charts/oof-cmso-service/templates/deployment.yaml - register: hosts_files_check - -- name: Patch OOM - set npm registry - lineinfile: - path: "{{ item.stat.path }}" - regexp: '^(.*)NPM_REGISTRY_RECORD' - line: '\g<1>npm set registry "http://nexus.{{ ansible_nodename }}/repository/npm-private/";' - backrefs: yes - state: present - loop: "{{ npm_files_check.results }}" - when: item.stat.exists - -- name: Patch OOM - nexus domain resolving - lineinfile: - path: "{{ item.stat.path }}" - regexp: '^(.*)INFRA_CLUSTER_IP' - line: '\g<1>{{ cluster_ip }}' - backrefs: yes - state: present - loop: "{{ hosts_files_check.results }}" - when: item.stat.exists diff --git a/patches/onap.patch b/patches/onap.patch deleted file mode 100644 index a135ad38..00000000 --- a/patches/onap.patch +++ /dev/null @@ -1,50 +0,0 @@ -diff --git a/kubernetes/oof/charts/oof-cmso/charts/oof-cmso-service/resources/config/msosimulator.sh b/kubernetes/oof/charts/oof-cmso/charts/oof-cmso-service/resources/config/msosimulator.sh -index c87a26b..4212c96 100644 ---- a/kubernetes/oof/charts/oof-cmso/charts/oof-cmso-service/resources/config/msosimulator.sh -+++ b/kubernetes/oof/charts/oof-cmso/charts/oof-cmso-service/resources/config/msosimulator.sh -@@ -1,4 +1,4 @@ - #!/bin/sh --pip install flask --pip install requests -+pip install -i https://nexus3.onap.org/repository/pypi-private/simple/ --trusted-host nexus3.onap.org flask -+pip install -i https://nexus3.onap.org/repository/pypi-private/simple/ --trusted-host nexus3.onap.org requests - python /share/etc/config/mock.py -diff --git a/kubernetes/oof/charts/oof-cmso/charts/oof-cmso-service/templates/deployment.yaml b/kubernetes/oof/charts/oof-cmso/charts/oof-cmso-service/templates/deployment.yaml -index b26f6dd..2d31aad 100644 ---- a/kubernetes/oof/charts/oof-cmso/charts/oof-cmso-service/templates/deployment.yaml -+++ b/kubernetes/oof/charts/oof-cmso/charts/oof-cmso-service/templates/deployment.yaml -@@ -30,6 +30,10 @@ spec: - app: {{ include "common.name" . }} - release: {{ .Release.Name }} - spec: -+ hostAliases: -+ - ip: INFRA_CLUSTER_IP -+ hostnames: -+ - nexus3.onap.org - initContainers: - - command: - - /root/ready.py --- - -diff --git a/kubernetes/common/dgbuilder/templates/deployment.yaml b/kubernetes/common/dgbuilder/templates/deployment.yaml -index 353c231..cf38409 100644 ---- a/kubernetes/common/dgbuilder/templates/deployment.yaml -+++ b/kubernetes/common/dgbuilder/templates/deployment.yaml -@@ -49,8 +49,12 @@ spec: - - name: {{ include "common.name" . }} - image: "{{ include "common.repository" . }}/{{ .Values.image }}" - imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }} -- command: ["/bin/bash"] -- args: ["-c", "cd /opt/onap/ccsdk/dgbuilder/ && ./start.sh sdnc1.0 && wait"] -+ command: -+ - /bin/bash -+ - -c -+ - > -+ NPM_REGISTRY_RECORD; -+ cd /opt/onap/ccsdk/dgbuilder/ && ./start.sh sdnc1.0 && wait - ports: - - containerPort: {{ .Values.service.internalPort }} - readinessProbe: --- -1.8.3.1 - |