support multisite in ceph2 setup #84
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Signed-off-by: Nizamudeen A <[email protected]>
![github-actions[bot]](https://avatars.githubusercontent.com/in/15368?s=60&v=4){kind=small}
| @@ -75,7 +73,7 @@ fi | |||
|
|
|||
| # Disable ssl (if selected) | |||
| readonly VSTART_HAS_SSL_FLAG=$(cat /ceph/src/vstart.sh | grep DASHBOARD_SSL | wc -l) | |||
| @@ -75,7 +73,7 @@ fi | |||
|
|
|||
| # Disable ssl (if selected) | |||
| readonly VSTART_HAS_SSL_FLAG=$(cat /ceph/src/vstart.sh | grep DASHBOARD_SSL | wc -l) | |||
| @@ -75,7 +73,7 @@ fi | |||
|
|
|||
| # Disable ssl (if selected) | |||
| readonly VSTART_HAS_SSL_FLAG=$(cat /ceph/src/vstart.sh | grep DASHBOARD_SSL | wc -l) | |||
| @@ -75,7 +73,7 @@ fi | |||
|
|
|||
| # Disable ssl (if selected) | |||
| readonly VSTART_HAS_SSL_FLAG=$(cat /ceph/src/vstart.sh | grep DASHBOARD_SSL | wc -l) | |||
| if [[ "$DASHBOARD_SSL" == 0 && "$VSTART_HAS_SSL_FLAG" == 0 && "$IS_FIRST_CLUSTER" == 1 ]]; then | |||
| if [[ "$DASHBOARD_SSL" == 0 && "$VSTART_HAS_SSL_FLAG" == 0 ]]; then | |||
docker/ceph/set-start-env.sh
Outdated
| @@ -7,21 +7,23 @@ set -e | |||
| [[ -d "$MGR_PYTHON_PATH"/dashboard/frontend ]] && export IS_UPSTREAM_LUMINOUS=0 | |||
| [[ -z "$RGW" ]] && export RGW=1 | |||
|
|
|||
| export IS_FIRST_CLUSTER=$(hostname | grep -v cluster | wc -l) | |||
| echo "hostname $(hostname)" | |||
| export IS_FIRST_CLUSTER=$(( $(hostname | grep -E '(-cluster2|ceph2)' | wc -l) == 0 )) | |||
docker/ceph/set-rgw.sh
Outdated
| @@ -146,7 +146,7 @@ if [[ "$RGW_MULTISITE" == 1 ]]; then | |||
| echo -n "{$(cat ${RGW_REALM_USER_ACCESS_KEY_FILE} | sed 's/,$//')}" > "${RGW_REALM_USER_ACCESS_KEY_FILE}" | |||
| echo -n "{$(cat ${RGW_REALM_USER_SECRET_KEY_FILE} | sed 's/,$//')}" > "${RGW_REALM_USER_SECRET_KEY_FILE}" | |||
| else | |||
| readonly FIRST_CLUSTER_HOSTNAME=$(hostname | sed -e 's/-cluster.//') | |||
| readonly FIRST_CLUSTER_HOSTNAME=$(hostname | sed -e 's/-cluster//g' -e 's/2//g') | |||
this is being used for multi-site setup. But replacing this with ceph2 container would be enough Signed-off-by: Nizamudeen A <[email protected]>
| @@ -7,21 +7,14 @@ set -e | |||
| [[ -d "$MGR_PYTHON_PATH"/dashboard/frontend ]] && export IS_UPSTREAM_LUMINOUS=0 | |||
| [[ -z "$RGW" ]] && export RGW=1 | |||
|
|
|||
| export IS_FIRST_CLUSTER=$(hostname | grep -v cluster | wc -l) | |||
| export IS_FIRST_CLUSTER=$(hostname | grep -v ceph2 | wc -l) | |||
| @@ -7,21 +7,14 @@ set -e | |||
| [[ -d "$MGR_PYTHON_PATH"/dashboard/frontend ]] && export IS_UPSTREAM_LUMINOUS=0 | |||
| [[ -z "$RGW" ]] && export RGW=1 | |||
|
|
|||
| export IS_FIRST_CLUSTER=$(hostname | grep -v cluster | wc -l) | |||
| export IS_FIRST_CLUSTER=$(hostname | grep -v ceph2 | wc -l) | |||
| @@ -146,7 +146,7 @@ if [[ "$RGW_MULTISITE" == 1 ]]; then | |||
| echo -n "{$(cat ${RGW_REALM_USER_ACCESS_KEY_FILE} | sed 's/,$//')}" > "${RGW_REALM_USER_ACCESS_KEY_FILE}" | |||
| echo -n "{$(cat ${RGW_REALM_USER_SECRET_KEY_FILE} | sed 's/,$//')}" > "${RGW_REALM_USER_SECRET_KEY_FILE}" | |||
| else | |||
| readonly FIRST_CLUSTER_HOSTNAME=$(hostname | sed -e 's/-cluster.//') | |||
| readonly FIRST_CLUSTER_HOSTNAME=$(hostname | sed -e 's/2//g') | |||
cloudbehl
approved these changes
Jun 3, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
start the cluster with
RGW_MULTISITE=1anddocker-compose up -d --scale ceph2=1 --scale prometheus2=1Also removing the
ceph-cluster2container. Since that can be replaced withceph2container.