From a800ee0c113eff3955eccb520c01d02a9ae9de76 Mon Sep 17 00:00:00 2001 From: hanish gogada Date: Fri, 28 Sep 2018 12:26:30 +0530 Subject: [PATCH] Implements: liquidio-containerization Modified heat templates to add support for containerization for Liquidio compute service. Fixed a issue in the ProviderMappings in Liquidio heat templates. Depends-On: Ice2baafae2fb1011e16d83c83b5c85f721f6d679 Change-Id: Id4c754f402091e17a974972408919332aa06cd11 --- docker/services/liquidio-compute-config.yaml | 102 +++++++++++++++++++ environments/cavium-liquidio.yaml | 4 +- puppet/services/liquidio-compute-config.yaml | 15 ++- 3 files changed, 110 insertions(+), 11 deletions(-) create mode 100644 docker/services/liquidio-compute-config.yaml diff --git a/docker/services/liquidio-compute-config.yaml b/docker/services/liquidio-compute-config.yaml new file mode 100644 index 0000000000..101b46d25b --- /dev/null +++ b/docker/services/liquidio-compute-config.yaml @@ -0,0 +1,102 @@ +heat_template_version: rocky + +description: > + OpenStack containerized Liquidio compute service +parameters: + DockerLiquidioImage: + description: The container image to use for the Liquidio Service + type: string + DockerLiquidioConfigImage: + description: The container image to use for the Liquidio config generation + type: string + EndpointMap: + default: {} + description: Mapping of service endpoint -> protocol. Typically set + via parameter_defaults in the resource registry. + type: json + ServiceData: + default: {} + description: Dictionary packing service data + type: json + ServiceNetMap: + default: {} + description: Mapping of service_name -> network name. Typically set + via parameter_defaults in the resource registry. This + mapping overrides those in ServiceNetMapDefaults. + type: json + DefaultPasswords: + default: {} + type: json + RoleName: + default: '' + description: Role name on which the service is applied + type: string + RoleParameters: + default: {} + description: Parameters specific to the role + type: json + +resources: + + ContainersCommon: + type: ./containers-common.yaml + + LiquidioBase: + type: ../../puppet/services/liquidio-compute-config.yaml + properties: + EndpointMap: {get_param: EndpointMap} + ServiceData: {get_param: ServiceData} + ServiceNetMap: {get_param: ServiceNetMap} + DefaultPasswords: {get_param: DefaultPasswords} + RoleName: {get_param: RoleName} + RoleParameters: {get_param: RoleParameters} + +outputs: + role_data: + description: Role data for Liquidio compute service. + value: + service_name: {get_attr: [LiquidioBase, role_data, service_name]} + config_settings: + get_attr: [LiquidioBase, role_data, config_settings] + puppet_config: + config_volume: liquidio + puppet_tags: liquidio_config + step_config: + get_attr: [LiquidioBase, role_data, step_config] + config_image: {get_param: DockerLiquidioConfigImage} + kolla_config: + /var/lib/kolla/config_files/liquidio_config.json: + command: "/usr/bin/liquidio-compute start" + config_files: + - source: "/var/lib/kolla/config_files/src/*" + dest: "/" + merge: true + preserve_properties: true + permissions: + - path: /var/log/liquidio/ + owner: root:root + recurse: true + docker_config: + step_5: + liquidio_compute_service: + start_order: 10 + image: {get_param: DockerLiquidioImage} + net: host + detach: true + user: root + privileged: true + restart: always + volumes: + list_concat: + - {get_attr: [ContainersCommon, volumes]} + - + - /var/lib/kolla/config_files/liquidio_config.json:/var/lib/kolla/config_files/config.json:ro + - /var/lib/config-data/puppet-generated/liquidio/:/var/lib/kolla/config_files/src:ro + - /etc/udev/:/etc/udev/:z + - /usr/lib/udev/:/usr/lib/udev/:z + - /lib/modules/:/lib/modules/:z + - /usr/lib/firmware/liquidio/:/usr/lib/firmware/liquidio/:z + - /dev:/dev + - /run:/run + environment: + - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS diff --git a/environments/cavium-liquidio.yaml b/environments/cavium-liquidio.yaml index 4644525792..c6f2e2eeaa 100644 --- a/environments/cavium-liquidio.yaml +++ b/environments/cavium-liquidio.yaml @@ -1,7 +1,5 @@ resource_registry: - # FIXME(bogdando): switch it, once it is containerized - OS::TripleO::Services::LiquidioCompute: ../puppet/services/liquidio-compute-config.yaml - OS::TripleO::Services::NeutronMetadataAgent: ../docker/services/neutron-metadata.yaml + OS::TripleO::Services::LiquidioCompute: ../docker/services/liquidio-compute-config.yaml parameter_defaults: LiquidioSriovVfNum: 4 diff --git a/puppet/services/liquidio-compute-config.yaml b/puppet/services/liquidio-compute-config.yaml index c2b40a4f28..06d43ac2a0 100644 --- a/puppet/services/liquidio-compute-config.yaml +++ b/puppet/services/liquidio-compute-config.yaml @@ -61,18 +61,17 @@ parameters: type: string description: BridgeMappings used in ODL/OVN Deployments default: 'datacentre:eth1' - constraints: - - allowed_pattern: "[a-zA-Z0-9]*:eth[0-1]" + outputs: role_data: description: Role data for the LiquidioCompute node value: service_name: liquidio_compute_config config_settings: - tripleo::network::cavium::liquidio::vf_nums: {get_param: LiquidioSriovVfNum} - tripleo::network::cavium::liquidio::configure_mode: {get_param: LiquidioConfigureMode} - tripleo::network::cavium::liquidio::enable_bonding: {get_param: LiquidioEnableBonding} - tripleo::network::cavium::liquidio::bonding_options: {get_param: LiquidioBondingOptions} - tripleo::network::cavium::liquidio::provider_mappings: {get_param: LiquidioProviderMappings} + tripleo::host::liquidio::compute::vf_nums: {get_param: LiquidioSriovVfNum} + tripleo::host::liquidio::compute::configure_mode: {get_param: LiquidioConfigureMode} + tripleo::host::liquidio::compute::enable_bonding: {get_param: LiquidioEnableBonding} + tripleo::host::liquidio::compute::bonding_options: {get_param: LiquidioBondingOptions} + tripleo::host::liquidio::compute::provider_mappings: {get_param: LiquidioProviderMappings} step_config: | - include ::tripleo::network::cavium::liquidio + include ::tripleo::host::liquidio::compute