Merge "Add tripleo-firewall composable service"
This commit is contained in:
commit
67586863cf
|
@ -215,6 +215,7 @@ resource_registry:
|
|||
OS::TripleO::Services::IronicConductor: OS::Heat::None
|
||||
OS::TripleO::Services::NovaIronic: OS::Heat::None
|
||||
OS::TripleO::Services::TripleoPackages: puppet/services/tripleo-packages.yaml
|
||||
OS::TripleO::Services::TripleoFirewall: puppet/services/tripleo-firewall.yaml
|
||||
|
||||
parameter_defaults:
|
||||
EnablePackageInstall: false
|
||||
|
|
|
@ -171,6 +171,7 @@ parameters:
|
|||
- OS::TripleO::Services::IronicConductor
|
||||
- OS::TripleO::Services::NovaIronic
|
||||
- OS::TripleO::Services::TripleoPackages
|
||||
- OS::TripleO::Services::TripleoFirewall
|
||||
description: A list of service resources (configured in the Heat
|
||||
resource_registry) which represent nested stacks
|
||||
for each service that should get installed on the Controllers.
|
||||
|
@ -192,6 +193,7 @@ parameters:
|
|||
- OS::TripleO::Services::ComputeNeutronL3Agent
|
||||
- OS::TripleO::Services::ComputeNeutronMetadataAgent
|
||||
- OS::TripleO::Services::TripleoPackages
|
||||
- OS::TripleO::Services::TripleoFirewall
|
||||
description: A list of service resources (configured in the Heat
|
||||
resource_registry) which represent nested stacks
|
||||
for each service that should get installed on the Compute Nodes.
|
||||
|
@ -215,6 +217,7 @@ parameters:
|
|||
- OS::TripleO::Services::Timezone
|
||||
- OS::TripleO::Services::Snmp
|
||||
- OS::TripleO::Services::TripleoPackages
|
||||
- OS::TripleO::Services::TripleoFirewall
|
||||
description: A list of service resources (configured in the Heat
|
||||
resource_registry) which represent nested stacks
|
||||
for each service that should get installed on the BlockStorage nodes.
|
||||
|
@ -239,6 +242,7 @@ parameters:
|
|||
- OS::TripleO::Services::Snmp
|
||||
- OS::TripleO::Services::Timezone
|
||||
- OS::TripleO::Services::TripleoPackages
|
||||
- OS::TripleO::Services::TripleoFirewall
|
||||
description: A list of service resources (configured in the Heat
|
||||
resource_registry) which represent nested stacks
|
||||
for each service that should get installed on the ObjectStorage nodes.
|
||||
|
@ -263,6 +267,7 @@ parameters:
|
|||
- OS::TripleO::Services::Ntp
|
||||
- OS::TripleO::Services::Timezone
|
||||
- OS::TripleO::Services::TripleoPackages
|
||||
- OS::TripleO::Services::TripleoFirewall
|
||||
description: A list of service resources (configured in the Heat
|
||||
resource_registry) which represent nested stacks
|
||||
for each service that should get installed on the CephStorage nodes.
|
||||
|
|
|
@ -13,8 +13,6 @@
|
|||
# License for the specific language governing permissions and limitations
|
||||
# under the License.
|
||||
|
||||
include ::tripleo::firewall
|
||||
|
||||
if hiera('step') >= 4 {
|
||||
hiera_include('ceph_classes', [])
|
||||
}
|
||||
|
|
|
@ -13,8 +13,6 @@
|
|||
# License for the specific language governing permissions and limitations
|
||||
# under the License.
|
||||
|
||||
include ::tripleo::firewall
|
||||
|
||||
if hiera('step') >= 4 {
|
||||
hiera_include('compute_classes', [])
|
||||
}
|
||||
|
|
|
@ -13,8 +13,6 @@
|
|||
# License for the specific language governing permissions and limitations
|
||||
# under the License.
|
||||
|
||||
include ::tripleo::firewall
|
||||
|
||||
if hiera('step') >= 4 {
|
||||
hiera_include('controller_classes', [])
|
||||
}
|
||||
|
|
|
@ -13,8 +13,6 @@
|
|||
# License for the specific language governing permissions and limitations
|
||||
# under the License.
|
||||
|
||||
include ::tripleo::firewall
|
||||
|
||||
if hiera('step') >= 4 {
|
||||
hiera_include('controller_classes', [])
|
||||
}
|
||||
|
|
|
@ -13,8 +13,6 @@
|
|||
# License for the specific language governing permissions and limitations
|
||||
# under the License.
|
||||
|
||||
include ::tripleo::firewall
|
||||
|
||||
if hiera('step') >= 4 {
|
||||
hiera_include('object_classes', [])
|
||||
}
|
||||
|
|
|
@ -13,8 +13,6 @@
|
|||
# License for the specific language governing permissions and limitations
|
||||
# under the License.
|
||||
|
||||
include ::tripleo::firewall
|
||||
|
||||
if hiera('step') >= 4 {
|
||||
hiera_include('volume_classes', [])
|
||||
}
|
||||
|
|
|
@ -0,0 +1,19 @@
|
|||
heat_template_version: 2016-04-08
|
||||
|
||||
description: >
|
||||
TripleO Firewall settings
|
||||
|
||||
parameters:
|
||||
EndpointMap:
|
||||
default: {}
|
||||
description: Mapping of service endpoint -> protocol. Typically set
|
||||
via parameter_defaults in the resource registry.
|
||||
type: json
|
||||
|
||||
outputs:
|
||||
role_data:
|
||||
description: Role data for the TripleO firewall settings
|
||||
value:
|
||||
service_name: tripleo_firewall
|
||||
step_config: |
|
||||
include ::tripleo::firewall
|
Loading…
Reference in New Issue