Inclusive language update

Issues not addressed here:
- FOG still uses master
- lots of gitbuilder URLs in yaml files and docs referencing master
- named uses 'master zones'

Signed-off-by: Zack Cerza <zack@redhat.com>

diff --git a/roles/nsupdate_web/defaults/main.yml b/roles/nsupdate_web/defaults/main.yml
index 674e717cd02a3ad781c4d619be69d31a8b357a1b..894d9fbedd6c97f9550eb90507ffa7354bd87342 100644 (file)
--- a/roles/nsupdate_web/defaults/main.yml
+++ b/roles/nsupdate_web/defaults/main.yml
@@ -7,7 +7,7 @@ virtualenv_path: "~/venv"
 python_version: "python3"
 nsupdate_web_repo: "https://github.com/ceph/nsupdate-web.git"
 nsupdate_web_path: "/home/{{ nsupdate_web_user }}/nsupdate_web"
-nsupdate_web_branch: "master"
+nsupdate_web_branch: "main"
 # The public and private keys must be manually placed on the host; 
 # The pubkey name must be provided - most likely via group_vars
 pubkey_name: "your_pubkey.key"

diff --git a/roles/paddles/defaults/main.yml b/roles/paddles/defaults/main.yml
index 85c3fc5745ba7fe371b1e4580a53f0aa2fb3aa3a..ac854c4f076add8de66996dfc1eeba194be987af 100644 (file)
--- a/roles/paddles/defaults/main.yml
+++ b/roles/paddles/defaults/main.yml
@@ -11,7 +11,7 @@ paddles_container_image: quay.io/ceph-infra/paddles:latest
 paddles_container_replicas: 10
 
 paddles_repo: https://github.com/ceph/paddles.git
-paddles_branch: master
+paddles_branch: main
 
 
 log_host: localhost

diff --git a/roles/public_facing/tasks/download.ceph.com.yml b/roles/public_facing/tasks/download.ceph.com.yml
index a00d00dc162da01925fbcdc726aceca4ed97b5c2..03e4b576f93a27e4dc8bafd06e3cee82f9817e38 100644 (file)
--- a/roles/public_facing/tasks/download.ceph.com.yml
+++ b/roles/public_facing/tasks/download.ceph.com.yml
@@ -5,7 +5,7 @@
     dest: /etc/logrotate.d/download.ceph.com
 
 # Used for pushing upstream builds
-# https://github.com/ceph/ceph-build/blob/master/scripts/sync-push
+# https://github.com/ceph/ceph-build/blob/main/scripts/sync-push
 - name: Add signer user
   user:
     name: signer

diff --git a/roles/pulpito/defaults/main.yml b/roles/pulpito/defaults/main.yml
index 90169f170318738da143ae699b82b2fb616f7f56..c07e0dfbe5a59603ba0b163ffbccc7473e95b2c1 100644 (file)
--- a/roles/pulpito/defaults/main.yml
+++ b/roles/pulpito/defaults/main.yml
@@ -1,3 +1,3 @@
 pulpito_repo: https://github.com/ceph/pulpito.git
 pulpito_user: pulpito
-pulpito_branch: master
+pulpito_branch: main

diff --git a/roles/rook/README.rst b/roles/rook/README.rst
index a6eafcf2fc34d24107cf3d05d9fb512abcc3e202..bc39839fb0241d1aef7cc1d9f744f2ebf51453c2 100644 (file)
--- a/roles/rook/README.rst
+++ b/roles/rook/README.rst
@@ -5,7 +5,7 @@ This role is used for updating and recovering the rook jenkins in the rook ci Vi
 
 The functions in this role are:
 
-**rook-jenkins-update:** For updating rook jenkins version to the version defined in the "jenkins_master_image" variable
+**rook-jenkins-update:** For updating rook jenkins version to the version defined in the "jenkins_controller_image" variable
 
 **rook-os-update:** For updating rook jenkins OS packages
 
@@ -33,7 +33,7 @@ Examples
 
 Updating the rook jenkins app to version 2.289.1::
 
-    ansible-playbook rook.yml --tags="rook-jenkins-update" --extra-vars="jenkins_master_image=jenkins/jenkins:2.289.1"
+    ansible-playbook rook.yml --tags="rook-jenkins-update" --extra-vars="jenkins_controller_image=jenkins/jenkins:2.289.1"
 
 Updating the rook jenkins OS packages::
 
@@ -46,7 +46,7 @@ Available variables are listed below These overrides are included by ``tasks/var
 
 The rook jenkins version::
 
