diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2017-02-16 13:19:03 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2017-02-16 13:19:03 +0000 |
| commit | faaee0fa6fb0d899fb36b71dac64a18bf93a8ae2 (patch) | |
| tree | 6bf18c8ff219b1bde32b5e313f46f2d6feb08055 /ci | |
| parent | 5340f64c03902b7a76212a579bcc895d56008df3 (diff) | |
| parent | b3fe9f726499cb2575737129928c09a68c9145e3 (diff) | |
Merge "CI fix broken references to multinode-core.yaml"
Diffstat (limited to 'ci')
| -rw-r--r-- | ci/environments/multinode-core.yaml | 37 | ||||
| -rw-r--r-- | ci/environments/multinode_major_upgrade.yaml | 2 |
2 files changed, 37 insertions, 2 deletions
diff --git a/ci/environments/multinode-core.yaml b/ci/environments/multinode-core.yaml new file mode 100644 index 00000000..0c07a1b0 --- /dev/null +++ b/ci/environments/multinode-core.yaml @@ -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 diff --git a/ci/environments/multinode_major_upgrade.yaml b/ci/environments/multinode_major_upgrade.yaml index 56d04de5..4859c23a 100644 --- a/ci/environments/multinode_major_upgrade.yaml +++ b/ci/environments/multinode_major_upgrade.yaml @@ -1,12 +1,10 @@ resource_registry: OS::TripleO::Controller::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: ControllerServices: - OS::TripleO::Services::CACerts - - OS::TripleO::Services::Core - OS::TripleO::Services::Kernel - OS::TripleO::Services::Keystone - OS::TripleO::Services::GlanceApi |