tools/monmaptool: "octopus" to "pacific" for default min_mon_release

We introduced it in eae6c11d72430e95a575142a7e87dd654f4b8ff3.

Also updates the release checklist.

Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>

diff --git a/doc/dev/release-checklists.rst b/doc/dev/release-checklists.rst
index 04c42211965a1f7f68268733e1599081cc46d5d4..838f80bd76aca162f2bf3c7a64503c23bb01cb3a 100644 (file)
--- a/doc/dev/release-checklists.rst
+++ b/doc/dev/release-checklists.rst
@@ -42,6 +42,7 @@ Scripts
 Misc
 ~~~~
 - [x] update src/ceph-volume/ceph_volume/__init__.py (`__release__`)
+- [x] update src/tools/monmaptool.cc (`min_mon_release` and corresponding output in `src/test/cli/monmaptool`)
 
 Feature bits
 ------------

diff --git a/src/test/cli/monmaptool/add-exists.t b/src/test/cli/monmaptool/add-exists.t
index 2aad07196ce8a194e3bbcb38273bc0b455ac0c1a..c51d9fb80cb0701b4c2196e822847b2467b5a160 100644 (file)
--- a/src/test/cli/monmaptool/add-exists.t
+++ b/src/test/cli/monmaptool/add-exists.t
@@ -1,7 +1,7 @@
   $ monmaptool --create mymonmap
   monmaptool: monmap file mymonmap
   monmaptool: generated fsid [0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12} (re)
-  setting min_mon_release = octopus
+  setting min_mon_release = pacific
   monmaptool: writing epoch 0 to mymonmap (0 monitors)
 
   $ ORIG_FSID="$(monmaptool --print mymonmap|grep ^fsid)"
@@ -21,7 +21,7 @@
   fsid [0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12} (re)
   last_changed \d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}\.\d+.\d\d\d\d (re)
   created \d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}\.\d+.\d\d\d\d (re)
-  min_mon_release 15 (octopus)
+  min_mon_release 16 (pacific)
   election_strategy: 1
   0: v1:2.3.4.5:6789/0 mon.foo
 

diff --git a/src/test/cli/monmaptool/add-many.t b/src/test/cli/monmaptool/add-many.t
index 458cd395e5e1d531e2b7e9fa02f75b162a7cc80c..4118d46afd8fbf46105ce407e7f14a935babbc90 100644 (file)
--- a/src/test/cli/monmaptool/add-many.t
+++ b/src/test/cli/monmaptool/add-many.t
@@ -1,7 +1,7 @@
   $ monmaptool --create mymonmap
   monmaptool: monmap file mymonmap
   monmaptool: generated fsid [0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12} (re)
-  setting min_mon_release = octopus
+  setting min_mon_release = pacific
   monmaptool: writing epoch 0 to mymonmap (0 monitors)
 
   $ ORIG_FSID="$(monmaptool --print mymonmap|grep ^fsid)"
@@ -24,7 +24,7 @@
   fsid [0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12} (re)
   last_changed \d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}\.\d+.\d\d\d\d (re)
   created \d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}\.\d+.\d\d\d\d (re)
-  min_mon_release 15 (octopus)
+  min_mon_release 16 (pacific)
   election_strategy: 1
   0: v1:2.3.4.5:6789/0 mon.foo
   1: [v2:172.21.15.68:6791/0,v1:172.21.15.68:6792/0] mon.fiz

diff --git a/src/test/cli/monmaptool/clobber.t b/src/test/cli/monmaptool/clobber.t
index a63deac711d0b1c263041fbc2285aa9319fa312f..2fb45ad616dff1df2c05eda363d49573abdf5062 100644 (file)
--- a/src/test/cli/monmaptool/clobber.t
+++ b/src/test/cli/monmaptool/clobber.t
@@ -1,7 +1,7 @@
   $ monmaptool --create --add foo 2.3.4.5:6789 mymonmap
   monmaptool: monmap file mymonmap
   monmaptool: generated fsid [0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12} (re)
-  setting min_mon_release = octopus
+  setting min_mon_release = pacific
   monmaptool: writing epoch 0 to mymonmap (1 monitors)
 
   $ ORIG_FSID="$(monmaptool --print mymonmap|grep ^fsid)"