-    jenkins_master_image: jenkins/jenkins:2.289.1
+    jenkins_controller_image: jenkins/jenkins:2.289.1
 
 The rook jenkins ssh keyi-pair defined in the aws dashboard::
 
@@ -54,7 +54,7 @@ The rook jenkins ssh keyi-pair defined in the aws dashboard::
 
 The rook jenkins instance type::
 
-    master_instance_type: m4.large
+    controller_instance_type: m4.large
 
 The rook jenkins instance aws security group::
 
@@ -84,7 +84,7 @@ A list of the rook jenkins aws instance tags, used by the rook-recovery play whe
 
 The rook jenkins running aws instance name::
 
-    master_name: Prod-Jenkins
+    controller_name: Prod-Jenkins
 
 The rook jenkins instance ssh key::
 
@@ -96,7 +96,7 @@ Tags
 Available tags are listed below:
 
 - rook-jenkins-update
-    Update the rook jenkins app to the version defined in the "jenkins_master_image" variable.
+    Update the rook jenkins app to the version defined in the "jenkins_controller_image" variable.
 
 - rook-os-update
     Update the rook jenkins OS packages.

diff --git a/roles/rook/tasks/rook-jenkins-update.yml b/roles/rook/tasks/rook-jenkins-update.yml
index e95814d24c83d655ec55e76a931bcfab18fd893b..fb15a2c5cead33ec55d6d5591ada8749eebe3840 100644 (file)
--- a/roles/rook/tasks/rook-jenkins-update.yml
+++ b/roles/rook/tasks/rook-jenkins-update.yml
@@ -2,33 +2,33 @@
 - name: Gather facts
   ec2_instance_facts:
     filters:
-      "tag:Name": "{{ master_name }}"
+      "tag:Name": "{{ controller_name }}"
       instance-state-name: running
-  register: master_metadata
+  register: controller_metadata
 
 - name: Take a backup image of the Prod-jenkins instance
   ec2_ami:
     aws_access_key: "{{ aws_access_key }}"
     aws_secret_key: "{{ aws_secret_key }}"
-    instance_id: "{{ master_metadata.instances[0].instance_id }}"
+    instance_id: "{{ controller_metadata.instances[0].instance_id }}"
     no_reboot: yes
     wait: yes
     wait_timeout: 3000
-    name: "{{ master_name }}-{{ ansible_date_time.date }}"
+    name: "{{ controller_name }}-{{ ansible_date_time.date }}"
     tags:
-      Name: "{{ master_name }}-{{ ansible_date_time.date }}"
+      Name: "{{ controller_name }}-{{ ansible_date_time.date }}"
 
 - name: Check if container is running
-  command: ssh -i "{{ rook_key }}" ubuntu@"{{ master_metadata.instances[0].public_dns_name }}" docker ps -a | grep -i jenkins | wc -l
+  command: ssh -i "{{ rook_key }}" ubuntu@"{{ controller_metadata.instances[0].public_dns_name }}" docker ps -a | grep -i jenkins | wc -l
   register: container
 
 - name: Kill the jenkins container
-  command: ssh -i "{{ rook_key }}" ubuntu@"{{ master_metadata.instances[0].public_dns_name }}" sudo docker kill jenkins
+  command: ssh -i "{{ rook_key }}" ubuntu@"{{ controller_metadata.instances[0].public_dns_name }}" sudo docker kill jenkins
   when: container.stdout == '1'
 
 - name: Remove the jenkins container
-  command: ssh -i "{{ rook_key }}" ubuntu@"{{ master_metadata.instances[0].public_dns_name }}" sudo docker rm jenkins
+  command: ssh -i "{{ rook_key }}" ubuntu@"{{ controller_metadata.instances[0].public_dns_name }}" sudo docker rm jenkins
   when: container.stdout == '1'
 
 - name: Start the new jenkins container with the new LTS version
-  command: ssh -i "{{ rook_key }}" ubuntu@"{{ master_metadata.instances[0].public_dns_name }}" sudo docker run -d --name jenkins -p 8080:8080 -p 50000:50000 -v /mnt/jenkins/jenkins:/var/jenkins_home "{{ jenkins_master_image }}"
+  command: ssh -i "{{ rook_key }}" ubuntu@"{{ controller_metadata.instances[0].public_dns_name }}" sudo docker run -d --name jenkins -p 8080:8080 -p 50000:50000 -v /mnt/jenkins/jenkins:/var/jenkins_home "{{ jenkins_controller_image }}"

