Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions plugin_config.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
id: 18f4ff11-b758-4bf2-9a37-719a22f5a4b8
name: sc:couchbase
externalVersion: "1.2.1.2"
buildNumber: 1.2.1.2
externalVersion: "1.2.1.3"
buildNumber: 1.2.1.3
language: PYTHON38
hostTypes:
- UNIX
Expand Down
4 changes: 3 additions & 1 deletion src/db_commands/commands.py
Original file line number Diff line number Diff line change
Expand Up @@ -1114,7 +1114,7 @@ def server_add(shell_path, hostname, port, username, newhost, services, **kwargs
def server_add_expect(shell_path, hostname, port, username, newhost, services,
**kwargs):
command = f"{shell_path} server-add --cluster {hostname}:{port} --username {username} --password \
--server-add http://{newhost}:{port} --server-add-username {username} --server-add-password $password \
--server-add http://{newhost}:{port} --server-add-username {username} --server-add-password {kwargs.get('password')} \
--services {services}"
expect_block = DatabaseCommand.get_parent_expect_block().format(
command_specific_operations="""eval spawn ${env(CB_CMD)}
Expand Down Expand Up @@ -1152,6 +1152,7 @@ def rebalance_expect(shell_path, hostname, port, username, **kwargs):
expect {
-re "Enter password:.*" {
send "${env(CB_PWD)}\n"
set timeout -1
exp_continue
}
timeout {
Expand All @@ -1160,6 +1161,7 @@ def rebalance_expect(shell_path, hostname, port, username, **kwargs):
}
}"""
)
logger.debug(f"rebalance command ::::: {command}")
env_vars = {
"CB_PWD": kwargs.get("password"),
"CB_CMD": command
Expand Down