@@ -18,7 +18,7 @@
   fsid [0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12} (re)
   last_changed \d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}\.\d+.\d\d\d\d (re)
   created \d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}\.\d+.\d\d\d\d (re)
-  min_mon_release 15 (octopus)
+  min_mon_release 16 (pacific)
   election_strategy: 1
   0: v1:2.3.4.5:6789/0 mon.foo
 
@@ -28,7 +28,7 @@
   $ monmaptool --create --clobber mymonmap
   monmaptool: monmap file mymonmap
   monmaptool: generated fsid [0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12} (re)
-  setting min_mon_release = octopus
+  setting min_mon_release = pacific
   monmaptool: writing epoch 0 to mymonmap (0 monitors)
 
   $ NEW_FSID="$(monmaptool --print mymonmap|grep ^fsid)"
@@ -40,5 +40,5 @@
   fsid [0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12} (re)
   last_changed \d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}\.\d+.\d\d\d\d (re)
   created \d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}\.\d+.\d\d\d\d (re)
-  min_mon_release 15 (octopus)
+  min_mon_release 16 (pacific)
   election_strategy: 1

diff --git a/src/test/cli/monmaptool/create-print.t b/src/test/cli/monmaptool/create-print.t
index d8d5c074a9e458f1e0b4f5c3d0505ec53dfc0a39..31cca02427d3635f18b9ff72c4aa8c45268a21b4 100644 (file)
--- a/src/test/cli/monmaptool/create-print.t
+++ b/src/test/cli/monmaptool/create-print.t
@@ -1,7 +1,7 @@
   $ monmaptool --create mymonmap
   monmaptool: monmap file mymonmap
   monmaptool: generated fsid [0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12} (re)
-  setting min_mon_release = octopus
+  setting min_mon_release = pacific
   monmaptool: writing epoch 0 to mymonmap (0 monitors)
 
   $ monmaptool --print mymonmap
@@ -10,7 +10,7 @@
   fsid [0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12} (re)
   last_changed \d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}\.\d+.\d\d\d\d (re)
   created \d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}\.\d+.\d\d\d\d (re)
-  min_mon_release 15 (octopus)
+  min_mon_release 16 (pacific)
   election_strategy: 1
 
   $ monmaptool --print -- mymonmap
@@ -19,5 +19,5 @@
   fsid [0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12} (re)
   last_changed \d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}\.\d+.\d\d\d\d (re)
   created \d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}\.\d+.\d\d\d\d (re)
-  min_mon_release 15 (octopus)
+  min_mon_release 16 (pacific)
   election_strategy: 1

diff --git a/src/test/cli/monmaptool/create-with-add.t b/src/test/cli/monmaptool/create-with-add.t
index 38bd9060e7da463ee997ebc401fbb07633672dee..b32a7b35caf859723582de8b3bf017e02a4adea8 100644 (file)
--- a/src/test/cli/monmaptool/create-with-add.t
+++ b/src/test/cli/monmaptool/create-with-add.t
@@ -1,7 +1,7 @@
   $ monmaptool --create --add foo 2.3.4.5:6789 mymonmap
   monmaptool: monmap file mymonmap
   monmaptool: generated fsid [0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12} (re)
-  setting min_mon_release = octopus
+  setting min_mon_release = pacific
   monmaptool: writing epoch 0 to mymonmap (1 monitors)
 
   $ monmaptool --print mymonmap
@@ -10,6 +10,6 @@
   fsid [0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12} (re)
   last_changed \d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}\.\d+.\d\d\d\d (re)
   created \d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}\.\d+.\d\d\d\d (re)
-  min_mon_release 15 (octopus)
+  min_mon_release 16 (pacific)
   election_strategy: 1
   0: v1:2.3.4.5:6789/0 mon.foo