diff --git a/roles/rook/tasks/rook-os-update.yml b/roles/rook/tasks/rook-os-update.yml
index 22b2ffa42d51dcb7bd6e1a9252fd01123a00a95d..4ac0ceb8023aa20167f402eeda10f0eae6ec0ae8 100644 (file)
--- a/roles/rook/tasks/rook-os-update.yml
+++ b/roles/rook/tasks/rook-os-update.yml
@@ -2,53 +2,53 @@
 - name: Gather facts
   ec2_instance_facts:
     filters:
-      "tag:Name": "{{ master_name }}"
+      "tag:Name": "{{ controller_name }}"
       instance-state-name: running
-  register: master_metadata
+  register: controller_metadata
 
-- name: Take a image of the master
+- name: Take a image of the controller
   ec2_ami:
     aws_access_key: "{{ aws_access_key }}"
     aws_secret_key: "{{ aws_secret_key }}"
-    instance_id: "{{ master_metadata.instances[0].instance_id }}"
+    instance_id: "{{ controller_metadata.instances[0].instance_id }}"
     no_reboot: yes
     wait: yes
     wait_timeout: 3000
-    name: "{{ master_name }}-{{ ansible_date_time.date }}"
+    name: "{{ controller_name }}-{{ ansible_date_time.date }}"
     tags:
-      Name: "{{ master_name }}-{{ ansible_date_time.date }}"
+      Name: "{{ controller_name }}-{{ ansible_date_time.date }}"
 
 - name: Update apt cache
-  command: ssh -i "{{ rook_key }}" ubuntu@"{{ master_metadata.instances[0].public_dns_name }}" sudo apt-get update
+  command: ssh -i "{{ rook_key }}" ubuntu@"{{ controller_metadata.instances[0].public_dns_name }}" sudo apt-get update
 
 - name: Update packages
-  command: ssh -i "{{ rook_key }}" ubuntu@"{{ master_metadata.instances[0].public_dns_name }}" sudo apt-get upgrade -y
+  command: ssh -i "{{ rook_key }}" ubuntu@"{{ controller_metadata.instances[0].public_dns_name }}" sudo apt-get upgrade -y
 
 - name: Check if system requires reboot
-  command: ssh -i "{{ rook_key }}" ubuntu@"{{ master_metadata.instances[0].public_dns_name }}" [ -f /var/run/reboot-required ]; echo $?
+  command: ssh -i "{{ rook_key }}" ubuntu@"{{ controller_metadata.instances[0].public_dns_name }}" [ -f /var/run/reboot-required ]; echo $?
   register: reboot
 
 - name: Reboot if required
-  command: ssh -i "{{ rook_key }}" ubuntu@"{{ master_metadata.instances[0].public_dns_name }}" sudo reboot
+  command: ssh -i "{{ rook_key }}" ubuntu@"{{ controller_metadata.instances[0].public_dns_name }}" sudo reboot
   ignore_errors: yes
   when: reboot.stdout == '0'
 
 - name: Wait for SSH to come up
-  wait_for: host={{ master_metadata.instances[0].public_dns_name }} port=22 delay=60 timeout=320 state=started
+  wait_for: host={{ controller_metadata.instances[0].public_dns_name }} port=22 delay=60 timeout=320 state=started
   when: reboot.stdout == '0'
 
 - name: Check if old container exist
-  command: ssh -i "{{ rook_key }}" ubuntu@"{{ master_metadata.instances[0].public_dns_name }}" docker ps -a | grep -i jenkins | wc -l
+  command: ssh -i "{{ rook_key }}" ubuntu@"{{ controller_metadata.instances[0].public_dns_name }}" docker ps -a | grep -i jenkins | wc -l
   register: container
 
 - name: Remove jenkins old container if exist
-  command: ssh -i "{{ rook_key }}" ubuntu@"{{ master_metadata.instances[0].public_dns_name }}" sudo docker rm jenkins
+  command: ssh -i "{{ rook_key }}" ubuntu@"{{ controller_metadata.instances[0].public_dns_name }}" sudo docker rm jenkins
   when:
     - container.stdout == '1'
     - reboot.stdout == '0'
 
 - name: Start jenkins container
-  command: ssh -i "{{ rook_key }}" ubuntu@"{{ master_metadata.instances[0].public_dns_name }}" sudo docker run -d --name jenkins -p 8080:8080 -p 50000:50000 -v /mnt/jenkins/jenkins:/var/jenkins_home "{{ jenkins_master_image }}"
+  command: ssh -i "{{ rook_key }}" ubuntu@"{{ controller_metadata.instances[0].public_dns_name }}" sudo docker run -d --name jenkins -p 8080:8080 -p 50000:50000 -v /mnt/jenkins/jenkins:/var/jenkins_home "{{ jenkins_controller_image }}"
   when:
     - container.stdout == '1'
     - reboot.stdout == '0'

