diff options
| author |   Petr Ospalý <p.ospaly@partner.samsung.com> | 2019-10-15 13:23:55 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2019-10-15 13:23:55 +0000 |
| commit | 6dcfa709d6d09089a8da817db5e477922a3f4885 (patch) | |
| tree | 7c5bf47d2bbfff84beafcd0e19933292ae9cb9d6 | |
| parent | 78f4d8d40c86d809e2709429dd03d0aa10c16253 (diff) | |
| parent | 9c5a68d7e04243684190a086786290f0eba3cc7c (diff) | |
Merge "Remove git repos list and simulation"
| -rwxr-xr-x | ansible/group_vars/infrastructure.yml | 4 | ||||
| -rw-r--r-- | ansible/roles/nginx/templates/nginx.conf.j2 | 39 | ||||
| -rw-r--r-- | build/data_lists/onap_git_repos.list | 2 |
3 files changed, 1 insertions, 44 deletions
diff --git a/ansible/group_vars/infrastructure.yml b/ansible/group_vars/infrastructure.yml index 50291ac2..fec242da 100755 --- a/ansible/group_vars/infrastructure.yml +++ b/ansible/group_vars/infrastructure.yml @@ -1,8 +1,6 @@ --- vnc_passwd: samsung simulated_hosts: - git: - - gerrit.onap.org http: - repo.infra-server nexus: @@ -18,7 +16,7 @@ simulated_hosts: - registry-1.docker.io - registry.hub.docker.com all_simulated_hosts: - "{{ simulated_hosts.git + simulated_hosts.http + simulated_hosts.nexus }}" + "{{ simulated_hosts.http + simulated_hosts.nexus }}" populate_nexus: false helm_bin_dir: /usr/local/bin helm_version: v2.12.3 diff --git a/ansible/roles/nginx/templates/nginx.conf.j2 b/ansible/roles/nginx/templates/nginx.conf.j2 index 9860a168..be1170f0 100644 --- a/ansible/roles/nginx/templates/nginx.conf.j2 +++ b/ansible/roles/nginx/templates/nginx.conf.j2 @@ -59,43 +59,4 @@ http { proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; } } - -# git simulations - server { - listen 80; - listen 443 ssl; - server_name {% for host in simulated_hosts.git -%} - {{ host + " " }} - {%- endfor %}; - ssl_certificate /etc/nginx/certs/nexus_server.crt; - ssl_certificate_key /etc/nginx/certs/nexus_server.key; - - keepalive_timeout 5 5; - proxy_buffering off; - - location / { - try_files $uri $uri/ @git; - } - - location @git { - - # Set chunks to unlimited, as the body's can be huge - client_max_body_size 0; - - fastcgi_param SCRIPT_FILENAME /usr/libexec/git-core/git-http-backend; - fastcgi_param QUERY_STRING $args; - fastcgi_param HTTP_HOST $server_name; - fastcgi_param PATH_INFO $uri; - - include fastcgi_params; - - fastcgi_param GIT_HTTP_EXPORT_ALL ""; - fastcgi_param GIT_PROJECT_ROOT /srv/git/$host/; - - # Forward REMOTE_USER as we want to know when we are authenticated - fastcgi_param REMOTE_USER $remote_user; - - fastcgi_pass unix:/var/run/fcgiwrap.socket; - } - } } diff --git a/build/data_lists/onap_git_repos.list b/build/data_lists/onap_git_repos.list deleted file mode 100644 index 518eecde..00000000 --- a/build/data_lists/onap_git_repos.list +++ /dev/null @@ -1,2 +0,0 @@ -#repo branch -gerrit.onap.org/r/so/docker-config.git master |