Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Migrating from master and slave vocabulary #38

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Migrating from master and slave vocabulary #38

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion ares/aws/0_make_credentials.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
}\n')

# Define the Vms
VM_NAMES = ['database', 'router', 'gamebot', 'scoreboard', 'teaminterface', 'scriptbot', 'teamvmmaster', 'dispatcher', 'logger']
VM_NAMES = ['database', 'router', 'gamebot', 'scoreboard', 'teaminterface', 'scriptbot', 'teamvmmain', 'dispatcher', 'logger']


def make_ssh_keys(num_teams):
Expand Down
4 changes: 2 additions & 2 deletions ares/aws/4_generate_ssh_config.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ class NoInstancePublicIpFound(Exception):
}\n')

# Define the Vms
VM_NAMES = ['database', 'router', 'gamebot', 'scoreboard', 'teaminterface', 'scriptbot', 'teamvmmaster', 'dispatcher', 'logger']
VM_NAMES = ['database', 'router', 'gamebot', 'scoreboard', 'teaminterface', 'scriptbot', 'teamvmmain', 'dispatcher', 'logger']

def _execute_terraform_output(args, terraform_path):
tf_output_process = subprocess.run(
Expand Down Expand Up @@ -125,7 +125,7 @@ def write_host_entry(name, ip, key):
write_host_entry(scriptbot_num, scriptbot_ip, "scriptbot")
elif instance_name == 'teamvms':
for teamvm_num, teamvm_ip in instance_values["value"].items():
write_host_entry(teamvm_num, teamvm_ip, "teamvmmaster")
write_host_entry(teamvm_num, teamvm_ip, "teamvmmain")
elif instance_name in VM_NAMES:
write_host_entry(instance_name, instance_values["value"], instance_name)
else:
Expand Down
4 changes: 2 additions & 2 deletions ares/aws/bootstrap_game.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ class NoInstancePublicIpFound(Exception):
}\n')

# Define the Vms
VM_NAMES = ['database', 'router', 'gamebot', 'scoreboard', 'teaminterface', 'scriptbot', 'teamvmmaster']
VM_NAMES = ['database', 'router', 'gamebot', 'scoreboard', 'teaminterface', 'scriptbot', 'teamvmmain']

def _execute_terraform_output(args, terraform_path):
tf_output_process = subprocess.run(
Expand Down Expand Up @@ -379,7 +379,7 @@ def write_host_entry(name, ip, key):
write_host_entry(scriptbot_num, scriptbot_ip, "scriptbot")
elif instance_name == 'teamvms':
for teamvm_num, teamvm_ip in instance_values["value"].items():
write_host_entry(teamvm_num, teamvm_ip, "teamvmmaster")
write_host_entry(teamvm_num, teamvm_ip, "teamvmmain")
elif instance_name in VM_NAMES:
write_host_entry(instance_name, instance_values["value"], instance_name)
else:
Expand Down
2 changes: 1 addition & 1 deletion ares/docker/0_make_credentials.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
}\n')

# Define the Vms
VM_NAMES = ['database', 'router', 'gamebot', 'scoreboard', 'teaminterface', 'scriptbot', 'teamvmmaster', 'jobscheduler', 'logger']
VM_NAMES = ['database', 'router', 'gamebot', 'scoreboard', 'teaminterface', 'scriptbot', 'teamvmmain', 'jobscheduler', 'logger']


def make_ssh_keys(num_teams):
Expand Down
2 changes: 1 addition & 1 deletion database/api/scripts.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -581,7 +581,7 @@ def script_ran(script_run_id):
def get_latest_enabled_scripts():
"""The ``/scripts/latest/enabled`` endpoint requires authentication.
It is used to get latest enabled scripts for all services submitted
by all teams including master/organizer where the team id will be
by all teams including main/organizer where the team id will be
Null.

The JSON response is:
Expand Down
2 changes: 1 addition & 1 deletion database/support/mysql-connector-python-2.1.3/lib/mysql/connector/constants.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -500,7 +500,7 @@ class RefreshOption(_Constants):
'HOSTS': (1 << 3, 'Flush host cache'),
'STATUS': (1 << 4, 'Flush status variables'),
'THREADS': (1 << 5, 'Flush thread cache'),
'SLAVE': (1 << 6, 'Reset master info and restart slave thread'),
'SLAVE': (1 << 6, 'Reset main info and restart subordinate thread'),
}


Expand Down
4 changes: 2 additions & 2 deletions ...base/support/mysql-connector-python-2.1.3/lib/mysql/connector/locales/eng/client_error.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,8 @@
CR_EMBEDDED_CONNECTION = u"Embedded server"
CR_PROBE_SLAVE_STATUS = u"Error on SHOW SLAVE STATUS:"
CR_PROBE_SLAVE_HOSTS = u"Error on SHOW SLAVE HOSTS:"
CR_PROBE_SLAVE_CONNECT = u"Error connecting to slave:"
CR_PROBE_MASTER_CONNECT = u"Error connecting to master:"
CR_PROBE_SLAVE_CONNECT = u"Error connecting to subordinate:"
CR_PROBE_MASTER_CONNECT = u"Error connecting to main:"
CR_SSL_CONNECTION_ERROR = u"SSL connection error: %-.100s"
CR_MALFORMED_PACKET = u"Malformed packet"
CR_WRONG_LICENSE = u"This client library is licensed only for use with MySQL servers having '%s' license"
Expand Down
2 changes: 1 addition & 1 deletion database/support/mysql-connector-python-2.1.3/tests/mysqld.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -470,7 +470,7 @@ def bootstrap(self):
" `Process_priv`, `File_priv`, `Grant_priv`, `References_priv`,"
" `Index_priv`, `Alter_priv`, `Show_db_priv`, `Super_priv`,"
" `Create_tmp_table_priv`, `Lock_tables_priv`, `Execute_priv`,"
" `Repl_slave_priv`, `Repl_client_priv`, `Create_view_priv`,"
" `Repl_subordinate_priv`, `Repl_client_priv`, `Create_view_priv`,"
" `Show_view_priv`, `Create_routine_priv`, "
"`Alter_routine_priv`,"
" `Create_user_priv`, `Event_priv`, `Trigger_priv`, "
Expand Down