diff --git a/roles/rook/tasks/rook-recovery.yml b/roles/rook/tasks/rook-recovery.yml
index 8470639d1ba1737cf65b5503ae329852346711c3..8d1df5c9bf46adb7a85a8c77a09de9e6316d189f 100644 (file)
--- a/roles/rook/tasks/rook-recovery.yml
+++ b/roles/rook/tasks/rook-recovery.yml
@@ -5,7 +5,7 @@
     aws_secret_key: "{{ aws_secret_key }}"
     key_name: "{{ keypair }}"
     group: "{{ security_group }}"
-    instance_type: "{{ master_instance_type }}"
+    instance_type: "{{ controller_instance_type }}"
     image: "{{ image }}"
     wait: true
     region: "{{ region }}"
@@ -44,7 +44,7 @@
     label: "{{ item.id }} - {{ item.public_ip }}"
 
 - name: Start jenkins container
-  command: ssh -i "{{ rook_key }}" ubuntu@"{{ item.public_ip }}" sudo docker run -d --name jenkins -p 8080:8080 -p 50000:50000 -v /mnt/jenkins/jenkins:/var/jenkins_home "{{ jenkins_master_image }}"
+  command: ssh -i "{{ rook_key }}" ubuntu@"{{ item.public_ip }}" sudo docker run -d --name jenkins -p 8080:8080 -p 50000:50000 -v /mnt/jenkins/jenkins:/var/jenkins_home "{{ jenkins_controller_image }}"
   with_items: '{{ ec2_instances.instances }}'
   loop_control:
     label: "{{ item.id }} - {{ item.public_ip }}"

diff --git a/roles/rook/vars/main.yml b/roles/rook/vars/main.yml
index a0a3ea815fd5d00ee034d428b2316d5a35afacf4..0eee7f4844950b588383c1f1cab54f4ef58fd0d1 100644 (file)
--- a/roles/rook/vars/main.yml
+++ b/roles/rook/vars/main.yml
@@ -1,7 +1,7 @@
 ---
-jenkins_master_image: jenkins/jenkins:2.289.1
+jenkins_controller_image: jenkins/jenkins:2.289.1
 keypair: root-jenkins-new-key
-master_instance_type: m4.large
+controller_instance_type: m4.large
 security_group: rook-jenkins-group
 image: ami-0aaf5dbaa4cbe5771
 region: us-east-1
@@ -10,5 +10,5 @@ instance_name: Recovery-Rook-Jenkins
 aws_tags:
   Name: "{{ instance_name }}"
   Application: "Jenkins"
-master_name: Prod-Jenkins
+controller_name: Prod-Jenkins
 rook_key: "{{ secrets_path | mandatory }}/rook_key.yml"

diff --git a/roles/teuthology/README.rst b/roles/teuthology/README.rst
index 8d5145f0fe2f08f9864958829dc14962d1f604c2..2a94e83ce1fa1fd0732ad9f7cc25472646a2334e 100644 (file)
--- a/roles/teuthology/README.rst
+++ b/roles/teuthology/README.rst
@@ -11,7 +11,7 @@ It also does the following:
 - Install dependencies required for ``teuthology``
 - Create the ``teuthology`` and ``teuthworker`` users which are used for
   scheduling and executing tests, respectively
-- Clone ``teuthology`` repos into ``~/src/teuthology_master`` under those user accounts
+- Clone ``teuthology`` repos into ``~/src/teuthology_main`` under those user accounts
 - Run ``teuthology``'s ``bootstrap`` script
 - Manages user accounts and sudo privileges using the ``test_admins`` group_var in the secrets repo
 - Includes a script to keep the ``teuthology`` user's crontab up to date with remote version-controlled versions (``--tags="crontab")

diff --git a/roles/teuthology/defaults/main.yml b/roles/teuthology/defaults/main.yml
index 1204f5bca6157efc36138456c1a51c3e22fbd770..20605dc63f9adc6f2cab112f7e31aaff8609c23a 100644 (file)
--- a/roles/teuthology/defaults/main.yml
+++ b/roles/teuthology/defaults/main.yml
@@ -9,9 +9,9 @@ teuthology_users:
   - "{{ teuthology_execution_user }}"
 
 teuthology_repo: https://github.com/ceph/teuthology.git
