diff options
| author |   Jan Benedikt <j.benedikt@partner.samsung.com> | 2019-10-25 03:35:51 -0400 |
|---|---|---|
| committer | Jan Benedikt <j.benedikt@partner.samsung.com> | 2019-11-05 08:11:05 -0500 |
| commit | 5907acf7093ed3c64b418590287db8446f9bac21 (patch) | |
| tree | 46f5c578a0b5384d7e575b3f5f020b3fd9620033 /ansible/roles | |
| parent | 66818b61e314499552a115effa327ad1a1544da3 (diff) | |
Chaging name of rhel resource directory to rpm
Changing name of rhel resource directory in "resources/pkg" from rhel to rpm due to platfrom independent repository for all distributions supporting RPM packages.
Issue-ID: OOM-2150
Change-Id: Ie5425df8b8550c618440586b495907f86c4cc509
Signed-off-by: Jan Benedikt <j.benedikt@partner.samsung.com>
Diffstat (limited to 'ansible/roles')
4 files changed, 4 insertions, 4 deletions
diff --git a/ansible/roles/nginx/defaults/main.yml b/ansible/roles/nginx/defaults/main.yml index 8bf44197..c2f1e05c 100644 --- a/ansible/roles/nginx/defaults/main.yml +++ b/ansible/roles/nginx/defaults/main.yml @@ -16,7 +16,7 @@ nginx: - "{{ 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/rhel:rw" + - "{{ app_data_path }}/pkg/rpm:/srv/http/repo.infra-server/rpm:rw" - "{{ app_data_path }}/pkg/ubuntu/xenial:/srv/http/repo.infra-server/ubuntu/xenial:rw" - /var/log/nginx:/var/log/nginx:rw # Default rule for tarball naming translation diff --git a/ansible/roles/package-repository/defaults/main.yml b/ansible/roles/package-repository/defaults/main.yml index 678b6bd4..0557eda3 100644 --- a/ansible/roles/package-repository/defaults/main.yml +++ b/ansible/roles/package-repository/defaults/main.yml @@ -3,6 +3,6 @@ package_repositories: - name: "{{ app_name }}" file: "{{ app_name | lower }}" description: "{{ app_name | upper }} offline repository" - baseurl: "{{ 'http://repo.infra-server/rhel' if 'infrastructure' not in group_names else 'file://' + app_data_path + '/pkg/rhel' }}" + baseurl: "{{ 'http://repo.infra-server/rpm' if 'infrastructure' not in group_names else 'file://' + app_data_path + '/pkg/rpm' }}" gpgcheck: false enabled: true diff --git a/ansible/roles/package-repository/molecule/default/tests/test_infrastructure-server.py b/ansible/roles/package-repository/molecule/default/tests/test_infrastructure-server.py index 63588e26..9fb1a4f9 100644 --- a/ansible/roles/package-repository/molecule/default/tests/test_infrastructure-server.py +++ b/ansible/roles/package-repository/molecule/default/tests/test_infrastructure-server.py @@ -9,7 +9,7 @@ testinfra_hosts = testinfra.utils.ansible_runner.AnsibleRunner( def test_onap_repo(host): fc = host.file('/etc/yum.repos.d/moleculetestapp.repo').content_string expected_content = """[moleculetestapp] -baseurl = file:///opt/moleculetestapp/pkg/rhel +baseurl = file:///opt/moleculetestapp/pkg/rpm enabled = 1 gpgcheck = 0 name = MOLECULETESTAPP offline repository""" diff --git a/ansible/roles/package-repository/molecule/default/tests/test_kubernetes-node-1.py b/ansible/roles/package-repository/molecule/default/tests/test_kubernetes-node-1.py index eab7d065..fda85e8d 100644 --- a/ansible/roles/package-repository/molecule/default/tests/test_kubernetes-node-1.py +++ b/ansible/roles/package-repository/molecule/default/tests/test_kubernetes-node-1.py @@ -9,7 +9,7 @@ testinfra_hosts = testinfra.utils.ansible_runner.AnsibleRunner( def test_onap_repo(host): fc = host.file('/etc/yum.repos.d/moleculetestapp.repo').content_string expected_content = """[moleculetestapp] -baseurl = http://repo.infra-server/rhel +baseurl = http://repo.infra-server/rpm enabled = 1 gpgcheck = 0 name = MOLECULETESTAPP offline repository""" |