Replace non-branch occurrences of 'master'

Signed-off-by: Zack Cerza <zack@cerza.org>

diff --git a/docs/COMPONENTS.rst b/docs/COMPONENTS.rst
index 4356f912b4f9614f163862301f93731071802913..7c3dd03b6b56456bfda78781870c482b0b455fae 100644 (file)
--- a/docs/COMPONENTS.rst
+++ b/docs/COMPONENTS.rst
@@ -4,8 +4,8 @@ Ceph Lab Components
 
 The distinct hardware/software components that a lab is composed of and the way
 they interact between them is described here. In general, a lab is composed of
-a scheduler (a.k.a. master node), worker(s), package builder
-(`gitbuilder <http://ceph.com/gitbuilder.cgi>`__), job database (`paddles
+a scheduler, worker(s), package builder (`gitbuilder
+<http://ceph.com/gitbuilder.cgi>`__), job database (`paddles
 <https://github.com/ceph/paddles>`__), job archive, a web UI (`pulpito
 <https://github.com/ceph/pulpito>`__) and test nodes.
 
@@ -31,8 +31,7 @@ failed, etc.). All this information can be visualized in ``pulpito``, the web
 UI. For an example, see Ceph community's Lab `here <http://pulpito.ceph.com>`__.
 
 Test nodes can be grouped in classes (referred to as ``machine-type``),
-allowing teuthology schedule jobs across multiple hardware setups,
-provided they're visible to the master node.
+allowing teuthology schedule jobs across multiple hardware setups.
 
 Life of a Teuthology Job
 ========================
@@ -44,8 +43,8 @@ prepared and queued (``teuthology-schedule`` is implicitly invoked). When a job
 is created (or whenever the status of a job is changed, e.g. from queued to
 started), information about the job is recorded in ``paddles``'s internal
 database. Depending on the priority of the job, the scheduler eventually
-determines when a job can get executed. At this point, the master communicates
-with ``teuthology-dispatcher``, checks the lock status of the requested
+determines when a job can get executed. At this point,
+``teuthology-dispatcher`` checks the lock status of the requested
 machines by querying ``paddles``, acquires locks of the
 nodes if they are available, and invokes ``teuthology-dispatcher`` in
 ``supervisor`` mode. ``supervisor`` reimages the target machines and invokes

diff --git a/docs/conf.py b/docs/conf.py
index 09ae1e69265d45d85befac8947f4eb3fcb051588..bce967b1eea23280169ab18750983a67839f1b6e 100644 (file)
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -43,8 +43,8 @@ source_suffix = '.rst'
 # The encoding of source files.
 #source_encoding = 'utf-8-sig'
 
-# The master toctree document.
-master_doc = 'index'
+# The root toctree document.
+root_doc = 'index'
 
 # General information about the project.
 project = u'teuthology'

diff --git a/roles/overrides.yaml b/roles/overrides.yaml
index f6188573eccb22a101225046d95c7ba7e7f95dee..e93a2b23966fb105979677e1609b2b2b659ee070 100644 (file)
--- a/roles/overrides.yaml
+++ b/roles/overrides.yaml
@@ -4,8 +4,6 @@ kernel:
 overrides:
   ceph:
     branch: BRANCH_NAME
-    log-whitelist:
-    - 'clocks not synchronized'
     log-ignorelist:
     - 'clocks not synchronized'
 tasks:

diff --git a/teuthology/suite/placeholder.py b/teuthology/suite/placeholder.py
index 30f9283e5a2004beef6e2f867ec28ce3add4df73..37f538e6fad0d0927bec925602d3b0cde69c5741 100644 (file)
--- a/teuthology/suite/placeholder.py
+++ b/teuthology/suite/placeholder.py
@@ -73,8 +73,6 @@ dict_templ = {
                 }
             },
             'flavor': Placeholder('flavor'),
-            'log-whitelist': ['\(MDS_ALL_DOWN\)',
-                              '\(MDS_UP_LESS_THAN_MAX\)'],
             'log-ignorelist': ['\(MDS_ALL_DOWN\)',
                               '\(MDS_UP_LESS_THAN_MAX\)'],
             'sha1': Placeholder('ceph_hash'),

diff --git a/teuthology/suite/test/test_build_matrix.py b/teuthology/suite/test/test_build_matrix.py
index 1d72771c8ff9f0035cfed0422b082bffd6203361..d7d2c051be36149ec9e5a4f6e9ce2d40077d6aba 100644 (file)
--- a/teuthology/suite/test/test_build_matrix.py
+++ b/teuthology/suite/test/test_build_matrix.py
@@ -649,7 +649,7 @@ class TestBuildMatrix(object):
                 'debug': {'mds_client.yaml': None},
                 'fs': {'btrfs.yaml': None},
                 'msgr-failures': {'none.yaml': None},
-                'overrides': {'whitelist_wrongly_marked_down.yaml': None},
+                'overrides': {'allowlist_wrongly_marked_down.yaml': None},
                 'tasks': {'cfuse_workunit_suites_fsstress.yaml': None},
             },
         }

diff --git a/teuthology/task/selinux.py b/teuthology/task/selinux.py
index 582cb3390a8b41410fd67a186779935abf4a2ec9..de4314822ddf5cab4ad3b0c763cc21799f8d3a7b 100644 (file)
--- a/teuthology/task/selinux.py
+++ b/teuthology/task/selinux.py
@@ -24,7 +24,7 @@ class SELinux(Task):
     fail for other denials one can add the overrides with appropriate escapes
     overrides:
        selinux:
-         whitelist:
+         allowlist:
          - 'name="cephtest"'
          - 'dmidecode'
          - 'comm="logrotate"'
@@ -138,9 +138,9 @@ class SELinux(Task):
             'comm="sss_cache"',
             'context=system_u:system_r:NetworkManager_dispatcher_t:s0',
         ]
-        se_whitelist = self.config.get('whitelist', [])
-        if se_whitelist:
-            known_denials.extend(se_whitelist)
+        se_allowlist = self.config.get('allowlist', [])
+        if se_allowlist:
+            known_denials.extend(se_allowlist)
         ignore_known_denials = '\'\(' + str.join('\|', known_denials) + '\)\''
         for remote in self.cluster.remotes.keys():
             proc = remote.run(