Merge pull request #48 from SaravanaStorageNetwork/renamed_s3

Rename docker-gluster-swift

20 files changed, 19 insertions, 20 deletions

diff --git a/.travis.yml b/.travis.yml
index a632067..e855878 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -25,10 +25,10 @@ before_install:
 - docker run -d --name gfedora --privileged -v /sys/fs/cgroup:/sys/fs/cgroup:ro gluster/fedora
 - sleep 10
 - docker exec -it gfedora systemctl is-active glusterd
-- docker build -t gluster/swift ./gluster-object/CentOS/docker-gluster-swift/
-- docker run -d --name swift --privileged -v /sys/fs/cgroup:/sys/fs/cgroup:ro -e GLUSTER_VOLUMES=vol gluster/swift
+- docker build -t gluster/s3object ./gluster-s3object/CentOS/docker-gluster-s3/
+- docker run -d --name s3object --privileged -v /sys/fs/cgroup:/sys/fs/cgroup:ro -e GLUSTER_VOLUMES=vol gluster/s3object
 - sleep 10
-- docker exec -it swift systemctl is-active swift-object
+- docker exec -it s3object systemctl is-active swift-object
 
 script:
 - make test
diff --git a/README.md b/README.md
index 68eee5c..42dde1c 100644
--- a/README.md
+++ b/README.md
@@ -114,17 +114,16 @@ Number of Peers: 0
 ~~~
 That’s it!
 
-
 Additional Ref# https://goo.gl/3031Mm
 
 ## Gluster Object Docker container:
 
-### To pull gluster-object:
+### To pull gluster-s3:
 ~~~
-$ docker pull gluster/gluster-object
+$ docker pull gluster/gluster-s3
 ~~~
 
-### To run gluster-object container:
+### To run gluster-s3 container:
 
 On the host machine, mount one or more gluster volumes under the directory
 `/mnt/gluster-object` with mountpoint name being same as that of the volume.
@@ -143,10 +142,10 @@ GLUSTER_VOLUMES='tv1'
 Where tv1 is the volume name.
 
 ~~~
-$ docker run -d --privileged  -v /sys/fs/cgroup/:/sys/fs/cgroup/:ro -p 8080:8080 -v /mnt/gluster-object:/mnt/gluster-object  gluster/gluster-object
+$ docker run -d --privileged  -v /sys/fs/cgroup/:/sys/fs/cgroup/:ro -p 8080:8080 -v /mnt/gluster-object:/mnt/gluster-object  gluster/gluster-s3
 ~~~
 
-Now, We can get/put objects into the gluster volume, using the gluster-object Docker container.
+Now, We can get/put objects into the gluster volume, using the gluster-s3 Docker container.
 Refer this link[1] for testing.
 
 [1] https://github.com/gluster/gluster-swift/blob/master/doc/markdown/quick_start_guide.md#using_swift
diff --git a/gluster-object/CentOS/docker-gluster-swift/Dockerfile b/gluster-s3object/CentOS/docker-gluster-s3/Dockerfile
index 9ec1e2f..9ec1e2f 100644
--- a/gluster-object/CentOS/docker-gluster-swift/Dockerfile
+++ b/gluster-s3object/CentOS/docker-gluster-s3/Dockerfile
diff --git a/gluster-object/CentOS/docker-gluster-swift/README.md b/gluster-s3object/CentOS/docker-gluster-s3/README.md
index 41e966d..baa6d28 100644
--- a/gluster-object/CentOS/docker-gluster-swift/README.md
+++ b/gluster-s3object/CentOS/docker-gluster-s3/README.md
@@ -1,13 +1,13 @@
 
-# docker-gluster-swift
-docker-gluster-swift is to provide object interface for a Gluster volume.
+# docker-gluster-s3
+docker-gluster-s3 is to provide object interface for a Gluster volume.
 
-Let us see how to run gluster-swift inside a docker container.
+Let us see how to run gluster-s3 inside a docker container.
 
 ## Building
 
 ```bash
-# docker build --rm --tag gluster-swift .
+# docker build --rm --tag gluster-s3 .
 ```
 
 ## Running
@@ -30,7 +30,7 @@ Where tv1 is the volume name.
 **Example:**
 
 ```bash
-# docker run -d --privileged  -v /sys/fs/cgroup/:/sys/fs/cgroup/:ro -p 8080:8080 -v /mnt/gluster-object:/mnt/gluster-object    -e GLUSTER_VOLUMES="tv1" gluster-swift
+# docker run -d --privileged  -v /sys/fs/cgroup/:/sys/fs/cgroup/:ro -p 8080:8080 -v /mnt/gluster-object:/mnt/gluster-object -e GLUSTER_VOLUMES="tv1" gluster-s3
 ```
 
 If you have selinux set to enforced on the host machine, refer to the
