aboutsummaryrefslogtreecommitdiffstats
path: root/ci
diff options
context:
space:
mode:
authorSteven Hardy <shardy@redhat.com>2017-02-15 18:08:09 +0000
committerEmilien Macchi <emilien@redhat.com>2017-02-16 13:19:52 +0000
commitaef946f8453d81b8bb6b20f5539e5949209af8a9 (patch)
tree5b7dd1c929005752e297921654e7106ce4c8f254 /ci
parentfcf62ae05ece08d76d0372845a93359ce9d085f3 (diff)
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 (cherry picked from commit b3fe9f726499cb2575737129928c09a68c9145e3)
Diffstat (limited to 'ci')
-rw-r--r--ci/environments/multinode-core.yaml37
-rw-r--r--ci/environments/multinode_major_upgrade.yaml2
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 0000000..0c07a1b
--- /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 56d04de..4859c23 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