diff options
| -rw-r--r-- | ansible/roles/application/defaults/main.yml | 2 | ||||
| -rw-r--r-- | ansible/roles/application/molecule/default/tests/test_default.py | 3 | ||||
| -rw-r--r-- | ansible/roles/application/tasks/install.yml | 1 | ||||
| -rw-r--r-- | build/data_lists/onap_3.0.x-pip_packages.list | 18 | ||||
| -rw-r--r-- | build/data_lists/onap_pip_packages.list | 12 |
5 files changed, 17 insertions, 19 deletions
diff --git a/ansible/roles/application/defaults/main.yml b/ansible/roles/application/defaults/main.yml index dec17601..84fffeca 100644 --- a/ansible/roles/application/defaults/main.yml +++ b/ansible/roles/application/defaults/main.yml @@ -1,6 +1,8 @@ --- helm_repository_name: local helm_repository_url: http://127.0.0.1:8879 +helm_extra_install_options: + - { opt: '--timeout 1800'} # Override file generation for Helm application can be customized by any role # given by user and found by ansible from roles_path. # By default override file is generated by 'application-override' role that is diff --git a/ansible/roles/application/molecule/default/tests/test_default.py b/ansible/roles/application/molecule/default/tests/test_default.py index 3e0cbb42..5edceff3 100644 --- a/ansible/roles/application/molecule/default/tests/test_default.py +++ b/ansible/roles/application/molecule/default/tests/test_default.py @@ -16,7 +16,8 @@ serve repo list repo add local http://127.0.0.1:8879 install --name moleculetestapp local/moleculetestapp --namespace \ -moleculetestapp -f /opt/moleculetestapp/override.yaml""" +moleculetestapp -f /opt/moleculetestapp/override.yaml \ +--timeout 1800""" assert fc == expected_content diff --git a/ansible/roles/application/tasks/install.yml b/ansible/roles/application/tasks/install.yml index cdc7ced0..bdf6e511 100644 --- a/ansible/roles/application/tasks/install.yml +++ b/ansible/roles/application/tasks/install.yml @@ -72,6 +72,7 @@ {{ helm_repository_name }}/{{ app_helm_chart_name }} --namespace {{ app_kubernetes_namespace }} {{ '' if app_skip_helm_override else '-f ' + app_helm_override_file }} + {% for arg in helm_extra_install_options %} {{ arg.opt }} {% endfor %} changed_when: true # when executed its a changed type of action register: helm_install failed_when: helm_install.stderr diff --git a/build/data_lists/onap_3.0.x-pip_packages.list b/build/data_lists/onap_3.0.x-pip_packages.list deleted file mode 100644 index f67c7640..00000000 --- a/build/data_lists/onap_3.0.x-pip_packages.list +++ /dev/null @@ -1,18 +0,0 @@ -CherryPy==17.4.1 -PyMySQL==0.9.3 -backports.functools_lru_cache==1.5 -certifi==2018.11.29 -chardet==3.0.4 -cheroot==6.5.4 -contextlib2==0.5.5 -idna==2.8 -jaraco.functools==2.0 -more_itertools==5.0.0 -portend==2.3 -pytz==2018.9 -requests==2.21.0 -setuptools==40.7.1 -six==1.12.0 -tempora==1.14 -urllib3==1.24.1 -zc.lockfile==1.4 diff --git a/build/data_lists/onap_pip_packages.list b/build/data_lists/onap_pip_packages.list new file mode 100644 index 00000000..ba5cdf7e --- /dev/null +++ b/build/data_lists/onap_pip_packages.list @@ -0,0 +1,12 @@ +Click==7.0 +certifi==2019.3.9 +chardet==3.0.4 +Flask==1.0.3 +idna==2.8 +itsdangerous==1.1.0 +Jinja2==2.10.1 +MarkupSafe==1.1.1 +requests==2.22.0 +setuptools==40.7.1 +urllib3==1.25.3 +Werkzeug==0.15.4 |