diff options
author | Mohammed Junaid <junaid@redhat.com> | 2013-05-16 08:52:36 +0530 |
---|---|---|
committer | Luis Pabon <lpabon@redhat.com> | 2013-05-22 04:20:34 -0700 |
commit | 3fb376dac2aed1c3f87d15bf98db47c322a0d303 (patch) | |
tree | 4c5d8f8ebfc0cf03d33ff39d622cbd92529fd06d | |
parent | b12f8f5dbfd7a87aa78babb483e678b17c10c252 (diff) |
Update the configuration files with the name in setup.py file.
Change-Id: I38c6d49143092c6c211216b285f1758706a5a89c
Signed-off-by: Mohammed Junaid <junaid@redhat.com>
Reviewed-on: http://review.gluster.org/5046
Reviewed-by: Peter Portante <pportant@redhat.com>
Tested-by: Luis Pabon <lpabon@redhat.com>
Reviewed-by: Luis Pabon <lpabon@redhat.com>
-rw-r--r-- | etc/account-server.conf-gluster (renamed from etc/account-server/1.conf-gluster) | 2 | ||||
-rw-r--r-- | etc/container-server.conf-gluster (renamed from etc/container-server/1.conf-gluster) | 2 | ||||
-rw-r--r-- | etc/object-server.conf-gluster (renamed from etc/object-server/1.conf-gluster) | 2 | ||||
-rw-r--r-- | etc/proxy-server.conf-gluster | 2 | ||||
-rw-r--r-- | glusterfs-openstack-swift.spec | 6 |
5 files changed, 7 insertions, 7 deletions
diff --git a/etc/account-server/1.conf-gluster b/etc/account-server.conf-gluster index da8f317..420f54d 100644 --- a/etc/account-server/1.conf-gluster +++ b/etc/account-server.conf-gluster @@ -9,7 +9,7 @@ log_facility = LOG_LOCAL2 pipeline = account-server [app:account-server] -use = egg:gluster_swift_ufo#account +use = egg:gluster_swift#account [account-replicator] vm_test_mode = yes diff --git a/etc/container-server/1.conf-gluster b/etc/container-server.conf-gluster index acad621..21477dc 100644 --- a/etc/container-server/1.conf-gluster +++ b/etc/container-server.conf-gluster @@ -9,7 +9,7 @@ log_facility = LOG_LOCAL2 pipeline = container-server [app:container-server] -use = egg:gluster_swift_ufo#container +use = egg:gluster_swift#container [container-replicator] vm_test_mode = yes diff --git a/etc/object-server/1.conf-gluster b/etc/object-server.conf-gluster index 0d85546..effecd1 100644 --- a/etc/object-server/1.conf-gluster +++ b/etc/object-server.conf-gluster @@ -10,7 +10,7 @@ workers = 1 pipeline = object-server [app:object-server] -use = egg:gluster_swift_ufo#object +use = egg:gluster_swift#object user = root log_facility = LOG_LOCAL2 # Timeout clients that don't read or write to the proxy server after 5 diff --git a/etc/proxy-server.conf-gluster b/etc/proxy-server.conf-gluster index e04efec..331fb02 100644 --- a/etc/proxy-server.conf-gluster +++ b/etc/proxy-server.conf-gluster @@ -9,7 +9,7 @@ workers = 1 pipeline = healthcheck cache tempauth proxy-server [app:proxy-server] -use = egg:gluster_swift_ufo#proxy +use = egg:gluster_swift#proxy log_facility = LOG_LOCAL1 # The API allows for account creation and deletion, but since Gluster/Swift # automounts a Gluster volume for a given account, there is no way to create diff --git a/glusterfs-openstack-swift.spec b/glusterfs-openstack-swift.spec index f9b8643..f1f09ae 100644 --- a/glusterfs-openstack-swift.spec +++ b/glusterfs-openstack-swift.spec @@ -79,9 +79,9 @@ rm -rf %{buildroot} %{python_sitelib}/gluster_swift-%{version}-*.egg-info %{_bindir}/gluster-swift-gen-builders %dir %{_confdir} -%config %{_confdir}/account-server/1.conf-gluster -%config %{_confdir}/container-server/1.conf-gluster -%config %{_confdir}/object-server/1.conf-gluster +%config %{_confdir}/account-server.conf-gluster +%config %{_confdir}/container-server.conf-gluster +%config %{_confdir}/object-server.conf-gluster %config %{_confdir}/swift.conf-gluster %config %{_confdir}/proxy-server.conf-gluster %config %{_confdir}/fs.conf-gluster |