Merge "Use switch to containers instead of take over playbook for ceph-ansible" into...

[apex-tripleo-heat-templates.git] / roles / ObjectStorage.yaml

diff --git a/roles/ObjectStorage.yaml b/roles/ObjectStorage.yaml
index 3741ca6..e2eacd9 100644 (file)
--- a/roles/ObjectStorage.yaml
+++ b/roles/ObjectStorage.yaml
@@ -4,6 +4,17 @@
 - name: ObjectStorage
   description: |
     Swift Object Storage node role
+  networks:
+    - InternalApi
+    - Storage
+    - StorageMgmt
+  # Deprecated & backward-compatible values (FIXME: Make parameters consistent)
+  # Set uses_deprecated_params to True if any deprecated params are used.
+  uses_deprecated_params: True
+  deprecated_param_metadata: 'SwiftStorageServerMetadata'
+  deprecated_param_ips: 'SwiftStorageIPs'
+  deprecated_param_image: 'SwiftStorageImage'
+  deprecated_param_flavor: 'OvercloudSwiftStorageFlavor'
   disable_upgrade_deployment: True
   ServicesDefault:
     - OS::TripleO::Services::AuditD
@@ -15,6 +26,7 @@
     - OS::TripleO::Services::Kernel
     - OS::TripleO::Services::MySQLClient
     - OS::TripleO::Services::Ntp
+    - OS::TripleO::Services::ContainersLogrotateCrond
     - OS::TripleO::Services::Securetty
     - OS::TripleO::Services::SensuClient
     - OS::TripleO::Services::Snmp
@@ -24,3 +36,4 @@
     - OS::TripleO::Services::Timezone
     - OS::TripleO::Services::TripleoFirewall
     - OS::TripleO::Services::TripleoPackages
+    - OS::TripleO::Services::Tuned