fix: allow node roles different than bootstrapped node (#23)

anvil-python/anvil/commands/haproxy.py

@@ -13,15 +13,20 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+from typing import List
+
 from sunbeam.clusterd.client import Client
+from sunbeam.commands.terraform import TerraformInitStep
 from sunbeam.jobs.juju import JujuHelper
+from sunbeam.jobs.manifest import BaseStep
 from sunbeam.jobs.steps import (
     AddMachineUnitsStep,
     DeployMachineApplicationStep,
     RemoveMachineUnitStep,
 )
 
 from anvil.jobs.manifest import Manifest
+from anvil.provider.local.deployment import LocalDeployment
 
 APPLICATION = "haproxy"
 CONFIG_KEY = "TerraformVarsHaproxyPlan"
@@ -103,3 +108,21 @@ def __init__(
 
     def get_unit_timeout(self) -> int:
         return HAPROXY_UNIT_TIMEOUT
+
+
+def haproxy_install_steps(
+    client: Client,
+    manifest: Manifest,
+    jhelper: JujuHelper,
+    deployment: LocalDeployment,
+    fqdn: str,
+) -> List[BaseStep]:
+    return [
+        TerraformInitStep(manifest.get_tfhelper("haproxy-plan")),
+        DeployHAProxyApplicationStep(
+            client, manifest, jhelper, deployment.infrastructure_model
+        ),
+        AddHAProxyUnitsStep(
+            client, fqdn, jhelper, deployment.infrastructure_model
+        ),
+    ]

anvil-python/anvil/commands/maas_agent.py

@@ -13,15 +13,20 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+from typing import List
+
 from sunbeam.clusterd.client import Client
+from sunbeam.commands.terraform import TerraformInitStep
 from sunbeam.jobs.juju import JujuHelper
+from sunbeam.jobs.manifest import BaseStep
 from sunbeam.jobs.steps import (
     AddMachineUnitsStep,
     DeployMachineApplicationStep,
     RemoveMachineUnitStep,
 )
 
 from anvil.jobs.manifest import Manifest
+from anvil.provider.local.deployment import LocalDeployment
 
 APPLICATION = "maas-agent"
 CONFIG_KEY = "TerraformVarsMaasagentPlan"
@@ -105,3 +110,21 @@ def __init__(
 
     def get_unit_timeout(self) -> int:
         return MAASAGENT_UNIT_TIMEOUT
+
+
+def maas_agent_install_steps(
+    client: Client,
+    manifest: Manifest,
+    jhelper: JujuHelper,
+    deployment: LocalDeployment,
+    fqdn: str,
+) -> List[BaseStep]:
+    return [
+        TerraformInitStep(manifest.get_tfhelper("maas-agent-plan")),
+        DeployMAASAgentApplicationStep(
+            client, manifest, jhelper, deployment.infrastructure_model
+        ),
+        AddMAASAgentUnitsStep(
+            client, fqdn, jhelper, deployment.infrastructure_model
+        ),
+    ]

anvil-python/anvil/commands/maas_region.py

@@ -13,17 +13,20 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from typing import Any
+from typing import Any, List
 
 from sunbeam.clusterd.client import Client
+from sunbeam.commands.terraform import TerraformInitStep
 from sunbeam.jobs.juju import JujuHelper
+from sunbeam.jobs.manifest import BaseStep
 from sunbeam.jobs.steps import (
     AddMachineUnitsStep,
     DeployMachineApplicationStep,
     RemoveMachineUnitStep,
 )
 
 from anvil.jobs.manifest import Manifest
+from anvil.provider.local.deployment import LocalDeployment
 
 APPLICATION = "maas-region"
 CONFIG_KEY = "TerraformVarsMaasregionPlan"
@@ -115,3 +118,21 @@ def __init__(
 
     def get_unit_timeout(self) -> int:
         return MAASREGION_UNIT_TIMEOUT
+
+
+def maas_region_install_steps(
+    client: Client,
+    manifest: Manifest,
+    jhelper: JujuHelper,
+    deployment: LocalDeployment,
+    fqdn: str,
+) -> List[BaseStep]:
+    return [
+        TerraformInitStep(manifest.get_tfhelper("maas-region-plan")),
+        DeployMAASRegionApplicationStep(
+            client, manifest, jhelper, deployment.infrastructure_model
+        ),
+        AddMAASRegionUnitsStep(
+            client, fqdn, jhelper, deployment.infrastructure_model
+        ),
+    ]

anvil-python/anvil/commands/postgresql.py

@@ -13,15 +13,20 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+from typing import List
+
 from sunbeam.clusterd.client import Client
+from sunbeam.commands.terraform import TerraformInitStep
 from sunbeam.jobs.juju import JujuHelper
+from sunbeam.jobs.manifest import BaseStep
 from sunbeam.jobs.steps import (
     AddMachineUnitsStep,
     DeployMachineApplicationStep,
     RemoveMachineUnitStep,
 )
 
 from anvil.jobs.manifest import Manifest
+from anvil.provider.local.deployment import LocalDeployment
 
 APPLICATION = "postgresql"
 CONFIG_KEY = "TerraformVarsPostgresqlPlan"
@@ -105,3 +110,21 @@ def __init__(
 
     def get_unit_timeout(self) -> int:
         return POSTGRESQL_UNIT_TIMEOUT
+
+
+def postgresql_install_steps(
+    client: Client,
+    manifest: Manifest,
+    jhelper: JujuHelper,
+    deployment: LocalDeployment,
+    fqdn: str,
+) -> List[BaseStep]:
+    return [
+        TerraformInitStep(manifest.get_tfhelper("postgresql-plan")),
+        DeployPostgreSQLApplicationStep(
+            client, manifest, jhelper, deployment.infrastructure_model
+        ),
+        AddPostgreSQLUnitsStep(
+            client, fqdn, jhelper, deployment.infrastructure_model
+        ),
+    ]