deleted file mode 100644

@@ -1,19 +0,0 @@

-[DEFAULT]

-devices = %NODE_PATH%/node

-mount_check = false

-bind_port = %BIND_PORT%

-user = %USER%

-log_facility = LOG_LOCAL%LOG_FACILITY%

-

-[pipeline:main]

-pipeline = account-server

-

-[app:account-server]

-use = egg:swift#account

-

-[account-replicator]

-vm_test_mode = yes

-

-[account-auditor]

-

-[account-reaper]

deleted file mode 100644

@@ -1,21 +0,0 @@

-[DEFAULT]

-devices = %NODE_PATH%/node

-mount_check = false

-bind_port = %BIND_PORT%

-user = %USER%

-log_facility = LOG_LOCAL%LOG_FACILITY%

-

-[pipeline:main]

-pipeline = container-server

-

-[app:container-server]

-use = egg:swift#container

-

-[container-replicator]

-vm_test_mode = yes

-

-[container-updater]

-

-[container-auditor]

-

-[container-sync]

deleted file mode 100644

@@ -1,19 +0,0 @@

-[DEFAULT]

-devices = %NODE_PATH%/node

-mount_check = false

-bind_port = %BIND_PORT%

-user = %USER%

-log_facility = LOG_LOCAL%LOG_FACILITY%

-

-[pipeline:main]

-pipeline = object-server

-

-[app:object-server]

-use = egg:swift#object

-

-[object-replicator]

-vm_test_mode = yes

-

-[object-updater]

-

-[object-auditor]

deleted file mode 100644

@@ -1,31 +0,0 @@

-[DEFAULT]

-bind_port = 8080

-user = %USER%

-log_facility = LOG_LOCAL1

-

-[pipeline:main]

-pipeline = healthcheck cache %AUTH_SERVER% proxy-server

-

-[app:proxy-server]

-use = egg:swift#proxy

-allow_account_management = true

-account_autocreate = true

-

-[filter:keystone]

-use = egg:swiftkeystone2#keystone2

-keystone_admin_token = %SERVICE_TOKEN%

-keystone_url = http://localhost:35357/v2.0

-

-[filter:tempauth]

-use = egg:swift#tempauth

-user_admin_admin = admin .admin .reseller_admin

-user_test_tester = testing .admin

-user_test2_tester2 = testing2 .admin

-user_test_tester3 = testing3

-bind_ip = 0.0.0.0

-

-[filter:healthcheck]

-use = egg:swift#healthcheck

-

-[filter:cache]

-use = egg:swift#memcache

deleted file mode 100644

@@ -1,26 +0,0 @@

-#!/bin/bash

-

-cd /etc/swift

-

