Implements #1473

Author: micafer

IM/ConfManager.py

@@ -1054,7 +1054,7 @@ def generate_playbooks_and_hosts(self):
             contextualizes = self.inf.radl.contextualize.get_contextualize_items_by_step({1: ctxts})
 
             # create the files for the configure sections that appears in the contextualization steps
-            # and add the ansible information and modules
+            # and add the ansible information and roles
             for ctxt_num in contextualizes.keys():
                 for ctxt_elem in contextualizes[ctxt_num]:
                     if ctxt_elem.system in vm_group and ctxt_elem.get_ctxt_tool() == "Ansible":
@@ -1503,7 +1503,7 @@ def create_general_conf_file(self, conf_file, vm_list):
         Create the configuration file needed by the contextualization agent
         """
         # Add all the roles and collections specified in the RADL
-        modules = []
+        roles = []
         collections = []
         for s in self.inf.radl.systems:
             for req_app in s.getApplications():
@@ -1513,32 +1513,32 @@ def create_general_conf_file(self, conf_file, vm_list):
                     app_name = req_app.getValue("name")[16:]
                     if req_app.getValue("version"):
                         app_name += ",%s" % req_app.getValue("version")
-                    modules.append(app_name)
+                    roles.append(app_name)
                 elif req_app.getValue("name").startswith("ansible.roles."):
                     # Get the roles specified by the user in the RADL
                     app_name = req_app.getValue("name")[14:]
                     if req_app.getValue("version"):
                         app_name += ",%s" % req_app.getValue("version")
-                    modules.append(app_name)
+                    roles.append(app_name)
                 elif req_app.getValue("name").startswith("ansible.collections."):
-                    # Get the modules specified by the user in the RADL
+                    # Get the collections specified by the user in the RADL
                     app_name = req_app.getValue("name")[20:]
                     if req_app.getValue("version"):
                         app_name += ",%s" % req_app.getValue("version")
                     collections.append(app_name)
                 else:
                     # Get the info about the apps from the recipes DB
-                    vm_modules, _ = Recipe.getInfoApps([req_app])
-                    modules.extend(vm_modules)
+                    vm_roles, _ = Recipe.getInfoApps([req_app])
+                    roles.extend(vm_roles)
 
         # avoid duplicates
-        modules = list(set(modules))
+        roles = list(set(roles))
         collections = list(set(collections))
 
         conf_data = {}
 
         conf_data['ansible_collections'] = collections
-        conf_data['ansible_modules'] = modules
+        conf_data['ansible_roles'] = roles
         conf_data['playbook_retries'] = Config.PLAYBOOK_RETRIES
         conf_data['vms'] = []
         for vm in vm_list:

IM/CtxtAgentBase.py

@@ -410,9 +410,9 @@ def add_nat_gateway_tasks(playbook):
 
         return new_playbook
 
-    def install_ansible_modules(self, general_conf_data, playbook):
+    def install_ansible_roles(self, general_conf_data, playbook):
         new_playbook = playbook
-        if (('ansible_modules' in general_conf_data and general_conf_data['ansible_modules']) or
+        if (('ansible_roles' in general_conf_data and general_conf_data['ansible_roles']) or
                 ('ansible_collections' in general_conf_data and general_conf_data['ansible_collections'])):
             play_dir = os.path.dirname(playbook)
             play_filename = os.path.basename(playbook)
@@ -461,8 +461,8 @@ def install_ansible_modules(self, general_conf_data, playbook):
             # and then add roles
             galaxy_dependencies = []
             needs_git = False
-            if 'ansible_modules' in general_conf_data and general_conf_data['ansible_modules']:
-                for galaxy_name in general_conf_data['ansible_modules']:
+            if 'ansible_roles' in general_conf_data and general_conf_data['ansible_roles']:
+                for galaxy_name in general_conf_data['ansible_roles']:
                     if galaxy_name:
                         self.logger.debug("Install %s with ansible-galaxy.", galaxy_name)
 

IM/VirtualMachine.py

@@ -391,7 +391,7 @@ def getAppsToInstall(self):
 
         to_install = []
         for req_app in requested:
-            # discard the ansible modules
+            # discard the ansible roles or collections
             if not req_app.getValue("name").startswith("ansible."):
                 is_installed = False
                 for inst_app in installed:

contextualization/ctxt_agent.py

@@ -157,8 +157,8 @@ def contextualize_vm(self, general_conf_data, vm_conf_data):
 
                     if ctxt_vm['os'] != "windows":
                         if ctxt_vm['master']:
-                            # Install ansible modules
-                            playbook = self.install_ansible_modules(general_conf_data, playbook)
+                            # Install ansible roles
+                            playbook = self.install_ansible_roles(general_conf_data, playbook)
                         if 'nat_instance' in ctxt_vm and ctxt_vm['nat_instance']:
                             playbook = self.add_nat_gateway_tasks(playbook)
                         # this step is not needed in windows systems

contextualization/ctxt_agent_dist.py

@@ -447,8 +447,8 @@ def contextualize_vm(self, general_conf_data, vm_conf_data, ctxt_vm, local):
                             # this step is not needed in windows systems
                             self.set_ansible_connection_local(general_conf_data, ctxt_vm)
                             if ctxt_vm['master']:
-                                # Install ansible modules
-                                playbook = self.install_ansible_modules(general_conf_data, playbook)
+                                # Install ansible roles
+                                playbook = self.install_ansible_roles(general_conf_data, playbook)
                             if 'nat_instance' in ctxt_vm and ctxt_vm['nat_instance']:
                                 playbook = self.add_nat_gateway_tasks(playbook)
                             ansible_thread = self.LaunchAnsiblePlaybook(self.logger,

test/files/test.radl

@@ -13,6 +13,8 @@ disk.0.image.url = 'one://ramses.i3m.upv.es/1651' and
 disk.0.os.credentials.new.password = 'Tututu+01' and
 disk.0.applications contains (name = 'ansible.collections.community.general,6.3.0') and
 disk.0.applications contains (name = 'ansible.roles.geerlingguy.ntp') and
+# Test also the old version
+disk.0.applications contains (name = 'ansible.modules.geerlingguy.mysql') and
 disk.1.size=1GB and
 disk.1.device='hdb' and
 disk.1.fstype='ext4' and
@@ -51,6 +53,7 @@ configure ntp (
  - roles:
    - role: 'geerlingguy.ntp'
      ntp_servers: ['ntp.upv.es', 'ntp.uv.es']
+   - role: 'geerlingguy.mysql'
 @end
 )
 

test/unit/test_ctxt_agent.py

@@ -255,17 +255,17 @@ def test_90_replace_vm_ip(self):
             data = f.read()
         self.assertIn(" ansible_host=%s ansible_ssh_host=%s \n" % (vm_data['ctxt_ip'], vm_data['ctxt_ip']), data)
 
-    def test_95_install_ansible_modules(self):
+    def test_95_install_ansible_roles(self):
         ctxt_agent = CtxtAgent("")
         ctxt_agent.logger = self.logger
         general_conf_data = self.gen_general_conf()
-        general_conf_data['ansible_modules'] = ["ansible_role",
+        general_conf_data['ansible_roles'] = ["ansible_role",
                                                 "git+https://github.com/micafer/ansible-role-hadoop|hadoop"]
 
         with open("/tmp/playbook.yaml", 'w') as f:
             f.write("- tasks: []")
 
-        res = ctxt_agent.install_ansible_modules(general_conf_data, "/tmp/playbook.yaml")
+        res = ctxt_agent.install_ansible_roles(general_conf_data, "/tmp/playbook.yaml")
         self.assertEqual(res, "/tmp/mod_playbook.yaml")
 
         with open("/tmp/mod_playbook.yaml", 'r') as f:
@@ -290,7 +290,7 @@ def test_99_install_ansible_collections(self):
         with open("/tmp/playbook.yaml", 'w') as f:
             f.write("- tasks: []")
 
-        res = ctxt_agent.install_ansible_modules(general_conf_data, "/tmp/playbook.yaml")
+        res = ctxt_agent.install_ansible_roles(general_conf_data, "/tmp/playbook.yaml")
         self.assertEqual(res, "/tmp/mod_playbook.yaml")
 
         with open("/tmp/mod_playbook.yaml", 'r') as f: