CI fix broken references to multinode-core.yaml

This isn't needed for the single-node upgrade test, but it is
required for the 3-nodes job (which won't work because the referenced
file doesn't currently exist).

Change-Id: I78bd5c804284219a71b13dba21fd1188ca854fca
This commit is contained in:
Steven Hardy 2017-02-15 18:08:09 +00:00
parent 08ce4f30f4
commit b3fe9f7264
2 changed files with 37 additions and 2 deletions

View File

@ -0,0 +1,37 @@
heat_template_version: ocata
description: >
OpenStack Core Service
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
Debug:
type: string
default: ''
resources:
outputs:
role_data:
description: Role data for the multinode firewall configuration
value:
service_name: multinode_core
config_settings:
tripleo.core.firewall_rules:
'999 core':
proto: 'udp'
dport:
- 4789

View File

@ -1,12 +1,10 @@
resource_registry: resource_registry:
OS::TripleO::Controller::Net::SoftwareConfig: ../common/net-config-multinode.yaml OS::TripleO::Controller::Net::SoftwareConfig: ../common/net-config-multinode.yaml
OS::TripleO::Compute::Net::SoftwareConfig: ../common/net-config-multinode.yaml OS::TripleO::Compute::Net::SoftwareConfig: ../common/net-config-multinode.yaml
OS::TripleO::Services::Core: multinode-core.yaml
parameter_defaults: parameter_defaults:
ControllerServices: ControllerServices:
- OS::TripleO::Services::CACerts - OS::TripleO::Services::CACerts
- OS::TripleO::Services::Core
- OS::TripleO::Services::Kernel - OS::TripleO::Services::Kernel
- OS::TripleO::Services::Keystone - OS::TripleO::Services::Keystone
- OS::TripleO::Services::GlanceApi - OS::TripleO::Services::GlanceApi