Merge PR ceph#43136 into master

* refs/pull/43136/head: qa/tasks/kubeadm: change calico encap to IPIPCrossSubnet qa/suites/orch/rook/smoke: add host networking to matrix qa/tasks/rook: fix shadowing of config arg in rook_cluster() Reviewed-by: Joseph Sawaya <[email protected]>
jhesketh · Sep 13, 2021 · 13238ad · 13238ad
2 parents 6df3293 + 528880d
commit 13238ad
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 7 deletions.
diff --git a/qa/suites/orch/rook/smoke/net/host.yaml b/qa/suites/orch/rook/smoke/net/host.yaml
@@ -0,0 +1,7 @@
+overrides:
+  ceph:
+    spec:
+      mon:
+        allowMultiplePerNode: false
+      network:
+        provider: host
diff --git a/qa/tasks/kubeadm.py b/qa/tasks/kubeadm.py
@@ -416,7 +416,7 @@ def pod_network(ctx, config):
                         {
                             'blockSize': 26,
                             'cidr': str(ctx.kubeadm[cluster_name].pod_subnet),
-                            'encapsulation': 'VXLANCrossSubnet',
+                            'encapsulation': 'IPIPCrossSubnet',
                             'natOutgoing': 'Enabled',
                             'nodeSelector': 'all()',
                         }

diff --git a/qa/tasks/rook.py b/qa/tasks/rook.py
@@ -318,18 +318,18 @@ def rook_cluster(ctx, config):
     ctx.rook[cluster_name].num_osds = num_devs
 
     # config
-    config = build_initial_config(ctx, config)
-    config_fp = BytesIO()
-    config.write(config_fp)
-    log.info(f'Config:\n{config_fp.getvalue()}')
-    _kubectl(ctx, config, ['create', '-f', '-'], stdin=yaml.dump({
+    ceph_conf = build_initial_config(ctx, config)
+    ceph_conf_fp = BytesIO()
+    ceph_conf.write(ceph_conf_fp)
+    log.info(f'Config:\n{ceph_conf_fp.getvalue()}')
+    _kubectl(ctx, ceph_conf, ['create', '-f', '-'], stdin=yaml.dump({
         'apiVersion': 'v1',
         'kind': 'ConfigMap',
         'metadata': {
             'name': 'rook-config-override',
             'namespace': 'rook-ceph'},
         'data': {
-            'config': config_fp.getvalue()
+            'config': ceph_conf_fp.getvalue()
         }
     }))