proper roles

README.md

@@ -19,5 +19,5 @@ Swift is a highly available, distributed, eventually consistent object/blob stor
 
 ## Read more
 
-* http://docs.openstack.org/developer/swift/
+* http://docs.openstack.org/developer/swift/overview_architecture.html
 * https://github.com/stackforge/puppet-swift

account.sls

@@ -0,0 +1,3 @@
+{%- if pillar.swift.account.enabled %}
+
+{%- endif %}

container.sls

@@ -0,0 +1,3 @@
+{%- if pillar.swift.container.enabled %}
+
+{%- endif %}

map.jinja

@@ -0,0 +1,54 @@
+
+{% set proxy = salt['grains.filter_by']({
+    'Debian': {
+        'pkgs': ['swift', 'python-swiftclient', 'swift-proxy'],
+        'service': 'swift-proxy',
+    },
+    'RedHat': {
+        'pkgs': ['openstack-swift', 'python-swiftclient', 'openstack-swift-proxy'],
+        'service': 'openstack-swift-proxy',
+    },
+}, merge=salt['pillar.get']('swift:proxy')) %}
+
+{% set object = salt['grains.filter_by']({
+    'Debian': {
+        'pkgs': ['swift', 'swift-object'],
+        'services': ['swift-object-auditor', 'swift-object-updater'],
+    },
+    'RedHat': {
+        'pkgs': ['openstack-swift', 'openstack-swift-object'],
+        'services': ['openstack-swift-object', 'openstack-swift-object-auditor', 'openstack-swift-object-replicator', 'openstack-swift-object-updater'] ,
+    },
+}, merge=salt['pillar.get']('swift:object')) %}
+
+
+{% set container = salt['grains.filter_by']({
+    'Debian': {
+        'pkgs': ['swift', 'swift-container'],
+        'services': ['swift-container-auditor', 'swift-container-updater', 'swift-container-replicator'],
+    },
+    'RedHat': {
+        'pkgs': ['openstack-swift', 'openstack-swift-container'],
+        'services': ['openstack-swift-container', 'openstack-swift-container-auditor', 'openstack-swift-container-replicator', 'openstack-swift-container-updater']
+    },
+}, merge=salt['pillar.get']('swift:container')) %}
+
+{% set account = salt['grains.filter_by']({
+    'Debian': {
+        'pkgs': ['swift', 'swift-account'],
+        'services': ['swift-account', 'swift-account-auditor', 'swift-account-reaper', 'swift-account-replicator'],
+    },
+    'RedHat': {
+        'pkgs': ['openstack-swift', 'openstack-swift-account'],
+        'services': ['openstack-swift-account', 'openstack-swift-account-auditor', 'openstack-swift-account-reaper', 'openstack-swift-account-replicator'],
+    },
+}, merge=salt['pillar.get']('swift:account')) %}
+
+{#
+    'Debian': {
+      $swift3 = 'swift-plugin-s3'
+    }
+    'RedHat': {
+      $swift3 = 'openstack-swift-plugin-swift3'
+    }
+#}