get rid of the 'plain' thing altogether

diff --git a/system/AA-bonding.md b/system/AA-bonding.md
index 3fd18b2..d1e28cf 100644 (file)
--- a/system/AA-bonding.md
+++ b/system/AA-bonding.md
@@ -78,9 +78,8 @@ testing a node upgrade; we start from a f21 myplc and upgrade the node to f22
     f21
     bond22
     rung
     f21
     bond22
     rung

-    run nodeplain-off

 
 

-### Upgrade the node (make sure nodeplain is off)
+### Upgrade the node

     
     run nodedistro-f22 nodestate-upgrade
     run reset-node wait-node
     
     run nodedistro-f22 nodestate-upgrade
     run reset-node wait-node

diff --git a/system/TestBonding.py b/system/TestBonding.py
index 0a2747c..9d6b4dd 100644 (file)
--- a/system/TestBonding.py
+++ b/system/TestBonding.py
@@ -130,8 +130,6 @@ class TestBonding(object):
         # with the node flavour that goes with bonding plc
         for tag in ['arch', 'fcdistro', 'pldistro']:
             node_spec['tags'][tag] = self.bonding_spec[tag]
         # with the node flavour that goes with bonding plc
         for tag in ['arch', 'fcdistro', 'pldistro']:
             node_spec['tags'][tag] = self.bonding_spec[tag]

-        # do not use plain bootstrapfs
-        del node_spec['tags']['plain-bootstrapfs']

 
     #################### steps
     def init_partial(self):
 
     #################### steps
     def init_partial(self):

diff --git a/system/TestNode.py b/system/TestNode.py
index ab614ef..d3ac3ed 100644 (file)
--- a/system/TestNode.py
+++ b/system/TestNode.py
@@ -247,25 +247,6 @@ class TestNode:
         print("Flavour for {} : {}".format(self.name(), flavour))
         return True
 
         print("Flavour for {} : {}".format(self.name(), flavour))
         return True
 

-    def nodeplain_set(self, plain):
-        " set bootstrapfs-plain tag on nodes"
-        self.test_plc.apiserver.SetNodePlainBootstrapfs(self.test_plc.auth_root(),
-                                                        self.name(), plain)
-        return True
-    def nodeplain_on(self):
-        return self.nodeplain_set("True")
-    def nodeplain_off(self):
-        return self.nodeplain_set("")
-    def nodeplain_show(self):
-        "display bootstrapfs-plain tag"
-        if self.dry_run():
-            print("Dry_run: would fetch node plain-bootstrapfs tag")
-            return True
-        plain = self.test_plc.apiserver.GetNodePlainBootstrapfs(self.test_plc.auth_root(),
-                                                                  self.name())
-        print("Plain bootstrapfs for {} is {}".format(self.name(), plain))
-        return True
-

     def qemu_local_config(self):
         "all nodes: compute qemu config qemu.conf and store it locally"
         if not self.is_qemu():
     def qemu_local_config(self):
         "all nodes: compute qemu config qemu.conf and store it locally"
         if not self.is_qemu():

diff --git a/system/TestPlc.py b/system/TestPlc.py
index 9c2165a..687e4d7 100644 (file)
--- a/system/TestPlc.py
+++ b/system/TestPlc.py
@@ -200,7 +200,6 @@ class TestPlc:
         'nodestate_show','nodestate_safeboot','nodestate_boot', 'nodestate_upgrade', SEP,
         'nodeflavour_show','nodedistro_f14','nodedistro_f18', SEP,
         'nodedistro_f20', 'nodedistro_f21','nodedistro_f22', SEP,
         'nodestate_show','nodestate_safeboot','nodestate_boot', 'nodestate_upgrade', SEP,
         'nodeflavour_show','nodedistro_f14','nodedistro_f18', SEP,
         'nodedistro_f20', 'nodedistro_f21','nodedistro_f22', SEP,

-        'nodeplain_on','nodeplain_off','nodeplain_show', SEP,

         'qemu_list_all', 'qemu_list_mine', 'qemu_kill_all', SEP,
         'sfa_install_core', 'sfa_install_sfatables', 'sfa_install_plc', 'sfa_install_client', SEPSFA,
         'sfa_plcclean', 'sfa_dbclean', 'sfa_stop','sfa_uninstall', 'sfi_clean', SEPSFA,
         'qemu_list_all', 'qemu_list_mine', 'qemu_kill_all', SEP,
         'sfa_install_core', 'sfa_install_sfatables', 'sfa_install_plc', 'sfa_install_client', SEPSFA,
         'sfa_plcclean', 'sfa_dbclean', 'sfa_stop','sfa_uninstall', 'sfi_clean', SEPSFA,


@@ -712,7 +711,7 @@ class TestPlc:
     ### install_rpm 
     def plc_install(self):
         """
     ### install_rpm 
     def plc_install(self):
         """

-        yum install myplc, noderepo + plain bootstrapfs as well
+        yum install myplc, noderepo

         """
 
         # compute nodefamily
         """
 
         # compute nodefamily


@@ -728,7 +727,6 @@ class TestPlc:
         pkgs_list.append("slicerepo-{}".format(nodefamily))
         pkgs_list.append("myplc")
         pkgs_list.append("noderepo-{}".format(nodefamily))
         pkgs_list.append("slicerepo-{}".format(nodefamily))
         pkgs_list.append("myplc")
         pkgs_list.append("noderepo-{}".format(nodefamily))

-        pkgs_list.append("nodeimage-{}-plain".format(nodefamily))

         pkgs_string=" ".join(pkgs_list)
         return self.yum_install(pkgs_list)
 
         pkgs_string=" ".join(pkgs_list)
         return self.yum_install(pkgs_list)
 


@@ -1219,12 +1217,6 @@ class TestPlc:
     def nodedistro_f22(self): pass
     @node_mapper
     def nodeflavour_show(self): pass
     def nodedistro_f22(self): pass
     @node_mapper
     def nodeflavour_show(self): pass

-    @node_mapper
-    def nodeplain_on(self): pass
-    @node_mapper
-    def nodeplain_off(self): pass
-    @node_mapper
-    def nodeplain_show(self): pass

         
     ### check hooks : invoke scripts from hooks/{node,slice}
     def check_hooks_node(self): 
         
     ### check hooks : invoke scripts from hooks/{node,slice}
     def check_hooks_node(self): 

diff --git a/system/config_default.py b/system/config_default.py
index b9abacd..baa481b 100644 (file)
--- a/system/config_default.py
+++ b/system/config_default.py
@@ -66,11 +66,8 @@ def nodes(options, index):
                                           'next_hop' : 'xxx-deferred-xxx',
                                           },
              'bootmedium_options' :     [ 'serial', 'no-hangcheck', 'systemd-debug' ],
                                           'next_hop' : 'xxx-deferred-xxx',
                                           },
              'bootmedium_options' :     [ 'serial', 'no-hangcheck', 'systemd-debug' ],

-             # do not use plain bootstrapfs anymore as
-             # it tends to make bonding awkward (it's complicated enough already)
-             # plus, benefits are not clear any more, and it's closer to real life

              'tags'               :     {
              'tags'               :     {

-#                 'plain-bootstrapfs' : 'YES',
+                 # no tags anymore

              },
              # boot cd settings
              # we should have tags here instead of the hard-wired
              },
              # boot cd settings
              # we should have tags here instead of the hard-wired