diff options
| author |   Milan Verespej <m.verespej@partner.samsung.com> | 2019-02-04 11:01:19 +0100 |
|---|---|---|
| committer |   Michal Ptacek <m.ptacek@partner.samsung.com> | 2019-02-06 08:35:19 +0000 |
| commit | c2a14cfae6d19c3c6c09394ca710f1871a48983d (patch) | |
| tree | 79948f6746692e282c879eff4b40980b8b73d76c | |
| parent | 997057f24ed6681094d4a96cb2738a0bcf307ee0 (diff) | |
Fix sdnc/appc-ansible-server not running
These pods are installing packages from apt and pypi repositroies
during runtime.
This change creates patch and makes necessary modifications
for packages being installed from offline repositories.
Change-Id: Id71f40f94c8641ad0c9d1ba4c87d3daea70c828e
Issue-ID: OOM-1619
Signed-off-by: Milan Verespej <m.verespej@partner.samsung.com>
| -rw-r--r-- | ansible/infrastructure.yml | 2 | ||||
| -rw-r--r-- | ansible/roles/nginx/tasks/main.yml | 3 | ||||
| -rw-r--r-- | patches/casablanca_3.0.0.patch | 42 |
3 files changed, 45 insertions, 2 deletions
diff --git a/ansible/infrastructure.yml b/ansible/infrastructure.yml index 08667330..e4715a9c 100644 --- a/ansible/infrastructure.yml +++ b/ansible/infrastructure.yml @@ -14,7 +14,7 @@ name: "{{ app_name }}" file: "{{ app_name | lower }}" description: "{{ app_name }} offline repository" - baseurl: "{{ 'http://repo.infra-server' if 'infrastructure' not in group_names else 'file://' + app_data_path + '/pkg/rhel' }}" + baseurl: "{{ 'http://repo.infra-server/rhel' if 'infrastructure' not in group_names else 'file://' + app_data_path + '/pkg/rhel' }}" gpgcheck: no enabled: yes when: deploy_rpm_repository diff --git a/ansible/roles/nginx/tasks/main.yml b/ansible/roles/nginx/tasks/main.yml index 5c010848..c59be75f 100644 --- a/ansible/roles/nginx/tasks/main.yml +++ b/ansible/roles/nginx/tasks/main.yml @@ -31,7 +31,8 @@ - "{{ app_data_path }}/certs:/etc/nginx/certs:ro" - "{{ app_data_path }}/git-repo:/srv/git:rw" - "{{ app_data_path }}/http:/srv/http:rw" - - "{{ app_data_path }}/pkg/rhel:/srv/http/repo.infra-server:rw" + - "{{ app_data_path }}/pkg/rhel:/srv/http/repo.infra-server/rhel:rw" + - "{{ app_data_path }}/pkg/ubuntu/xenial:/srv/http/repo.infra-server/ubuntu/xenial:rw" - /var/log/nginx:/var/log/nginx:rw state: started restart_policy: unless-stopped diff --git a/patches/casablanca_3.0.0.patch b/patches/casablanca_3.0.0.patch index e40de1dc..61018e7c 100644 --- a/patches/casablanca_3.0.0.patch +++ b/patches/casablanca_3.0.0.patch @@ -334,3 +334,45 @@ +{{ include "common.cacert-mount-ubuntu" . | indent 2 }} +{{- end }} +{{- end }} +--- kubernetes/appc/charts/appc-ansible-server/templates/deployment.yaml 2019-02-01 13:40:02.349210360 +0100 ++++ kubernetes/appc/charts/appc-ansible-server/templates/deployment.yaml 2019-02-01 15:29:52.182542898 +0100 +@@ -47,8 +47,16 @@ + name: {{ include "common.name" . }}-readiness + containers: + - name: {{ include "common.name" . }} +- command: ["/bin/bash"] +- args: ["-c", "cd /opt/onap/ccsdk && ./startAnsibleServer.sh"] ++ command: ++ - /bin/bash ++ - -c ++ - > ++ pip install -i http://nexus3.onap.org/repository/pypi-private/simple/ ++ --trusted-host nexus3.onap.org ++ PyMySQL cherrypy requests; ++ curl -s repo.infra-server/ubuntu/xenial/onap.list > /etc/apt/sources.list; ++ apt-get update; ++ cd /opt/onap/ccsdk && ./startAnsibleServer.sh + image: "{{ include "common.repository" . }}/{{ .Values.image }}" + imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }} + ports: +--- kubernetes/sdnc/charts/sdnc-ansible-server/templates/deployment.yaml 2019-02-01 13:40:02.415877026 +0100 ++++ kubernetes/sdnc/charts/sdnc-ansible-server/templates/deployment.yaml 2019-02-01 15:29:39.399209565 +0100 +@@ -47,8 +47,16 @@ + name: {{ include "common.name" . }}-readiness + containers: + - name: {{ include "common.name" . }} +- command: ["/bin/bash"] +- args: ["-c", "cd /opt/onap/ccsdk && ./startAnsibleServer.sh"] ++ command: ++ - /bin/bash ++ - -c ++ - > ++ pip install -i http://nexus3.onap.org/repository/pypi-private/simple/ ++ --trusted-host nexus3.onap.org ++ PyMySQL cherrypy requests; ++ curl -s repo.infra-server/ubuntu/xenial/onap.list > /etc/apt/sources.list; ++ apt-get update; ++ cd /opt/onap/ccsdk && ./startAnsibleServer.sh + image: "{{ include "common.repository" . }}/{{ .Values.image }}" + imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }} + ports: |