diff --git a/src/test/cli/monmaptool/feature-set-unset-list.t b/src/test/cli/monmaptool/feature-set-unset-list.t
index 0b6a2c823666edacb01d9c4fc796a67026ecbe93..6a0c8a17a6f27162314f468d66fbb777bb16c24b 100644 (file)
--- a/src/test/cli/monmaptool/feature-set-unset-list.t
+++ b/src/test/cli/monmaptool/feature-set-unset-list.t
@@ -1,7 +1,7 @@
   $ monmaptool --create --add a 10.10.10.10:1234 /tmp/test.monmap.1234
   monmaptool: monmap file /tmp/test.monmap.1234
   monmaptool: generated fsid [0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12} (re)
-  setting min_mon_release = octopus
+  setting min_mon_release = pacific
   monmaptool: writing epoch 0 to /tmp/test.monmap.1234 (1 monitors)
 
   $ monmaptool --feature-list --feature-list plain --feature-list parseable /tmp/test.monmap.1234

diff --git a/src/test/cli/monmaptool/rm-nonexistent.t b/src/test/cli/monmaptool/rm-nonexistent.t
index 9b7bda39a924520f96d338597c724d2cdcf7f78b..165dbb398bb052e5d5b07a8c12f21f37fd0189b6 100644 (file)
--- a/src/test/cli/monmaptool/rm-nonexistent.t
+++ b/src/test/cli/monmaptool/rm-nonexistent.t
@@ -1,7 +1,7 @@
   $ monmaptool --create --add foo 2.3.4.5:6789 mymonmap
   monmaptool: monmap file mymonmap
   monmaptool: generated fsid [0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12} (re)
-  setting min_mon_release = octopus
+  setting min_mon_release = pacific
   monmaptool: writing epoch 0 to mymonmap (1 monitors)
 
   $ ORIG_FSID="$(monmaptool --print mymonmap|grep ^fsid)"
@@ -19,7 +19,7 @@
   fsid [0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12} (re)
   last_changed \d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}\.\d+.\d\d\d\d (re)
   created \d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}\.\d+.\d\d\d\d (re)
-  min_mon_release 15 (octopus)
+  min_mon_release 16 (pacific)
   election_strategy: 1
   0: v1:2.3.4.5:6789/0 mon.foo
 

diff --git a/src/test/cli/monmaptool/rm.t b/src/test/cli/monmaptool/rm.t
index 7c14370ed12df1496ca4aab87931261d2ca8c9e2..4a693d59aaec347ec893c6d94fbe13cedf7db78c 100644 (file)
--- a/src/test/cli/monmaptool/rm.t
+++ b/src/test/cli/monmaptool/rm.t
@@ -1,7 +1,7 @@
   $ monmaptool --create --add foo 2.3.4.5:6789 mymonmap
   monmaptool: monmap file mymonmap
   monmaptool: generated fsid [0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12} (re)
-  setting min_mon_release = octopus
+  setting min_mon_release = pacific
   monmaptool: writing epoch 0 to mymonmap (1 monitors)
 
   $ ORIG_FSID="$(monmaptool --print mymonmap|grep ^fsid)"
@@ -17,7 +17,7 @@
   fsid [0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12} (re)
   last_changed \d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}\.\d+.\d\d\d\d (re)
   created \d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}\.\d+.\d\d\d\d (re)
-  min_mon_release 15 (octopus)
+  min_mon_release 16 (pacific)
   election_strategy: 1
 
   $ NEW_FSID="$(monmaptool --print mymonmap|grep ^fsid)"

diff --git a/src/tools/monmaptool.cc b/src/tools/monmaptool.cc
index d566313b17e5d6a8436833c133b5226f3efdc846..b858fe5a684a7e1d89488f7a4a20f60d064ca31f 100644 (file)
--- a/src/tools/monmaptool.cc
+++ b/src/tools/monmaptool.cc
@@ -358,7 +358,7 @@ int main(int argc, const char **argv)
     monmap.strategy = static_cast<MonMap::election_strategy>(
                  g_conf().get_val<uint64_t>("mon_election_default_strategy"));
     if (min_mon_release == ceph_release_t::unknown) {
-      min_mon_release = ceph_release_t::octopus;
+      min_mon_release = ceph_release_t::pacific;
     }
     // TODO: why do we not use build_initial in our normal path here!?!?!
     modified = true;