diff options
| -rwxr-xr-x | ansible/group_vars/infrastructure.yml | 7 | ||||
| -rwxr-xr-x | config/application_configuration.yml | 3 | ||||
| -rw-r--r-- | patches/onap-patch-role/tasks/main.yml | 36 | ||||
| -rw-r--r-- | patches/onap.patch | 50 |
4 files changed, 1 insertions, 95 deletions
diff --git a/ansible/group_vars/infrastructure.yml b/ansible/group_vars/infrastructure.yml index fc0699c5..50291ac2 100755 --- a/ansible/group_vars/infrastructure.yml +++ b/ansible/group_vars/infrastructure.yml @@ -4,13 +4,7 @@ simulated_hosts: git: - gerrit.onap.org http: - - git.onap.org - - nexus.onap.org - repo.infra-server - - www.getcloudify.org - - www.springframework.org - - repo.maven.apache.org - - repo1.maven.org nexus: - docker.elastic.co - docker.io @@ -23,7 +17,6 @@ simulated_hosts: - quay.io - registry-1.docker.io - registry.hub.docker.com - - registry.npmjs.org all_simulated_hosts: "{{ simulated_hosts.git + simulated_hosts.http + simulated_hosts.nexus }}" populate_nexus: false diff --git a/config/application_configuration.yml b/config/application_configuration.yml index 2e397f4c..0c082867 100755 --- a/config/application_configuration.yml +++ b/config/application_configuration.yml @@ -7,7 +7,7 @@ # resources_dir: /data app_name: onap -resources_filename: "offline-{{ app_name }}-4.0.0.resources.tar" +resources_filename: "offline-{{ app_name }}-4.0.0-resources.tar" app_data_path: "/opt/{{ app_name }}" certificates: organization_name: Samsung @@ -18,4 +18,3 @@ app_helm_build_targets: - all - onap app_helm_chart_name: onap -application_pre_install_role: "onap-patch-role" 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 - |