-teuthology_branch: "master"
+teuthology_branch: "main"
 teuthology_yaml_extra: ""
 teuthology_ceph_git_base_url: "git://git.ceph.com/"
 archive_base: "/home/{{ teuthology_execution_user }}/archive"
 
-remote_crontab_url: "https://raw.githubusercontent.com/ceph/ceph/master/qa/crontab/teuthology-cronjobs"
+remote_crontab_url: "https://raw.githubusercontent.com/ceph/ceph/main/qa/crontab/teuthology-cronjobs"

diff --git a/roles/teuthology/tasks/setup_users.yml b/roles/teuthology/tasks/setup_users.yml
index 682f2a9ecc0bff10f57ad0d9349a2aaa5f648472..741ba0a94d39d8bd9d9ee989d59ebbf8c6394ffc 100644 (file)
--- a/roles/teuthology/tasks/setup_users.yml
+++ b/roles/teuthology/tasks/setup_users.yml
@@ -51,7 +51,7 @@
 - name: Clone the teuthology repo for GitHub PR
   git:
     repo: "https://github.com/ceph/teuthology"
-    dest: /home/{{ item }}/src/teuthology_master
+    dest: /home/{{ item }}/src/teuthology_main
     version: "{{ teuthology_branch }}"
     refspec: '+refs/pull/{{ teuthology_ghpr }}/*:refs/origin/pr/{{ teuthology_ghpr }}/*'
   become_user: "{{ item }}"
@@ -63,7 +63,7 @@
 - name: Clone the teuthology repo
   git:
     repo: "{{ teuthology_repo }}"
-    dest: /home/{{ item }}/src/teuthology_master
+    dest: /home/{{ item }}/src/teuthology_main
     version: "{{ teuthology_branch }}"
   become_user: "{{ item }}"
   with_items: "{{ teuthology_users }}"
@@ -74,7 +74,7 @@
 - name: Run bootstrap
   shell: NO_CLOBBER=true ./bootstrap
   args:
-    chdir: /home/{{ item }}/src/teuthology_master/
+    chdir: /home/{{ item }}/src/teuthology_main/
   become_user: "{{ item }}"
   with_items: "{{ teuthology_users }}"
   register: bootstrap
@@ -85,15 +85,15 @@
 - name: Add teuthology scripts to PATH
   lineinfile:
     dest: /home/{{ item }}/.profile
-    regexp: teuthology_master
-    line: 'PATH="$HOME/src/teuthology_master/virtualenv/bin:$PATH"'
+    regexp: teuthology_main
+    line: 'PATH="$HOME/src/teuthology_main/virtualenv/bin:$PATH"'
   become_user: "{{ item }}"
   with_items: "{{ teuthology_users }}"
 
 - name: Ensure teuthology is usable
   shell: "./teuthology --version"
   args:
-    chdir: /home/{{ item }}/src/teuthology_master/virtualenv/bin/
+    chdir: /home/{{ item }}/src/teuthology_main/virtualenv/bin/
   become_user: "{{ item }}"
   with_items: "{{ teuthology_users }}"
   changed_when: false

diff --git a/roles/teuthology/templates/teuthology-worker.init b/roles/teuthology/templates/teuthology-worker.init
index 63d9ec9045c11bb61ad211cdc1d0e5ec9761110e..a1c534d2478ca03d997e621838d88896c991e355 100644 (file)
--- a/roles/teuthology/templates/teuthology-worker.init
+++ b/roles/teuthology/templates/teuthology-worker.init
@@ -37,7 +37,7 @@ export NWORKERS=20
 
 user=${TEUTHOLOGY_USERNAME:-"{{ teuthology_execution_user }}"}
 export HOME=/home/$user
-export WORKER_HOME=$HOME/src/teuthology_master
+export WORKER_HOME=$HOME/src/teuthology_main
 #/usr/share/nginx/html
 export WORKER_ARCH=$HOME/archive
 

diff --git a/roles/users/defaults/main.yml b/roles/users/defaults/main.yml
index e7772c30058c3425b8df067132f4fdd000e1d6cd..92736090070862ef9dddd53fc4dbb240e5928d75 100644 (file)
--- a/roles/users/defaults/main.yml
+++ b/roles/users/defaults/main.yml
@@ -26,7 +26,7 @@ revoked_users: []
 # specified.
 keys_repo: "https://github.com/ceph/keys"
 # Branch of above repo to use
-keys_branch: master
+keys_branch: main
 # Where to clone keys_repo on the *local* disk
 keys_repo_path: "~/.cache/src/keys"