Merge "Add Mistral to scenario003"

This commit is contained in:
Jenkins 2016-11-30 16:16:28 +00:00 committed by Gerrit Code Review
commit 6df32707e9
2 changed files with 25 additions and 0 deletions

View File

@ -3,6 +3,9 @@ resource_registry:
OS::TripleO::Compute::Net::SoftwareConfig: ../common/net-config-multinode.yaml OS::TripleO::Compute::Net::SoftwareConfig: ../common/net-config-multinode.yaml
OS::TripleO::Services::SaharaApi: /usr/share/openstack-tripleo-heat-templates/puppet/services/sahara-api.yaml OS::TripleO::Services::SaharaApi: /usr/share/openstack-tripleo-heat-templates/puppet/services/sahara-api.yaml
OS::TripleO::Services::SaharaEngine: /usr/share/openstack-tripleo-heat-templates/puppet/services/sahara-engine.yaml OS::TripleO::Services::SaharaEngine: /usr/share/openstack-tripleo-heat-templates/puppet/services/sahara-engine.yaml
OS::TripleO::Services::MistralApi: /usr/share/openstack-tripleo-heat-templates/puppet/services/mistral-api.yaml
OS::TripleO::Services::MistralEngine: /usr/share/openstack-tripleo-heat-templates/puppet/services/mistral-engine.yaml
OS::TripleO::Services::MistralExecutor: /usr/share/openstack-tripleo-heat-templates/puppet/services/mistral-executor.yaml
parameter_defaults: parameter_defaults:
ControllerServices: ControllerServices:
@ -37,6 +40,9 @@ parameter_defaults:
- OS::TripleO::Services::NovaLibvirt - OS::TripleO::Services::NovaLibvirt
- OS::TripleO::Services::SaharaApi - OS::TripleO::Services::SaharaApi
- OS::TripleO::Services::SaharaEngine - OS::TripleO::Services::SaharaEngine
- OS::TripleO::Services::MistralApi
- OS::TripleO::Services::MistralEngine
- OS::TripleO::Services::MistralExecutor
ControllerExtraConfig: ControllerExtraConfig:
nova::compute::libvirt::services::libvirt_virt_type: qemu nova::compute::libvirt::services::libvirt_virt_type: qemu
nova::compute::libvirt::libvirt_virt_type: qemu nova::compute::libvirt::libvirt_virt_type: qemu

View File

@ -126,6 +126,22 @@ resources:
tags: tags:
- tripleo - tripleo
mistral_workflow:
type: OS::Mistral::Workflow
properties:
type: direct
name: test_workflow
description: Just testing workflow resource.
input:
phrase: Hello!
output:
out: <% $.word %>
tasks:
- name: hello
action: std.echo output=<% $.phrase %>
publish:
word: <% $.hello %>
outputs: outputs:
server1_private_ip: server1_private_ip:
description: IP address of server1 in private network description: IP address of server1 in private network
@ -133,3 +149,6 @@ outputs:
server1_public_ip: server1_public_ip:
description: Floating IP address of server1 in public network description: Floating IP address of server1 in public network
value: { get_attr: [ server1_floating_ip, floating_ip_address ] } value: { get_attr: [ server1_floating_ip, floating_ip_address ] }
exec:
description: Mistral output verifying execution
value: { get_attr: [mistral_workflow, executions]}