Adding upstream version 14.2.21.upstream/14.2.21upstream

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

51 files changed, 273 insertions, 0 deletions

diff --git a/qa/suites/upgrade-clients/client-upgrade-nautilus-octopus/nautilus-client-x/.qa b/qa/suites/upgrade-clients/client-upgrade-nautilus-octopus/nautilus-client-x/.qa
new file mode 120000
index 00000000..a602a035
--- /dev/null
+++ b/qa/suites/upgrade-clients/client-upgrade-nautilus-octopus/nautilus-client-x/.qa
@@ -0,0 +1 @@
+../.qa/
\ No newline at end of file
diff --git a/qa/suites/upgrade-clients/client-upgrade-nautilus-octopus/nautilus-client-x/rbd/% b/qa/suites/upgrade-clients/client-upgrade-nautilus-octopus/nautilus-client-x/rbd/%
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/qa/suites/upgrade-clients/client-upgrade-nautilus-octopus/nautilus-client-x/rbd/%
diff --git a/qa/suites/upgrade-clients/client-upgrade-nautilus-octopus/nautilus-client-x/rbd/.qa b/qa/suites/upgrade-clients/client-upgrade-nautilus-octopus/nautilus-client-x/rbd/.qa
new file mode 120000
index 00000000..a602a035
--- /dev/null
+++ b/qa/suites/upgrade-clients/client-upgrade-nautilus-octopus/nautilus-client-x/rbd/.qa
@@ -0,0 +1 @@
+../.qa/
\ No newline at end of file
diff --git a/qa/suites/upgrade-clients/client-upgrade-nautilus-octopus/nautilus-client-x/rbd/0-cluster/+ b/qa/suites/upgrade-clients/client-upgrade-nautilus-octopus/nautilus-client-x/rbd/0-cluster/+
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/qa/suites/upgrade-clients/client-upgrade-nautilus-octopus/nautilus-client-x/rbd/0-cluster/+
diff --git a/qa/suites/upgrade-clients/client-upgrade-nautilus-octopus/nautilus-client-x/rbd/0-cluster/.qa b/qa/suites/upgrade-clients/client-upgrade-nautilus-octopus/nautilus-client-x/rbd/0-cluster/.qa
new file mode 120000
index 00000000..a602a035
--- /dev/null
+++ b/qa/suites/upgrade-clients/client-upgrade-nautilus-octopus/nautilus-client-x/rbd/0-cluster/.qa
@@ -0,0 +1 @@
+../.qa/
\ No newline at end of file
diff --git a/qa/suites/upgrade-clients/client-upgrade-nautilus-octopus/nautilus-client-x/rbd/0-cluster/openstack.yaml b/qa/suites/upgrade-clients/client-upgrade-nautilus-octopus/nautilus-client-x/rbd/0-cluster/openstack.yaml
new file mode 100644
index 00000000..b0f3b9b4
--- /dev/null
+++ b/qa/suites/upgrade-clients/client-upgrade-nautilus-octopus/nautilus-client-x/rbd/0-cluster/openstack.yaml
@@ -0,0 +1,4 @@
+openstack:
+  - volumes: # attached to each instance
+      count: 4
+      size: 30 # GB
diff --git a/qa/suites/upgrade-clients/client-upgrade-nautilus-octopus/nautilus-client-x/rbd/0-cluster/start.yaml b/qa/suites/upgrade-clients/client-upgrade-nautilus-octopus/nautilus-client-x/rbd/0-cluster/start.yaml
new file mode 100644
index 00000000..93f3c471
--- /dev/null
+++ b/qa/suites/upgrade-clients/client-upgrade-nautilus-octopus/nautilus-client-x/rbd/0-cluster/start.yaml
@@ -0,0 +1,21 @@
+meta:
+- desc: |
+   Insatll and run ceph on one node,
+   with a separate client 1.
+   Upgrade client 1 to nautilus
+   Run tests against old cluster
+roles:
+- - mon.a
+  - mon.b
+  - mon.c
+  - osd.0
+  - osd.1
+  - osd.2
+  - client.0
+  - mgr.x
+- - client.1
+overrides:
+  ceph:
+    log-whitelist:
+    - failed to encode map
+    fs: xfs
diff --git a/qa/suites/upgrade-clients/client-upgrade-nautilus-octopus/nautilus-client-x/rbd/1-install/.qa b/qa/suites/upgrade-clients/client-upgrade-nautilus-octopus/nautilus-client-x/rbd/1-install/.qa
new file mode 120000
index 00000000..a602a035
--- /dev/null
+++ b/qa/suites/upgrade-clients/client-upgrade-nautilus-octopus/nautilus-client-x/rbd/1-install/.qa
@@ -0,0 +1 @@
+../.qa/
\ No newline at end of file
diff --git a/qa/suites/upgrade-clients/client-upgrade-nautilus-octopus/nautilus-client-x/rbd/1-install/nautilus-client-x.yaml b/qa/suites/upgrade-clients/client-upgrade-nautilus-octopus/nautilus-client-x/rbd/1-install/nautilus-client-x.yaml
new file mode 100644
index 00000000..36d6c19b
--- /dev/null
+++ b/qa/suites/upgrade-clients/client-upgrade-nautilus-octopus/nautilus-client-x/rbd/1-install/nautilus-client-x.yaml
@@ -0,0 +1,11 @@
+tasks:
+- install:
+    branch: nautilus
+    exclude_packages: ['ceph-mgr','libcephfs2','libcephfs-devel','libcephfs-dev','python34-cephfs','python34-rados']
+- print: "**** done install nautilus"
+- install.upgrade:
+   exclude_packages: ['ceph-test', 'ceph-test-dbg','libcephfs1', 'python-ceph']
+   client.1:
+- print: "**** done install.upgrade to -x on client.0"
+- ceph:
+- print: "**** done ceph task"
diff --git a/qa/suites/upgrade-clients/client-upgrade-nautilus-octopus/nautilus-client-x/rbd/2-features/.qa b/qa/suites/upgrade-clients/client-upgrade-nautilus-octopus/nautilus-client-x/rbd/2-features/.qa
new file mode 120000
index 00000000..a602a035
--- /dev/null
+++ b/qa/suites/upgrade-clients/client-upgrade-nautilus-octopus/nautilus-client-x/rbd/2-features/.qa
@@ -0,0 +1 @@
+../.qa/
\ No newline at end of file
diff --git a/qa/suites/upgrade-clients/client-upgrade-nautilus-octopus/nautilus-client-x/rbd/2-features/defaults.yaml b/qa/suites/upgrade-clients/client-upgrade-nautilus-octopus/nautilus-client-x/rbd/2-features/defaults.yaml
new file mode 100644
index 00000000..dff6623a
--- /dev/null
+++ b/qa/suites/upgrade-clients/client-upgrade-nautilus-octopus/nautilus-client-x/rbd/2-features/defaults.yaml
@@ -0,0 +1,6 @@
+overrides:
+  ceph:
+    conf:
+      client:
+        rbd default features: 61
+
diff --git a/qa/suites/upgrade-clients/client-upgrade-nautilus-octopus/nautilus-client-x/rbd/2-features/layering.yaml b/qa/suites/upgrade-clients/client-upgrade-nautilus-octopus/nautilus-client-x/rbd/2-features/layering.yaml
new file mode 100644
index 00000000..5613d015
--- /dev/null
+++ b/qa/suites/upgrade-clients/client-upgrade-nautilus-octopus/nautilus-client-x/rbd/2-features/layering.yaml
@@ -0,0 +1,6 @@
+overrides:
+  ceph:
+    conf:
+      client:
+        rbd default features: 1
+
diff --git a/qa/suites/upgrade-clients/client-upgrade-nautilus-octopus/nautilus-client-x/rbd/3-workload/.qa b/qa/suites/upgrade-clients/client-upgrade-nautilus-octopus/nautilus-client-x/rbd/3-workload/.qa
new file mode 120000
index 00000000..a602a035
--- /dev/null
+++ b/qa/suites/upgrade-clients/client-upgrade-nautilus-octopus/nautilus-client-x/rbd/3-workload/.qa
@@ -0,0 +1 @@
+../.qa/
\ No newline at end of file
diff --git a/qa/suites/upgrade-clients/client-upgrade-nautilus-octopus/nautilus-client-x/rbd/3-workload/rbd_notification_tests.yaml b/qa/suites/upgrade-clients/client-upgrade-nautilus-octopus/nautilus-client-x/rbd/3-workload/rbd_notification_tests.yaml
new file mode 100644
index 00000000..68b4f51d
--- /dev/null
+++ b/qa/suites/upgrade-clients/client-upgrade-nautilus-octopus/nautilus-client-x/rbd/3-workload/rbd_notification_tests.yaml
@@ -0,0 +1,33 @@
+tasks:
+- parallel:
+  - workunit:
+      branch: nautilus
+      clients:
+        client.0:
+          - rbd/notify_master.sh
+      env:
+        RBD_FEATURES: "61"
+  - workunit:
+      branch: octopus
+      clients:
+        client.1:
+          - rbd/notify_slave.sh
+      env:
+        RBD_FEATURES: "61"
+- print: "**** done rbd: old librbd -> new librbd"
+- parallel:
+  - workunit:
+      branch: nautilus
+      clients:
+        client.0:
+          - rbd/notify_slave.sh
+      env:
+        RBD_FEATURES: "61"
+  - workunit:
+      branch: octopus
+      clients:
+        client.1:
+          - rbd/notify_master.sh
+      env:
+        RBD_FEATURES: "61"
+- print: "**** done rbd: new librbd -> old librbd"
diff --git a/qa/suites/upgrade-clients/client-upgrade-nautilus-octopus/nautilus-client-x/rbd/supported/.qa b/qa/suites/upgrade-clients/client-upgrade-nautilus-octopus/nautilus-client-x/rbd/supported/.qa
new file mode 120000
index 00000000..a602a035
--- /dev/null
+++ b/qa/suites/upgrade-clients/client-upgrade-nautilus-octopus/nautilus-client-x/rbd/supported/.qa
@@ -0,0 +1 @@
+../.qa/
\ No newline at end of file
diff --git a/qa/suites/upgrade-clients/client-upgrade-nautilus-octopus/nautilus-client-x/rbd/supported/ubuntu_18.04.yaml b/qa/suites/upgrade-clients/client-upgrade-nautilus-octopus/nautilus-client-x/rbd/supported/ubuntu_18.04.yaml
new file mode 120000
index 00000000..886e87fa
--- /dev/null
+++ b/qa/suites/upgrade-clients/client-upgrade-nautilus-octopus/nautilus-client-x/rbd/supported/ubuntu_18.04.yaml
@@ -0,0 +1 @@
+../../../../../../distros/all/ubuntu_18.04.yaml
\ No newline at end of file
diff --git a/qa/suites/upgrade-clients/client-upgrade-nautilus/.qa b/qa/suites/upgrade-clients/client-upgrade-nautilus/.qa
new file mode 120000
index 00000000..a23f7e04
--- /dev/null
+++ b/qa/suites/upgrade-clients/client-upgrade-nautilus/.qa
@@ -0,0 +1 @@
+../../.qa
\ No newline at end of file
diff --git a/qa/suites/upgrade-clients/client-upgrade-nautilus/nautilus-client-x/.qa b/qa/suites/upgrade-clients/client-upgrade-nautilus/nautilus-client-x/.qa
new file mode 120000
index 00000000..a602a035
--- /dev/null
+++ b/qa/suites/upgrade-clients/client-upgrade-nautilus/nautilus-client-x/.qa
@@ -0,0 +1 @@
+../.qa/
\ No newline at end of file
diff --git a/qa/suites/upgrade-clients/client-upgrade-nautilus/nautilus-client-x/basic/% b/qa/suites/upgrade-clients/client-upgrade-nautilus/nautilus-client-x/basic/%
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/qa/suites/upgrade-clients/client-upgrade-nautilus/nautilus-client-x/basic/%
diff --git a/qa/suites/upgrade-clients/client-upgrade-nautilus/nautilus-client-x/basic/.qa b/qa/suites/upgrade-clients/client-upgrade-nautilus/nautilus-client-x/basic/.qa
new file mode 120000
index 00000000..a602a035
--- /dev/null
+++ b/qa/suites/upgrade-clients/client-upgrade-nautilus/nautilus-client-x/basic/.qa
@@ -0,0 +1 @@
+../.qa/
\ No newline at end of file
diff --git a/qa/suites/upgrade-clients/client-upgrade-nautilus/nautilus-client-x/basic/0-cluster/+ b/qa/suites/upgrade-clients/client-upgrade-nautilus/nautilus-client-x/basic/0-cluster/+
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/qa/suites/upgrade-clients/client-upgrade-nautilus/nautilus-client-x/basic/0-cluster/+
diff --git a/qa/suites/upgrade-clients/client-upgrade-nautilus/nautilus-client-x/basic/0-cluster/.qa b/qa/suites/upgrade-clients/client-upgrade-nautilus/nautilus-client-x/basic/0-cluster/.qa
new file mode 120000
index 00000000..a602a035
--- /dev/null
+++ b/qa/suites/upgrade-clients/client-upgrade-nautilus/nautilus-client-x/basic/0-cluster/.qa
@@ -0,0 +1 @@
+../.qa/
\ No newline at end of file
diff --git a/qa/suites/upgrade-clients/client-upgrade-nautilus/nautilus-client-x/basic/0-cluster/openstack.yaml b/qa/suites/upgrade-clients/client-upgrade-nautilus/nautilus-client-x/basic/0-cluster/openstack.yaml
new file mode 100644
index 00000000..b0f3b9b4
--- /dev/null
+++ b/qa/suites/upgrade-clients/client-upgrade-nautilus/nautilus-client-x/basic/0-cluster/openstack.yaml
@@ -0,0 +1,4 @@
+openstack:
+  - volumes: # attached to each instance
+      count: 4
+      size: 30 # GB
diff --git a/qa/suites/upgrade-clients/client-upgrade-nautilus/nautilus-client-x/basic/0-cluster/start.yaml b/qa/suites/upgrade-clients/client-upgrade-nautilus/nautilus-client-x/basic/0-cluster/start.yaml
new file mode 100644
index 00000000..7774a2be
--- /dev/null
+++ b/qa/suites/upgrade-clients/client-upgrade-nautilus/nautilus-client-x/basic/0-cluster/start.yaml
@@ -0,0 +1,23 @@
+meta:
+- desc: |
+   Insatll and run ceph on one node,
+   with a separate client 0.
+   Upgrade client 0 to nautilus
+   Run tests against old cluster
+roles:
+- - mon.a
+  - mon.b
+  - mon.c
+  - osd.0
+  - osd.1
+  - osd.2
+  - mgr.x
+- - client.0
+overrides:
+  ceph:
+    log-whitelist:
+    - failed to encode map
+    - CACHE_POOL_NO_HIT_SET
+    - POOL_APP_NOT_ENABLED
+    - application not enabled
+    fs: xfs
diff --git a/qa/suites/upgrade-clients/client-upgrade-nautilus/nautilus-client-x/basic/1-install/.qa b/qa/suites/upgrade-clients/client-upgrade-nautilus/nautilus-client-x/basic/1-install/.qa
new file mode 120000
index 00000000..a602a035
--- /dev/null
+++ b/qa/suites/upgrade-clients/client-upgrade-nautilus/nautilus-client-x/basic/1-install/.qa
@@ -0,0 +1 @@
+../.qa/
\ No newline at end of file
diff --git a/qa/suites/upgrade-clients/client-upgrade-nautilus/nautilus-client-x/basic/1-install/nautilus-client-x.yaml b/qa/suites/upgrade-clients/client-upgrade-nautilus/nautilus-client-x/basic/1-install/nautilus-client-x.yaml
new file mode 100644
index 00000000..27a33e45
--- /dev/null
+++ b/qa/suites/upgrade-clients/client-upgrade-nautilus/nautilus-client-x/basic/1-install/nautilus-client-x.yaml
@@ -0,0 +1,11 @@
+tasks:
+- install:
+    branch: nautilus 
+    exclude_packages: ['ceph-mgr','libcephfs2','libcephfs-devel','libcephfs-dev','python34-cephfs','python34-rados']
+- print: "**** done install nautilus"
+upgrade_workload:
+  sequential:
+  - install.upgrade:
+      exclude_packages: ['ceph-test', 'ceph-test-dbg','libcephfs1']
+      client.0:
+  - print: "**** done install.upgrade to -x on client.0"
diff --git a/qa/suites/upgrade-clients/client-upgrade-nautilus/nautilus-client-x/basic/2-workload/.qa b/qa/suites/upgrade-clients/client-upgrade-nautilus/nautilus-client-x/basic/2-workload/.qa
new file mode 120000
index 00000000..a602a035
--- /dev/null
+++ b/qa/suites/upgrade-clients/client-upgrade-nautilus/nautilus-client-x/basic/2-workload/.qa
@@ -0,0 +1 @@
+../.qa/
\ No newline at end of file
diff --git a/qa/suites/upgrade-clients/client-upgrade-nautilus/nautilus-client-x/basic/2-workload/devstack-tempest-gate.yaml b/qa/suites/upgrade-clients/client-upgrade-nautilus/nautilus-client-x/basic/2-workload/devstack-tempest-gate.yaml
new file mode 100644
index 00000000..cb9ce29c
--- /dev/null
+++ b/qa/suites/upgrade-clients/client-upgrade-nautilus/nautilus-client-x/basic/2-workload/devstack-tempest-gate.yaml
@@ -0,0 +1,56 @@
+tasks:
+- sequential:
+  - upgrade_workload
+- ceph: 
+- print: "**** done ceph"
+- qemu:
+    client.0:
+      type: filesystem
+      cpus: 4
+      memory: 12288
+      disks:
+      - image_size: 30720
+      - image_size: 30720
+      test: qa/workunits/rbd/run_devstack_tempest.sh
+      image_url: https://cloud-images.ubuntu.com/releases/16.04/release/ubuntu-16.04-server-cloudimg-amd64-disk1.img
+      cloud_config_archive:
+      - type: text/cloud-config
+        content: |
+          users:
+          - name: stack
+            lock_passwd: False
+            shell: /bin/bash
+            sudo: ["ALL=(root) NOPASSWD:ALL\nDefaults:stack,tempest !requiretty"]
+          - name: tempest
+            lock_passwd: False
+            shell: /bin/bash
+            sudo:
+            - "ALL=(root) NOPASSWD:/sbin/ip"
+            - "ALL=(root) NOPASSWD:/sbin/iptables"
+            - "ALL=(root) NOPASSWD:/usr/bin/ovsdb-client"
+      - |
+        #!/bin/bash -ex
+        wget -q -O- "http://git.ceph.com/?p=ceph.git;a=blob_plain;f=keys/autobuild.asc" | apt-key add -
+        wget -q -O /etc/apt/sources.list.d/ceph.list "https://shaman.ceph.com/api/repos/ceph/{ceph_branch}/{ceph_sha1}/ubuntu/xenial/repo"
+        apt-get update
+
+        mount --bind /mnt/test_b /opt
+        mkdir /opt/stack
+        chown -R stack:stack /home/stack
+        chown -R stack:stack /opt/stack
+
+        mkdir /mnt/log/stack
+        chmod a+rwx /mnt/log/stack
+        chown -R stack:stack /mnt/log/stack
+
+        apt-get install -y ceph-common librbd1
+
+        mkdir /mnt/log/stack/ceph
+        chown -R stack:stack /mnt/log/stack/ceph
+        chmod a+rwx /mnt/log/stack/ceph
+
+        # sanity check that the cluster is reachable from the VM
+        echo '[client]' >> /etc/ceph/ceph.conf
+        echo 'log file = /mnt/log/stack/ceph/$name.$pid.log' >> /etc/ceph/ceph.conf
+        rbd --debug-ms=10 --debug-rbd=20 info client.0.1
+- print: "**** done qemu task!"
diff --git a/qa/suites/upgrade-clients/client-upgrade-nautilus/nautilus-client-x/basic/supported/.qa b/qa/suites/upgrade-clients/client-upgrade-nautilus/nautilus-client-x/basic/supported/.qa
new file mode 120000
index 00000000..a602a035
--- /dev/null
+++ b/qa/suites/upgrade-clients/client-upgrade-nautilus/nautilus-client-x/basic/supported/.qa
@@ -0,0 +1 @@
+../.qa/
\ No newline at end of file
diff --git a/qa/suites/upgrade-clients/client-upgrade-nautilus/nautilus-client-x/basic/supported/centos_7.6.yaml b/qa/suites/upgrade-clients/client-upgrade-nautilus/nautilus-client-x/basic/supported/centos_7.6.yaml
new file mode 120000
index 00000000..c336cfc6
--- /dev/null
+++ b/qa/suites/upgrade-clients/client-upgrade-nautilus/nautilus-client-x/basic/supported/centos_7.6.yaml
@@ -0,0 +1 @@
+../../../../../../distros/all/centos_7.6.yaml
\ No newline at end of file
diff --git a/qa/suites/upgrade-clients/client-upgrade-nautilus/nautilus-client-x/basic/supported/rhel_7.6.yaml b/qa/suites/upgrade-clients/client-upgrade-nautilus/nautilus-client-x/basic/supported/rhel_7.6.yaml
new file mode 120000
index 00000000..4fd43cc0
--- /dev/null
+++ b/qa/suites/upgrade-clients/client-upgrade-nautilus/nautilus-client-x/basic/supported/rhel_7.6.yaml
@@ -0,0 +1 @@
+../../../../../../distros/all/rhel_7.6.yaml
\ No newline at end of file
diff --git a/qa/suites/upgrade-clients/client-upgrade-nautilus/nautilus-client-x/basic/supported/ubuntu_16.04.yaml b/qa/suites/upgrade-clients/client-upgrade-nautilus/nautilus-client-x/basic/supported/ubuntu_16.04.yaml
new file mode 120000
index 00000000..9dc1ea99
--- /dev/null
+++ b/qa/suites/upgrade-clients/client-upgrade-nautilus/nautilus-client-x/basic/supported/ubuntu_16.04.yaml
@@ -0,0 +1 @@
+../../../../../../distros/all/ubuntu_16.04.yaml
\ No newline at end of file
diff --git a/qa/suites/upgrade-clients/client-upgrade-nautilus/nautilus-client-x/basic/supported/ubuntu_18.04.yaml b/qa/suites/upgrade-clients/client-upgrade-nautilus/nautilus-client-x/basic/supported/ubuntu_18.04.yaml
new file mode 120000
index 00000000..886e87fa
--- /dev/null
+++ b/qa/suites/upgrade-clients/client-upgrade-nautilus/nautilus-client-x/basic/supported/ubuntu_18.04.yaml
@@ -0,0 +1 @@
+../../../../../../distros/all/ubuntu_18.04.yaml
\ No newline at end of file
diff --git a/qa/suites/upgrade-clients/client-upgrade-nautilus/nautilus-client-x/rbd/% b/qa/suites/upgrade-clients/client-upgrade-nautilus/nautilus-client-x/rbd/%
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/qa/suites/upgrade-clients/client-upgrade-nautilus/nautilus-client-x/rbd/%
diff --git a/qa/suites/upgrade-clients/client-upgrade-nautilus/nautilus-client-x/rbd/.qa b/qa/suites/upgrade-clients/client-upgrade-nautilus/nautilus-client-x/rbd/.qa
new file mode 120000
index 00000000..a602a035
--- /dev/null
+++ b/qa/suites/upgrade-clients/client-upgrade-nautilus/nautilus-client-x/rbd/.qa
@@ -0,0 +1 @@
+../.qa/
\ No newline at end of file
diff --git a/qa/suites/upgrade-clients/client-upgrade-nautilus/nautilus-client-x/rbd/0-cluster/+ b/qa/suites/upgrade-clients/client-upgrade-nautilus/nautilus-client-x/rbd/0-cluster/+
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/qa/suites/upgrade-clients/client-upgrade-nautilus/nautilus-client-x/rbd/0-cluster/+
diff --git a/qa/suites/upgrade-clients/client-upgrade-nautilus/nautilus-client-x/rbd/0-cluster/.qa b/qa/suites/upgrade-clients/client-upgrade-nautilus/nautilus-client-x/rbd/0-cluster/.qa
new file mode 120000
index 00000000..a602a035
--- /dev/null
+++ b/qa/suites/upgrade-clients/client-upgrade-nautilus/nautilus-client-x/rbd/0-cluster/.qa
@@ -0,0 +1 @@
+../.qa/
\ No newline at end of file
diff --git a/qa/suites/upgrade-clients/client-upgrade-nautilus/nautilus-client-x/rbd/0-cluster/openstack.yaml b/qa/suites/upgrade-clients/client-upgrade-nautilus/nautilus-client-x/rbd/0-cluster/openstack.yaml
new file mode 100644
index 00000000..b0f3b9b4
--- /dev/null
+++ b/qa/suites/upgrade-clients/client-upgrade-nautilus/nautilus-client-x/rbd/0-cluster/openstack.yaml
@@ -0,0 +1,4 @@
+openstack:
+  - volumes: # attached to each instance
+      count: 4
+      size: 30 # GB
diff --git a/qa/suites/upgrade-clients/client-upgrade-nautilus/nautilus-client-x/rbd/0-cluster/start.yaml b/qa/suites/upgrade-clients/client-upgrade-nautilus/nautilus-client-x/rbd/0-cluster/start.yaml
new file mode 100644
index 00000000..93f3c471
--- /dev/null
+++ b/qa/suites/upgrade-clients/client-upgrade-nautilus/nautilus-client-x/rbd/0-cluster/start.yaml
@@ -0,0 +1,21 @@
+meta:
+- desc: |
+   Insatll and run ceph on one node,
+   with a separate client 1.
+   Upgrade client 1 to nautilus
+   Run tests against old cluster
+roles:
+- - mon.a
+  - mon.b
+  - mon.c
+  - osd.0
+  - osd.1
+  - osd.2
+  - client.0
+  - mgr.x
+- - client.1
+overrides:
+  ceph:
+    log-whitelist:
+    - failed to encode map
+    fs: xfs
diff --git a/qa/suites/upgrade-clients/client-upgrade-nautilus/nautilus-client-x/rbd/1-install/.qa b/qa/suites/upgrade-clients/client-upgrade-nautilus/nautilus-client-x/rbd/1-install/.qa
new file mode 120000
index 00000000..a602a035
--- /dev/null
+++ b/qa/suites/upgrade-clients/client-upgrade-nautilus/nautilus-client-x/rbd/1-install/.qa
@@ -0,0 +1 @@
+../.qa/
\ No newline at end of file
diff --git a/qa/suites/upgrade-clients/client-upgrade-nautilus/nautilus-client-x/rbd/1-install/nautilus-client-x.yaml b/qa/suites/upgrade-clients/client-upgrade-nautilus/nautilus-client-x/rbd/1-install/nautilus-client-x.yaml
new file mode 100644
index 00000000..1fa905e8
--- /dev/null
+++ b/qa/suites/upgrade-clients/client-upgrade-nautilus/nautilus-client-x/rbd/1-install/nautilus-client-x.yaml
@@ -0,0 +1,11 @@
+tasks:
+- install:
+    branch: nautilus
+    exclude_packages: ['ceph-mgr','libcephfs2','libcephfs-devel','libcephfs-dev','python34-cephfs','python34-rados']
+- print: "**** done install nautilus"
+- install.upgrade:
+   exclude_packages: ['ceph-test', 'ceph-test-dbg','libcephfs1']
+   client.1:
+- print: "**** done install.upgrade to -x on client.0"
+- ceph:
+- print: "**** done ceph task"
diff --git a/qa/suites/upgrade-clients/client-upgrade-nautilus/nautilus-client-x/rbd/2-features/.qa b/qa/suites/upgrade-clients/client-upgrade-nautilus/nautilus-client-x/rbd/2-features/.qa
new file mode 120000
index 00000000..a602a035
--- /dev/null
+++ b/qa/suites/upgrade-clients/client-upgrade-nautilus/nautilus-client-x/rbd/2-features/.qa
@@ -0,0 +1 @@
+../.qa/
\ No newline at end of file
diff --git a/qa/suites/upgrade-clients/client-upgrade-nautilus/nautilus-client-x/rbd/2-features/defaults.yaml b/qa/suites/upgrade-clients/client-upgrade-nautilus/nautilus-client-x/rbd/2-features/defaults.yaml
new file mode 100644
index 00000000..dff6623a
--- /dev/null
+++ b/qa/suites/upgrade-clients/client-upgrade-nautilus/nautilus-client-x/rbd/2-features/defaults.yaml
@@ -0,0 +1,6 @@
+overrides:
+  ceph:
+    conf:
+      client:
+        rbd default features: 61
+
diff --git a/qa/suites/upgrade-clients/client-upgrade-nautilus/nautilus-client-x/rbd/2-features/layering.yaml b/qa/suites/upgrade-clients/client-upgrade-nautilus/nautilus-client-x/rbd/2-features/layering.yaml
new file mode 100644
index 00000000..5613d015
--- /dev/null
+++ b/qa/suites/upgrade-clients/client-upgrade-nautilus/nautilus-client-x/rbd/2-features/layering.yaml
@@ -0,0 +1,6 @@
+overrides:
+  ceph:
+    conf:
+      client:
+        rbd default features: 1
+
diff --git a/qa/suites/upgrade-clients/client-upgrade-nautilus/nautilus-client-x/rbd/3-workload/.qa b/qa/suites/upgrade-clients/client-upgrade-nautilus/nautilus-client-x/rbd/3-workload/.qa
new file mode 120000
index 00000000..a602a035
--- /dev/null
+++ b/qa/suites/upgrade-clients/client-upgrade-nautilus/nautilus-client-x/rbd/3-workload/.qa
@@ -0,0 +1 @@
+../.qa/
\ No newline at end of file
diff --git a/qa/suites/upgrade-clients/client-upgrade-nautilus/nautilus-client-x/rbd/3-workload/rbd_notification_tests.yaml b/qa/suites/upgrade-clients/client-upgrade-nautilus/nautilus-client-x/rbd/3-workload/rbd_notification_tests.yaml
new file mode 100644
index 00000000..10c89021
--- /dev/null
+++ b/qa/suites/upgrade-clients/client-upgrade-nautilus/nautilus-client-x/rbd/3-workload/rbd_notification_tests.yaml
@@ -0,0 +1,21 @@
+tasks:
+- workunit:
+    branch: nautilus
+    clients:
+      client.0:
+        - rbd/notify_master.sh
+      client.1:
+        - rbd/notify_slave.sh
+    env:
+      RBD_FEATURES: "61"
+- print: "**** done rbd: old librbd -> new librbd"
+- workunit:
+    branch: nautilus
+    clients:
+      client.0:
+        - rbd/notify_slave.sh
+      client.1:
+        - rbd/notify_master.sh
+    env:
+      RBD_FEATURES: "61"
+- print: "**** done rbd: new librbd -> old librbd"
diff --git a/qa/suites/upgrade-clients/client-upgrade-nautilus/nautilus-client-x/rbd/supported/.qa b/qa/suites/upgrade-clients/client-upgrade-nautilus/nautilus-client-x/rbd/supported/.qa
new file mode 120000
index 00000000..a602a035
--- /dev/null
+++ b/qa/suites/upgrade-clients/client-upgrade-nautilus/nautilus-client-x/rbd/supported/.qa
@@ -0,0 +1 @@
+../.qa/
\ No newline at end of file
diff --git a/qa/suites/upgrade-clients/client-upgrade-nautilus/nautilus-client-x/rbd/supported/centos_7.6.yaml b/qa/suites/upgrade-clients/client-upgrade-nautilus/nautilus-client-x/rbd/supported/centos_7.6.yaml
new file mode 120000
index 00000000..c336cfc6
--- /dev/null
+++ b/qa/suites/upgrade-clients/client-upgrade-nautilus/nautilus-client-x/rbd/supported/centos_7.6.yaml
@@ -0,0 +1 @@
+../../../../../../distros/all/centos_7.6.yaml
\ No newline at end of file
diff --git a/qa/suites/upgrade-clients/client-upgrade-nautilus/nautilus-client-x/rbd/supported/rhel_7.6.yaml b/qa/suites/upgrade-clients/client-upgrade-nautilus/nautilus-client-x/rbd/supported/rhel_7.6.yaml
new file mode 120000
index 00000000..4fd43cc0
--- /dev/null
+++ b/qa/suites/upgrade-clients/client-upgrade-nautilus/nautilus-client-x/rbd/supported/rhel_7.6.yaml
@@ -0,0 +1 @@
+../../../../../../distros/all/rhel_7.6.yaml
\ No newline at end of file
diff --git a/qa/suites/upgrade-clients/client-upgrade-nautilus/nautilus-client-x/rbd/supported/ubuntu_16.04.yaml b/qa/suites/upgrade-clients/client-upgrade-nautilus/nautilus-client-x/rbd/supported/ubuntu_16.04.yaml
new file mode 120000
index 00000000..9dc1ea99
--- /dev/null
+++ b/qa/suites/upgrade-clients/client-upgrade-nautilus/nautilus-client-x/rbd/supported/ubuntu_16.04.yaml
@@ -0,0 +1 @@
+../../../../../../distros/all/ubuntu_16.04.yaml
\ No newline at end of file
diff --git a/qa/suites/upgrade-clients/client-upgrade-nautilus/nautilus-client-x/rbd/supported/ubuntu_18.04.yaml b/qa/suites/upgrade-clients/client-upgrade-nautilus/nautilus-client-x/rbd/supported/ubuntu_18.04.yaml
new file mode 120000
index 00000000..886e87fa
--- /dev/null
+++ b/qa/suites/upgrade-clients/client-upgrade-nautilus/nautilus-client-x/rbd/supported/ubuntu_18.04.yaml
@@ -0,0 +1 @@
+../../../../../../distros/all/ubuntu_18.04.yaml
\ No newline at end of file