Setup oslo.messaging extra packages for optional drivers

Change-Id: I006e28c3828f5ed28b5c6e020a2ee22885a74d95
This commit is contained in:
Andy Smith 2018-07-20 16:51:16 -04:00
parent 83c599fd49
commit a59e71658b
7 changed files with 36 additions and 3 deletions

View File

@ -96,6 +96,10 @@ heat_oslomsg_notify_userid: "{{ heat_oslomsg_rpc_userid }}"
heat_oslomsg_notify_password: "{{ heat_oslomsg_rpc_password }}" heat_oslomsg_notify_password: "{{ heat_oslomsg_rpc_password }}"
heat_oslomsg_notify_vhost: "{{ heat_oslomsg_rpc_vhost }}" heat_oslomsg_notify_vhost: "{{ heat_oslomsg_rpc_vhost }}"
## (Qdrouterd) integration
# TODO(ansmith): Change structure when more backends will be supported
heat_oslomsg_amqp1_enabled: "{{ heat_oslomsg_rpc_transport == 'amqp' }}"
## Heat User / Group ## Heat User / Group
heat_system_user_name: heat heat_system_user_name: heat
heat_system_group_name: heat heat_system_group_name: heat
@ -221,6 +225,9 @@ heat_pip_packages:
- python-troveclient - python-troveclient
- uwsgi - uwsgi
heat_optional_oslomsg_amqp1_pip_packages:
- oslo.messaging[amqp1]
heat_api_init_overrides: {} heat_api_init_overrides: {}
heat_api_cfn_init_overrides: {} heat_api_cfn_init_overrides: {}
heat_engine_init_overrides: {} heat_engine_init_overrides: {}

View File

@ -42,7 +42,9 @@
venv_install_destination_path: "{{ heat_bin | dirname }}" venv_install_destination_path: "{{ heat_bin | dirname }}"
venv_install_distro_package_list: "{{ heat_distro_packages }}" venv_install_distro_package_list: "{{ heat_distro_packages }}"
venv_pip_install_args: "{{ heat_pip_install_args }}" venv_pip_install_args: "{{ heat_pip_install_args }}"
venv_pip_packages: "{{ heat_pip_packages }}" venv_pip_packages: >-
{{ heat_pip_packages +
(heat_oslomsg_amqp1_enabled | bool) | ternary(heat_optional_oslomsg_amqp1_pip_packages, []) }}
venv_facts_when_changed: venv_facts_when_changed:
- section: "heat" - section: "heat"
option: "venv_tag" option: "venv_tag"

View File

@ -13,6 +13,11 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
heat_package_list: "{{ heat_service_distro_packages }}" heat_package_list: |-
{% set packages = heat_service_distro_packages %}
{% if heat_oslomsg_amqp1_enabled | bool %}
{% set _ = packages.extend(heat_oslomsg_amqp1_distro_packages) %}
{% endif %}
{{ packages }}
heat_bin: "/usr/bin" heat_bin: "/usr/bin"

View File

@ -28,4 +28,9 @@ heat_service_distro_packages:
- uwsgi - uwsgi
- uwsgi-plugin-python - uwsgi-plugin-python
heat_oslomsg_amqp1_distro_packages:
- cyrus-sasl-lib
- cyrus-sasl-plain
- cyrus-sasl-md5
heat_uwsgi_bin: '/usr/sbin' heat_uwsgi_bin: '/usr/sbin'

View File

@ -13,7 +13,12 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
heat_package_list: "{{ heat_distro_packages }}" heat_package_list: |-
{% set packages = heat_service_distro_packages %}
{% if heat_oslomsg_amqp1_enabled | bool %}
{% set _ = packages.extend(heat_oslomsg_amqp1_distro_packages) %}
{% endif %}
{{ packages }}
_heat_bin: "/openstack/venvs/heat-{{ heat_venv_tag }}/bin" _heat_bin: "/openstack/venvs/heat-{{ heat_venv_tag }}/bin"
heat_uwsgi_bin: "{{ _heat_bin }}" heat_uwsgi_bin: "{{ _heat_bin }}"

View File

@ -28,4 +28,9 @@ heat_service_distro_packages:
- uwsgi - uwsgi
- uwsgi-python - uwsgi-python
heat_oslomsg_amqp1_distro_packages:
- cyrus-sasl
- cyrus-sasl-plain
- cyrus-sasl-digestmd5
heat_uwsgi_bin: '/usr/sbin' heat_uwsgi_bin: '/usr/sbin'

View File

@ -28,4 +28,8 @@ heat_service_distro_packages:
- uwsgi - uwsgi
- uwsgi-plugin-python - uwsgi-plugin-python
heat_oslomsg_amqp1_distro_packages:
- libsasl2-modules
- sasl2-bin
heat_uwsgi_bin: '/usr/bin' heat_uwsgi_bin: '/usr/bin'