-rm -f *.builder *.ring.gz backups/*.builder backups/*.ring.gz

-

-swift-ring-builder object.builder create %SWIFT_PARTITION_POWER_SIZE% 3 1

-swift-ring-builder object.builder add z1-127.0.0.1:6010/sdb1 1

-swift-ring-builder object.builder add z2-127.0.0.1:6020/sdb2 1

-swift-ring-builder object.builder add z3-127.0.0.1:6030/sdb3 1

-swift-ring-builder object.builder add z4-127.0.0.1:6040/sdb4 1

-swift-ring-builder object.builder rebalance

-

-swift-ring-builder container.builder create %SWIFT_PARTITION_POWER_SIZE% 3 1

-swift-ring-builder container.builder add z1-127.0.0.1:6011/sdb1 1

-swift-ring-builder container.builder add z2-127.0.0.1:6021/sdb2 1

-swift-ring-builder container.builder add z3-127.0.0.1:6031/sdb3 1

-swift-ring-builder container.builder add z4-127.0.0.1:6041/sdb4 1

-swift-ring-builder container.builder rebalance

-

-swift-ring-builder account.builder create %SWIFT_PARTITION_POWER_SIZE% 3 1

-swift-ring-builder account.builder add z1-127.0.0.1:6012/sdb1 1

-swift-ring-builder account.builder add z2-127.0.0.1:6022/sdb2 1

-swift-ring-builder account.builder add z3-127.0.0.1:6032/sdb3 1

-swift-ring-builder account.builder add z4-127.0.0.1:6042/sdb4 1

-swift-ring-builder account.builder rebalance

deleted file mode 100644

@@ -1,79 +0,0 @@

-uid = %USER%

-gid = %GROUP%

-log file = /var/log/rsyncd.log

-pid file = /var/run/rsyncd.pid

-address = 127.0.0.1

-

-[account6012]

-max connections = 25

-path = %SWIFT_LOCATION%/1/node/

-read only = false

-lock file = /var/lock/account6012.lock

-

-[account6022]

-max connections = 25

-path = %SWIFT_LOCATION%/2/node/

-read only = false

-lock file = /var/lock/account6022.lock

-

-[account6032]

-max connections = 25

-path = %SWIFT_LOCATION%/3/node/

-read only = false

-lock file = /var/lock/account6032.lock

-

-[account6042]

-max connections = 25

-path = %SWIFT_LOCATION%/4/node/

-read only = false

-lock file = /var/lock/account6042.lock

-

-

-[container6011]

-max connections = 25

-path = %SWIFT_LOCATION%/1/node/

-read only = false

-lock file = /var/lock/container6011.lock

-

-[container6021]

-max connections = 25

-path = %SWIFT_LOCATION%/2/node/

-read only = false

-lock file = /var/lock/container6021.lock

-

-[container6031]

-max connections = 25

-path = %SWIFT_LOCATION%/3/node/

-read only = false

-lock file = /var/lock/container6031.lock

-

-[container6041]

-max connections = 25

-path = %SWIFT_LOCATION%/4/node/

-read only = false

-lock file = /var/lock/container6041.lock

-

-

-[object6010]

-max connections = 25

-path = %SWIFT_LOCATION%/1/node/

-read only = false

-lock file = /var/lock/object6010.lock

-

-[object6020]

-max connections = 25

-path = %SWIFT_LOCATION%/2/node/

-read only = false

-lock file = /var/lock/object6020.lock

-

-[object6030]

-max connections = 25

-path = %SWIFT_LOCATION%/3/node/

-read only = false

-lock file = /var/lock/object6030.lock

-

-[object6040]

-max connections = 25

-path = %SWIFT_LOCATION%/4/node/

-read only = false

-lock file = /var/lock/object6040.lock

deleted file mode 100755

@@ -1,3 +0,0 @@

-#!/bin/bash

-

-swift-init all restart

deleted file mode 100644

@@ -1,3 +0,0 @@

-[swift-hash]

-# random unique string that can never change (DO NOT LOSE)

-swift_hash_path_suffix = %SWIFT_HASH%

new file mode 100644

@@ -0,0 +1,19 @@

+[DEFAULT]

+devices = %NODE_PATH%/node

+mount_check = false

+bind_port = %BIND_PORT%

+user = %USER%

+log_facility = LOG_LOCAL%LOG_FACILITY%

+

+[pipeline:main]

+pipeline = account-server

+

+[app:account-server]

+use = egg:swift#account

+

+[account-replicator]

+vm_test_mode = yes

+

+[account-auditor]

+

+[account-reaper]

new file mode 100644

@@ -0,0 +1,21 @@

+[DEFAULT]

+devices = %NODE_PATH%/node

+mount_check = false

+bind_port = %BIND_PORT%

+user = %USER%

+log_facility = LOG_LOCAL%LOG_FACILITY%

+

+[pipeline:main]

+pipeline = container-server

+

+[app:container-server]

+use = egg:swift#container

+

+[container-replicator]

+vm_test_mode = yes

+

+[container-updater]

+

+[container-auditor]

+

+[container-sync]

new file mode 100644

@@ -0,0 +1,19 @@

+[DEFAULT]

+devices = %NODE_PATH%/node

+mount_check = false

+bind_port = %BIND_PORT%

+user = %USER%

+log_facility = LOG_LOCAL%LOG_FACILITY%

+

+[pipeline:main]

+pipeline = object-server

+

+[app:object-server]

+use = egg:swift#object

+

+[object-replicator]

+vm_test_mode = yes

+

+[object-updater]

+

+[object-auditor]

new file mode 100644

@@ -0,0 +1,31 @@

+[DEFAULT]

+bind_port = 8080

+user = %USER%

+log_facility = LOG_LOCAL1

+

+[pipeline:main]

+pipeline = healthcheck cache %AUTH_SERVER% proxy-server

+

+[app:proxy-server]

+use = egg:swift#proxy

+allow_account_management = true

+account_autocreate = true

+

+[filter:keystone]

+use = egg:swiftkeystone2#keystone2

+keystone_admin_token = %SERVICE_TOKEN%

+keystone_url = http://localhost:35357/v2.0

+

+[filter:tempauth]

+use = egg:swift#tempauth

+user_admin_admin = admin .admin .reseller_admin

+user_test_tester = testing .admin

+user_test2_tester2 = testing2 .admin

+user_test_tester3 = testing3

+bind_ip = 0.0.0.0

+

+[filter:healthcheck]

+use = egg:swift#healthcheck

+

+[filter:cache]

+use = egg:swift#memcache

new file mode 100644

@@ -0,0 +1,79 @@

+uid = %USER%

+gid = %GROUP%

+log file = /var/log/rsyncd.log

+pid file = /var/run/rsyncd.pid

+address = 127.0.0.1

+

+[account6012]

+max connections = 25

+path = %SWIFT_LOCATION%/1/node/

+read only = false

+lock file = /var/lock/account6012.lock

+

+[account6022]

+max connections = 25

+path = %SWIFT_LOCATION%/2/node/

+read only = false

+lock file = /var/lock/account6022.lock

+

+[account6032]

+max connections = 25

+path = %SWIFT_LOCATION%/3/node/

+read only = false

+lock file = /var/lock/account6032.lock

+

+[account6042]

+max connections = 25

+path = %SWIFT_LOCATION%/4/node/

+read only = false

+lock file = /var/lock/account6042.lock

+

+

+[container6011]

+max connections = 25

+path = %SWIFT_LOCATION%/1/node/

+read only = false

+lock file = /var/lock/container6011.lock

+

+[container6021]

+max connections = 25

+path = %SWIFT_LOCATION%/2/node/

+read only = false

+lock file = /var/lock/container6021.lock

+

+[container6031]

+max connections = 25

+path = %SWIFT_LOCATION%/3/node/

+read only = false

+lock file = /var/lock/container6031.lock

+

+[container6041]

+max connections = 25

+path = %SWIFT_LOCATION%/4/node/

+read only = false

+lock file = /var/lock/container6041.lock

+

+

+[object6010]

+max connections = 25

+path = %SWIFT_LOCATION%/1/node/

+read only = false

+lock file = /var/lock/object6010.lock

+

+[object6020]

+max connections = 25

+path = %SWIFT_LOCATION%/2/node/

+read only = false

+lock file = /var/lock/object6020.lock

+

+[object6030]

+max connections = 25

+path = %SWIFT_LOCATION%/3/node/

+read only = false

+lock file = /var/lock/object6030.lock

+

+[object6040]

+max connections = 25

+path = %SWIFT_LOCATION%/4/node/

+read only = false

+lock file = /var/lock/object6040.lock

new file mode 100755

@@ -0,0 +1,26 @@

+#!/bin/bash

+

+cd /etc/swift

+

+rm -f *.builder *.ring.gz backups/*.builder backups/*.ring.gz

+

+swift-ring-builder object.builder create %SWIFT_PARTITION_POWER_SIZE% 3 1

+swift-ring-builder object.builder add z1-127.0.0.1:6010/sdb1 1

+swift-ring-builder object.builder add z2-127.0.0.1:6020/sdb2 1

+swift-ring-builder object.builder add z3-127.0.0.1:6030/sdb3 1

+swift-ring-builder object.builder add z4-127.0.0.1:6040/sdb4 1

+swift-ring-builder object.builder rebalance

+

+swift-ring-builder container.builder create %SWIFT_PARTITION_POWER_SIZE% 3 1

+swift-ring-builder container.builder add z1-127.0.0.1:6011/sdb1 1

+swift-ring-builder container.builder add z2-127.0.0.1:6021/sdb2 1

+swift-ring-builder container.builder add z3-127.0.0.1:6031/sdb3 1

+swift-ring-builder container.builder add z4-127.0.0.1:6041/sdb4 1

+swift-ring-builder container.builder rebalance

+

+swift-ring-builder account.builder create %SWIFT_PARTITION_POWER_SIZE% 3 1

+swift-ring-builder account.builder add z1-127.0.0.1:6012/sdb1 1

+swift-ring-builder account.builder add z2-127.0.0.1:6022/sdb2 1

+swift-ring-builder account.builder add z3-127.0.0.1:6032/sdb3 1

+swift-ring-builder account.builder add z4-127.0.0.1:6042/sdb4 1

+swift-ring-builder account.builder rebalance

new file mode 100755

@@ -0,0 +1,3 @@

+#!/bin/bash

+

+swift-init all restart

new file mode 100644

@@ -0,0 +1,3 @@

+[swift-hash]

+# random unique string that can never change (DO NOT LOSE)

+swift_hash_path_suffix = %SWIFT_HASH%

@@ -617,7 +617,7 @@ if [[ "$ENABLED_SERVICES" =~ "n-net" ]]; then

 fi

 # Storage Service

-if [[ "$ENABLED_SERVICES" =~ "swift" ]];then

+if [[ "$ENABLED_SERVICES" =~ "swift" ]]; then

     # We first do a bit of setup by creating the directories and

     # changing the permissions so we can run it as our user.

@@ -662,7 +662,7 @@ if [[ "$ENABLED_SERVICES" =~ "swift" ]];then

    # Swift use rsync to syncronize between all the different

    # partitions (which make more sense when you have a multi-node

    # setup) we configure it with our version of rsync.

-   sed -e "s/%GROUP%/${USER_GROUP}/;s/%USER%/$USER/;s,%SWIFT_LOCATION%,$SWIFT_LOCATION," $FILES/swift-rsyncd.conf | sudo tee /etc/rsyncd.conf

+   sed -e "s/%GROUP%/${USER_GROUP}/;s/%USER%/$USER/;s,%SWIFT_LOCATION%,$SWIFT_LOCATION," $FILES/swift/rsyncd.conf | sudo tee /etc/rsyncd.conf

    sudo sed -i '/^RSYNC_ENABLE=false/ { s/false/true/ }' /etc/default/rsync

    # By default Swift will be installed with the tempauth middleware

@@ -682,9 +682,9 @@ if [[ "$ENABLED_SERVICES" =~ "swift" ]];then

    # We do the install of the proxy-server and swift configuration

    # replacing a few directives to match our configuration.

    sed "s/%USER%/$USER/;s/%SERVICE_TOKEN%/${SERVICE_TOKEN}/;s/%AUTH_SERVER%/${swift_auth_server}/" \

-       $FILES/swift-proxy-server.conf|sudo tee  /etc/swift/proxy-server.conf

+       $FILES/swift/proxy-server.conf|sudo tee  /etc/swift/proxy-server.conf

-   sed -e "s/%SWIFT_HASH%/$SWIFT_HASH/" $FILES/swift.conf > /etc/swift/swift.conf

+   sed -e "s/%SWIFT_HASH%/$SWIFT_HASH/" $FILES/swift/swift.conf > /etc/swift/swift.conf

    # We need to generate a object/account/proxy configuration

    # emulating 4 nodes on different ports we have a little function

@@ -698,7 +698,7 @@ if [[ "$ENABLED_SERVICES" =~ "swift" ]];then

        for node_number in {1..4};do

            node_path=${SWIFT_LOCATION}/${node_number}

            sed -e "s,%USER%,$USER,;s,%NODE_PATH%,${node_path},;s,%BIND_PORT%,${bind_port},;s,%LOG_FACILITY%,${log_facility}," \

-               $FILES/swift-${server_type}-server.conf > /etc/swift/${server_type}-server/${node_number}.conf

+               $FILES/swift/${server_type}-server.conf > /etc/swift/${server_type}-server/${node_number}.conf

            bind_port=$(( ${bind_port} + 10 ))

            log_facility=$(( ${log_facility} + 1 ))

        done

@@ -714,9 +714,9 @@ if [[ "$ENABLED_SERVICES" =~ "swift" ]];then

    # - swift-startmain

    #   Restart your full cluster.

    #

-   sed -e "s/%SWIFT_PARTITION_POWER_SIZE%/$SWIFT_PARTITION_POWER_SIZE/" $FILES/swift-remakerings | \

+   sed -e "s/%SWIFT_PARTITION_POWER_SIZE%/$SWIFT_PARTITION_POWER_SIZE/" $FILES/swift/swift-remakerings | \

        sudo tee /usr/local/bin/swift-remakerings

-   sudo install -m755 $FILES/swift-startmain /usr/local/bin/

+   sudo install -m755 $FILES/swift/swift-startmain /usr/local/bin/

    sudo chmod +x /usr/local/bin/swift-*

    # We then can start rsync.