linode-ansible/deploy.yml

@@ -1,6 +1,6 @@
 ---
 - hosts: all
   roles:
-    - base
+    - base_personal
   become: yes
   become_user: root

pvm-ansible/deploy.yml

@@ -1,6 +1,6 @@
 ---
 - hosts: all
   roles:
-    - base
+    - base_personal
   become: yes
   become_user: root

vm-ansible/Pulumi.yaml

@@ -43,5 +43,5 @@ template:
       description: Password of the username in the cloud-init phase
     playbooks:
       type: String
-      default: ''
+      default: 'deploy.yml'
-      description: "Additional playbooks to implement, separate by commas."
+      description: "Ansible Playbooks to implement, separate by commas."

vm-ansible/__main__.py

@@ -35,9 +35,9 @@ volume = lv.Volume("disk",
 
 # Stream configuration files
 cloudinit = lv.CloudInitDisk("cloud-init",
-    meta_data = Template(open("./templates/meta-data.jinja", "r").read()).render(env),
+    meta_data = Template(open("./cloud-init/meta-data.jinja", "r").read()).render(env),
-    user_data = Template(open("./templates/user-data.jinja", "r").read()).render(env),
+    user_data = Template(open("./cloud-init/user-data.jinja", "r").read()).render(env),
-    network_config = open("./templates/network-config", "r").read()
+    network_config = open("./cloud-init/network-config", "r").read()
 )
 
 vm = lv.Domain(config.get('hostname'),
@@ -75,18 +75,12 @@ inventory = command.local.Command("a-inventory",
     opts = pulumi.ResourceOptions(depends_on = [ wait_time ])
 )
 
-deploy = command.local.Command('ap deploy',
+# Applying the command
-    create = 'ansible-playbook deploy.yml',
+for playbook in config.get('playbooks').split(','):
-    delete = 'rm -f ./ansible.log',
+    execute_ansible = command.local.Command(f"a-{playbook.split('.')[0]}",
-    opts = pulumi.ResourceOptions(depends_on = [ inventory ])
-)
-
-# Running additional playbooks
-for playbook in sorted(config.get('playbooks').split(',')):
-    execute_ansible = command.local.Command(f"ap {playbook.split('.')[0]}",
         create = f"ansible-playbook {playbook}",
         delete = "rm -f ./ansible.log",
-        opts = pulumi.ResourceOptions(depends_on = [ deploy ])
+        opts = pulumi.ResourceOptions(depends_on = [ inventory ])
     )
 
 pulumi.export("ip", vm.network_interfaces[0]['addresses'][0])

vm-ansible/deploy.yml

@@ -1,6 +1,6 @@
 ---
 - hosts: all
   roles:
-    - base
+    - base_personal
   become: yes
   become_user: root