Update fs020/21 entries to refer to the 1ctlr_2comp job config (#66)

These jobs rea now called:
periodic-tripleo-ci-centos-7-ovb-1ctlr_2comp-featureset020-*
and
periodic-tripleo-ci-centos-7-ovb-1ctlr_2comp-featureset021-*

tripleoci/config.py

@@ -130,8 +130,8 @@
         'periodic-tripleo-ci-centos-7-multinode-1ctlr-featureset030-master',
         'periodic-tripleo-ci-centos-7-multinode-1ctlr-featureset037-updates-master',
         'periodic-tripleo-ci-centos-7-ovb-1ctlr_1comp-featureset002-master-upload',
-        'periodic-tripleo-ci-centos-7-ovb-1ctlr_1comp-featureset020-master',
-        'periodic-tripleo-ci-centos-7-ovb-1ctlr_1comp-featureset021-master',
+        'periodic-tripleo-ci-centos-7-ovb-1ctlr_2comp-featureset020-master',
+        'periodic-tripleo-ci-centos-7-ovb-1ctlr_2comp-featureset021-master',
         'periodic-tripleo-ci-centos-7-ovb-3ctlr_1comp-featureset001-master',
         'periodic-tripleo-ci-centos-7-ovb-3ctlr_1comp-featureset035-master',
         'periodic-tripleo-ci-centos-7-ovb-3ctlr_1comp_1supp-featureset039-master',
@@ -159,8 +159,8 @@
         'periodic-tripleo-ci-centos-7-multinode-1ctlr-featureset030-stein',
         'periodic-tripleo-ci-centos-7-multinode-1ctlr-featureset037-updates-stein',
         'periodic-tripleo-ci-centos-7-ovb-1ctlr_1comp-featureset002-stein-upload',
-        'periodic-tripleo-ci-centos-7-ovb-1ctlr_1comp-featureset020-stein',
-        'periodic-tripleo-ci-centos-7-ovb-1ctlr_1comp-featureset021-stein',
+        'periodic-tripleo-ci-centos-7-ovb-1ctlr_2comp-featureset020-stein',
+        'periodic-tripleo-ci-centos-7-ovb-1ctlr_2comp-featureset021-stein',
         'periodic-tripleo-ci-centos-7-ovb-3ctlr_1comp-featureset001-stein',
         'periodic-tripleo-ci-centos-7-ovb-3ctlr_1comp-featureset035-stein',
         'periodic-tripleo-ci-centos-7-ovb-3ctlr_1comp_1supp-featureset039-stein',
@@ -188,8 +188,8 @@
         'periodic-tripleo-ci-centos-7-multinode-1ctlr-featureset030-rocky',
         'periodic-tripleo-ci-centos-7-multinode-1ctlr-featureset037-updates-rocky',
         'periodic-tripleo-ci-centos-7-ovb-1ctlr_1comp-featureset002-rocky-upload',
-        'periodic-tripleo-ci-centos-7-ovb-1ctlr_1comp-featureset020-rocky',
-        'periodic-tripleo-ci-centos-7-ovb-1ctlr_1comp-featureset021-rocky',
+        'periodic-tripleo-ci-centos-7-ovb-1ctlr_2comp-featureset020-rocky',
+        'periodic-tripleo-ci-centos-7-ovb-1ctlr_2comp-featureset021-rocky',
         'periodic-tripleo-ci-centos-7-ovb-3ctlr_1comp-featureset001-rocky',
         'periodic-tripleo-ci-centos-7-ovb-3ctlr_1comp-featureset035-rocky',
         'periodic-tripleo-ci-centos-7-ovb-3ctlr_1comp_1supp-featureset039-rocky',
@@ -208,8 +208,8 @@
         'periodic-tripleo-ci-centos-7-multinode-1ctlr-featureset030-queens',
         'periodic-tripleo-ci-centos-7-multinode-1ctlr-featureset037-updates-queens',
         'periodic-tripleo-ci-centos-7-ovb-1ctlr_1comp-featureset002-queens-upload',
-        'periodic-tripleo-ci-centos-7-ovb-1ctlr_1comp-featureset020-queens',
-        'periodic-tripleo-ci-centos-7-ovb-1ctlr_1comp-featureset021-queens',
+        'periodic-tripleo-ci-centos-7-ovb-1ctlr_2comp-featureset020-queens',
+        'periodic-tripleo-ci-centos-7-ovb-1ctlr_2comp-featureset021-queens',
         'periodic-tripleo-ci-centos-7-ovb-3ctlr_1comp-featureset001-queens',
         'periodic-tripleo-ci-centos-7-ovb-3ctlr_1comp-featureset035-queens',
         'periodic-tripleo-ci-centos-7-ovb-3ctlr_1comp_1supp-featureset039-queens',
@@ -224,8 +224,8 @@
         'periodic-tripleo-ci-centos-7-multinode-1ctlr-featureset019-pike',
         'periodic-tripleo-ci-centos-7-ovb-1ctlr_1comp_1ceph-featureset024-pike',
         'periodic-tripleo-ci-centos-7-ovb-1ctlr_1comp-featureset002-pike-upload',
-        'periodic-tripleo-ci-centos-7-ovb-1ctlr_1comp-featureset020-pike',
-        'periodic-tripleo-ci-centos-7-ovb-1ctlr_1comp-featureset021-pike',
+        'periodic-tripleo-ci-centos-7-ovb-1ctlr_2comp-featureset020-pike',
+        'periodic-tripleo-ci-centos-7-ovb-1ctlr_2comp-featureset021-pike',
         'periodic-tripleo-ci-centos-7-ovb-1ctlr_1comp-featureset022-pike',
         'periodic-tripleo-ci-centos-7-ovb-3ctlr_1comp-featureset001-pike',
     ],