From 33fcb48444d93b2d38d30b5b92b3fd0cf64ccd20 Mon Sep 17 00:00:00 2001 From: Jose Lausuch Date: Fri, 30 Jun 2017 09:32:12 +0000 Subject: Update git submodules * Update docs/submodules/functest from branch 'master' - Merge "Added unit tests for vping." - Added unit tests for vping. Also removed some instance variables and unnecessary methods. JIRA: FUNCTEST-813 Change-Id: I13895674a9fd3de16c6a19410661440c5380c2f8 Signed-off-by: spisarski --- docs/submodules/functest | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docs/submodules/functest') diff --git a/docs/submodules/functest b/docs/submodules/functest index 5093eefb7..5e7d3d9fc 160000 --- a/docs/submodules/functest +++ b/docs/submodules/functest @@ -1 +1 @@ -Subproject commit 5093eefb73d0f01d383fe55fdf7fdbd63f8888f2 +Subproject commit 5e7d3d9fcf2a5b7757ff8132b6f4c3b022e97abb -- cgit 1.2.3-korg /div>
summaryrefslogtreecommitdiffstats
blob: d5dedf34d8f0693c5aa32a6f752a7a8bc28889d0 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
heat_template_version: 2016-04-08

description: >
  OpenStack Cinder Volume service with Pacemaker configured with Puppet

parameters:
  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
  EndpointMap:
    default: {}
    description: Mapping of service endpoint -> protocol. Typically set
                 via parameter_defaults in the resource registry.
    type: json

resources:

  CinderVolumeBase:
    type: ../cinder-volume.yaml
    properties:
      ServiceNetMap: {get_param: ServiceNetMap}
      DefaultPasswords: {get_param: DefaultPasswords}
      EndpointMap: {get_param: EndpointMap}

outputs:
  role_data:
    description: Role data for the Cinder Volume role.
    value:
      service_name: cinder_volume
      monitoring_subscription: {get_attr: [CinderVolumeBase, role_data, monitoring_subscription]}
      config_settings:
        map_merge:
          - get_attr: [CinderVolumeBase, role_data, config_settings]
          - cinder::volume::manage_service: false
            cinder::volume::enabled: false
      step_config:
        include ::tripleo::profile::pacemaker::cinder::volume