Fix deployment and tests (correct URIs, plugins)
- install also the Sahara plugins. The existing variable sahara_plugin_base is now used also for the list of installed plugins, in addition to the list of loaded plugins. The default set includes now all the available plugins. - fix the URIs used by role tests. They will eventually go away in favor of the integrated tests, but they are needed right now. Change-Id: I5a4066ad9e2cca7bbfeb82bca5b2e65badef2e22
This commit is contained in:
parent
d0a23313ea
commit
ed7ccad898
|
@ -146,12 +146,15 @@ sahara_proxy_user_role_names: _member_
|
|||
|
||||
# Other plugins can be added to the system by simply extending the list `sahara_plugin_base`.
|
||||
sahara_plugin_base:
|
||||
- vanilla
|
||||
- spark
|
||||
- cdh
|
||||
- ambari
|
||||
- cdh
|
||||
- mapr
|
||||
- spark
|
||||
- storm
|
||||
- vanilla
|
||||
|
||||
sahara_plugin_loaded_base: "{% for plugin in sahara_plugin_base %}{{ plugin }}{% if not loop.last %},{% endif %}{% endfor %}"
|
||||
sahara_plugin_pip_packages: "{{ sahara_plugin_base | map('regex_replace', '^(.*)$', 'sahara-plugin-\\1') | list }}"
|
||||
|
||||
## Cap the maximum number of threads / workers when a user value is unspecified.
|
||||
sahara_api_workers_max: 16
|
||||
|
|
|
@ -117,7 +117,7 @@ the NTP package is included in the image. The default NTP server will be
|
|||
Configuring plugins
|
||||
~~~~~~~~~~~~~~~~~~~
|
||||
|
||||
The following plugins are loaded by default:
|
||||
The following plugins are installed and loaded by default:
|
||||
|
||||
.. code-block:: yaml
|
||||
|
||||
|
|
|
@ -41,7 +41,7 @@
|
|||
venv_install_destination_path: "{{ sahara_bin | dirname }}"
|
||||
venv_install_distro_package_list: "{{ sahara_distro_packages }}"
|
||||
venv_pip_install_args: "{{ sahara_pip_install_args }}"
|
||||
venv_pip_packages: "{{ (sahara_oslomsg_amqp1_enabled | bool) | ternary(sahara_pip_packages + sahara_optional_oslomsg_amqp1_pip_packages, sahara_pip_packages) }}"
|
||||
venv_pip_packages: "{{ (sahara_oslomsg_amqp1_enabled | bool) | ternary(sahara_pip_packages + sahara_plugin_pip_packages + sahara_optional_oslomsg_amqp1_pip_packages, sahara_pip_packages + sahara_plugin_pip_packages) }}"
|
||||
venv_facts_when_changed:
|
||||
- section: "sahara"
|
||||
option: "venv_tag"
|
||||
|
|
|
@ -27,4 +27,7 @@ sahara_developer_mode: true
|
|||
sahara_service_password: "secrete"
|
||||
sahara_container_mysql_password: "SuperSecrete"
|
||||
sahara_oslomsg_rpc_password: "{{ oslomsg_rpc_password }}"
|
||||
sahara_service_publicuri: "{{ sahara_service_proto }}://{{ hostvars[groups['sahara_api'][0]]['ansible_host'] }}:{{ sahara_service_port }}"
|
||||
sahara_service_internaluri: "{{ sahara_service_publicuri }}"
|
||||
sahara_service_adminuri: "{{ sahara_service_publicuri }}"
|
||||
sahara_wsgi_processes: 2
|
||||
|
|
Loading…
Reference in New Issue