diff options
| author |   Michal Ptacek <m.ptacek@partner.samsung.com> | 2019-06-12 15:00:39 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2019-06-12 15:00:39 +0000 |
| commit | f78d3e59c6e317935eb15a2a22e3dfe118ad3213 (patch) | |
| tree | 95e863a44f4d577621b4bd5b3ae9e89e2e6e1917 | |
| parent | 66965fca9def6007465aacc2fed220690229c9c5 (diff) | |
| parent | 863926ef36dff968391ec98bddc9c832cd14408e (diff) | |
Merge "Fixing mso-simulator patching"
| -rw-r--r-- | patches/onap-patch-role/tasks/main.yml | 6 | ||||
| -rw-r--r-- | patches/onap.patch | 27 |
2 files changed, 21 insertions, 12 deletions
diff --git a/patches/onap-patch-role/tasks/main.yml b/patches/onap-patch-role/tasks/main.yml index 38d0ab92..474b8ed4 100644 --- a/patches/onap-patch-role/tasks/main.yml +++ b/patches/onap-patch-role/tasks/main.yml @@ -12,7 +12,7 @@ stat: path: "{{ app_helm_charts_infra_directory }}/{{ item }}" loop: - - oof/charts/oof-cmso/charts/oof-cmso-service/resources/config/msosimulator.sh + - oof/charts/oof-cmso/charts/oof-cmso-service/templates/deployment.yaml register: hosts_files_check - name: Patch OOM - set npm registry @@ -28,8 +28,8 @@ - name: Patch OOM - nexus domain resolving lineinfile: path: "{{ item.stat.path }}" - regexp: '^(.*)HOSTS_FILE_RECORD' - line: '\g<1>{{ cluster_ip }} {{ simulated_hosts.nexus | join(" ") }} >> /etc/hosts;' + regexp: '^(.*)INFRA_CLUSTER_IP' + line: '\g<1>{{ cluster_ip }}' backrefs: yes state: present loop: "{{ hosts_files_check.results }}" diff --git a/patches/onap.patch b/patches/onap.patch index 05e217e7..a135ad38 100644 --- a/patches/onap.patch +++ b/patches/onap.patch @@ -1,20 +1,29 @@ 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..79ad921 100644 +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,10 @@ +@@ -1,4 +1,4 @@ #!/bin/sh -pip install flask -pip install requests -+ -+# for some reason DNS is not working properly on this pod -+# therefore we need to explicitly add record just for -+# the purpose of this script -+HOSTS_FILE_RECORD >> /etc/hosts -+ +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 @@ -36,6 +45,6 @@ index 353c231..cf38409 100644 ports: - containerPort: {{ .Values.service.internalPort }} readinessProbe: --- +-- 1.8.3.1 |