chore: removed swarm init from do-swarm-leader cloud config

generators/ansible-do/templates/ansible/stack/makefile

@@ -64,6 +64,10 @@ setup.portainer:
 	@printf "\033[0;3ansible/2m>>> Set up portainer\033[0m\n"
 	ansible-playbook plays/portainer.yml
 
+setup.swarm:
+	@printf "\033[0;3ansible/2m>>> Set up docker swarm\033[0m\n"
+	ansible-playbook plays/swarm.yml
+
 setup.traefik:
 	@printf "\033[0;3ansible/2m>>> Set up traefik\033[0m\n"
 	ansible-playbook plays/traefik.yml

generators/ansible-do/templates/ansible/stack/plays/swarm.yml

@@ -0,0 +1,22 @@
+---
+- name: Setup docker swarm
+  hosts: all
+  tasks:
+    - name: install python docker module
+      ansible.builtin.pip:
+        name: docker
+
+    - name: Fetch IP of the droplet
+      uri:
+        url: http://169.254.169.254/metadata/v1/interfaces/private/0/ipv4/address
+        return_content: yes
+      register: metadata_response
+
+    - name: Set IP as a fact
+      set_fact:
+        private_ip: "{{ metadata_response.content }}"
+
+    - name: Check/init Swarm
+      docker_swarm:
+        state: present
+        advertise_addr: "{{ private_ip }}"

generators/app/index.js

@@ -19,6 +19,7 @@ import AWSVPCGenerator from "../aws-vpc/index.js";
 import AWSSwarmNodes from "../aws-swarm-nodes/index.js";
 import CloudflareDNSGenerator from "../cloudflare-dns/index.js";
 import DigitalOceanDatabaseClusterGenerator from "../do-database-cluster/index.js";
+import DigitalOceanDockerSwarmGenerator from "../do-swarm/index.js";
 import DigitalOceanDockerSwarmLeaderGenerator from "../do-swarm-leader/index.js";
 import DigitalOceanResourcesGenerator from "../do-resources/index.js";
 import DigitalOceanSSHKeysGenerator from "../do-ssh-keys/index.js";
@@ -60,6 +61,10 @@ export default class IaCGenerator extends Generator {
 
       {
         choices: [
+          {
+            name: "DigitalOcean swarm",
+            value: "do-swarm"
+          },
           {
             name: "Ansible for DigitalOcean swarm",
             value: "ansible-do"
@@ -196,6 +201,7 @@ export default class IaCGenerator extends Generator {
       "cloudflare-dns": { Generator: CloudflareDNSGenerator, path: "../cloudflare-dns/index.js" },
       "do-database-cluster": { Generator: DigitalOceanDatabaseClusterGenerator, path: "../do-database-cluster/index.js" },
       "do-ssh-keys": { Generator: DigitalOceanSSHKeysGenerator, path: "../do-ssh-keys/index.js" },
+      "do-swarm": { Generator: DigitalOceanDockerSwarmGenerator, path: "../do-swarm/index.js" },     
       "do-swarm-leader": { Generator: DigitalOceanDockerSwarmLeaderGenerator, path: "../do-swarm-leader/index.js" },
       "do-resources": { Generator: DigitalOceanResourcesGenerator, path: "../do-resources/index.js" },
       "pulumi-s3-backend": { Generator: PulumiS3BackendGenerator, path: "../pulumi-s3-backend/index.js" },

generators/do-swarm-leader/templates/do-swarm-leader/cloud-config.njx

@@ -11,15 +11,17 @@ users:
 {% endfor %}
 {% endfor %}
 
+package_update: true
+package_upgrade: true
+package_reboot_if_required: true
+
 packages: 
+  - python3-pip
+
 {% for package in packages %}
   - {{ package }}
 {% endfor %}
 
-package_update: true
-package_upgrade: true
-package_reboot_if_required: true
-
 bootcmd:
 {% for volume in volumes %}
   - mkdir {{ volume.path }}
@@ -43,5 +45,4 @@ runcmd:
 {% for volume
  in volumes %}
   - chown -R {{ volume.user }}:{{ volume.group }} {{ volume.path }}
-{% endfor %}
-  - docker swarm init --advertise-addr $(curl -s http://169.254.169.254/metadata/v1/interfaces/private/0/ipv4/address)
+{% endfor %}

generators/do-swarm/index.js

@@ -0,0 +1,55 @@
+import chalk from "chalk";
+
+import PulumiGenerator from "../pulumi/index.js";
+
+export default class DigitalOceanDockerSwarmGenerator extends PulumiGenerator {
+  constructor(args, opts) {
+    super(args, opts);
+
+    this.displayName = "DigitalOcean swarm";
+    this.name = "do-swarm";
+    this.resourcesList = [
+      "do-resources",
+      "do-swarm-leader",
+      "cloudflare-dns",
+      "ansible-do"
+    ];
+  }
+
+  async prompting() {
+    this.props = await this.prompt([
+      {
+        default: this._getDefaultProjectName(),
+        message: "Enter the name of the pulumi project",
+        name: "projectName",
+        type: "input",
+      },
+    ]);
+  }
+
+  writing() {
+    const message = `Generating IaC code for ${this.displayName}`;
+    this.log(`${chalk.green(message)}`);
+
+    // Define the generators
+    const generators = {
+      "do-resources": "../do-resources/index.js",
+      "do-swarm-leader": "../do-swarm-leader/index.js",
+      "cloudflare-dns": "../cloudflare-dns/index.js",
+      "ansible-do": "../ansible-do/index.js"
+    };
+
+    // Compose with each resource generator
+    for (const resource of this.resourcesList) {
+      const generatorPath = generators[resource];
+      if (generatorPath) {
+        this.composeWith(generatorPath, {
+          ...this.props,
+          ...this.options,
+        });
+      } else {
+        this.log(chalk.red(`No generator found for resource: ${resource}`));
+      }
+    }
+  }
+}