@@ -63,7 +63,7 @@ Assuming you have conf files and ring files present at `/tmp/swift` on the
 machine, you can spawn the container as follows:
 
 ```bash
-# docker run -d -p 8080:8080 -v /tmp/swift:/etc/swift -v /mnt/gluster-object:/mnt/gluster-object prashanthpai/gluster-swift:dev
+# docker run -d -p 8080:8080 -v /tmp/swift:/etc/swift -v /mnt/gluster-object:/mnt/gluster-object gluster-s3
 ```
 
 If the host machine has SELinux set to enforced:
@@ -106,4 +106,4 @@ mount -t glusterfs -o selinux,context="system_u:object_r:svirt_sandbox_file_t:s0
 
 ### TODO
 
-* Install gluster-swift from RPMs. (Currently installed from source)
+* Install gluster-s3 from RPMs. (Currently installed from source)
diff --git a/gluster-object/CentOS/docker-gluster-swift/etc/swift/account-server.conf b/gluster-s3object/CentOS/docker-gluster-s3/etc/swift/account-server.conf
index 726f9c7..726f9c7 100644
--- a/gluster-object/CentOS/docker-gluster-swift/etc/swift/account-server.conf
+++ b/gluster-s3object/CentOS/docker-gluster-s3/etc/swift/account-server.conf
diff --git a/gluster-object/CentOS/docker-gluster-swift/etc/swift/container-server.conf b/gluster-s3object/CentOS/docker-gluster-s3/etc/swift/container-server.conf
index e8f67e3..e8f67e3 100644
--- a/gluster-object/CentOS/docker-gluster-swift/etc/swift/container-server.conf
+++ b/gluster-s3object/CentOS/docker-gluster-s3/etc/swift/container-server.conf
diff --git a/gluster-object/CentOS/docker-gluster-swift/etc/swift/fs.conf b/gluster-s3object/CentOS/docker-gluster-s3/etc/swift/fs.conf
index 31a5e6f..31a5e6f 100644
--- a/gluster-object/CentOS/docker-gluster-swift/etc/swift/fs.conf
+++ b/gluster-s3object/CentOS/docker-gluster-s3/etc/swift/fs.conf
diff --git a/gluster-object/CentOS/docker-gluster-swift/etc/swift/object-expirer.conf b/gluster-s3object/CentOS/docker-gluster-s3/etc/swift/object-expirer.conf
index 8be8626..8be8626 100644
--- a/gluster-object/CentOS/docker-gluster-swift/etc/swift/object-expirer.conf
+++ b/gluster-s3object/CentOS/docker-gluster-s3/etc/swift/object-expirer.conf
diff --git a/gluster-object/CentOS/docker-gluster-swift/etc/swift/object-server.conf b/gluster-s3object/CentOS/docker-gluster-s3/etc/swift/object-server.conf
index 2c7df2e..2c7df2e 100644
--- a/gluster-object/CentOS/docker-gluster-swift/etc/swift/object-server.conf
+++ b/gluster-s3object/CentOS/docker-gluster-s3/etc/swift/object-server.conf
diff --git a/gluster-object/CentOS/docker-gluster-swift/etc/swift/proxy-server.conf b/gluster-s3object/CentOS/docker-gluster-s3/etc/swift/proxy-server.conf
index 979b735..979b735 100644
--- a/gluster-object/CentOS/docker-gluster-swift/etc/swift/proxy-server.conf
+++ b/gluster-s3object/CentOS/docker-gluster-s3/etc/swift/proxy-server.conf
diff --git a/gluster-object/CentOS/docker-gluster-swift/etc/swift/swift.conf b/gluster-s3object/CentOS/docker-gluster-s3/etc/swift/swift.conf
index f64ba5a..f64ba5a 100644
--- a/gluster-object/CentOS/docker-gluster-swift/etc/swift/swift.conf
+++ b/gluster-s3object/CentOS/docker-gluster-s3/etc/swift/swift.conf
diff --git a/gluster-object/CentOS/docker-gluster-swift/etc/sysconfig/swift-volumes b/gluster-s3object/CentOS/docker-gluster-s3/etc/sysconfig/swift-volumes
index 8b49f07..8b49f07 100644
--- a/gluster-object/CentOS/docker-gluster-swift/etc/sysconfig/swift-volumes
+++ b/gluster-s3object/CentOS/docker-gluster-s3/etc/sysconfig/swift-volumes
diff --git a/gluster-object/CentOS/docker-gluster-swift/memcached.service b/gluster-s3object/CentOS/docker-gluster-s3/memcached.service
index 7aae000..7aae000 100644
--- a/gluster-object/CentOS/docker-gluster-swift/memcached.service
+++ b/gluster-s3object/CentOS/docker-gluster-s3/memcached.service
diff --git a/gluster-object/CentOS/docker-gluster-swift/swift-account.service b/gluster-s3object/CentOS/docker-gluster-s3/swift-account.service
index 2b74cfd..2b74cfd 100644
--- a/gluster-object/CentOS/docker-gluster-swift/swift-account.service
+++ b/gluster-s3object/CentOS/docker-gluster-s3/swift-account.service
diff --git a/gluster-object/CentOS/docker-gluster-swift/swift-container.service b/gluster-s3object/CentOS/docker-gluster-s3/swift-container.service
index 6d83db4..6d83db4 100644
--- a/gluster-object/CentOS/docker-gluster-swift/swift-container.service
+++ b/gluster-s3object/CentOS/docker-gluster-s3/swift-container.service
diff --git a/gluster-object/CentOS/docker-gluster-swift/swift-gen-builders.service b/gluster-s3object/CentOS/docker-gluster-s3/swift-gen-builders.service
index ab30a7c..ab30a7c 100644
--- a/gluster-object/CentOS/docker-gluster-swift/swift-gen-builders.service
+++ b/gluster-s3object/CentOS/docker-gluster-s3/swift-gen-builders.service
diff --git a/gluster-object/CentOS/docker-gluster-swift/swift-object.service b/gluster-s3object/CentOS/docker-gluster-s3/swift-object.service
index 502759d..502759d 100644
--- a/gluster-object/CentOS/docker-gluster-swift/swift-object.service
+++ b/gluster-s3object/CentOS/docker-gluster-s3/swift-object.service
diff --git a/gluster-object/CentOS/docker-gluster-swift/swift-proxy.service b/gluster-s3object/CentOS/docker-gluster-s3/swift-proxy.service
index 8421bf6..8421bf6 100644
--- a/gluster-object/CentOS/docker-gluster-swift/swift-proxy.service
+++ b/gluster-s3object/CentOS/docker-gluster-s3/swift-proxy.service
diff --git a/gluster-object/CentOS/docker-gluster-swift/update_gluster_vol.sh b/gluster-s3object/CentOS/docker-gluster-s3/update_gluster_vol.sh
index dfb891d..dfb891d 100644
--- a/gluster-object/CentOS/docker-gluster-swift/update_gluster_vol.sh
+++ b/gluster-s3object/CentOS/docker-gluster-s3/update_gluster_vol.sh
diff --git a/tests/shelltest/test_gluster_container_basic.sh b/tests/shelltest/test_gluster_container_basic.sh
index 8d139ca..452e34d 100755
--- a/tests/shelltest/test_gluster_container_basic.sh
+++ b/tests/shelltest/test_gluster_container_basic.sh
@@ -35,12 +35,12 @@ testit "test shellcheck ${BASE_DIR}/CentOS/gluster-setup.sh" \
         test_shellcheck ${BASE_DIR}/CentOS/gluster-setup.sh \
         || ((failed++))
 
-testit "test script syntax ${BASE_DIR}/gluster-object/CentOS/docker-gluster-swift/update_gluster_vol.sh" \
-        test_syntax ${BASE_DIR}/gluster-object/CentOS/docker-gluster-swift/update_gluster_vol.sh \
+testit "test script syntax ${BASE_DIR}/gluster-s3object/CentOS/docker-gluster-s3/update_gluster_vol.sh" \
+        test_syntax ${BASE_DIR}/gluster-s3object/CentOS/docker-gluster-s3/update_gluster_vol.sh \
         || ((failed++))
 
-testit "test shellcheck ${BASE_DIR}/gluster-object/CentOS/docker-gluster-swift/update_gluster_vol.sh" \
-        test_shellcheck ${BASE_DIR}/gluster-object/CentOS/docker-gluster-swift/update_gluster_vol.sh \
+testit "test shellcheck ${BASE_DIR}/gluster-s3object/CentOS/docker-gluster-s3/update_gluster_vol.sh" \
+        test_shellcheck ${BASE_DIR}/gluster-s3object/CentOS/docker-gluster-s3/update_gluster_vol.sh \
         || ((failed++))