commit 0e4939b4b8bd1efb3f9a32bcd87dce4fba2ecf05
author Michiel Piscaer <michiel.piscaer@cgm.com> Tue Aug 08 15:28:30 2023 +0200
committer Mohammed Naser <mnaser@vexxhost.com> Tue Aug 08 13:40:47 2023 -0400
tree 047a9e4ef2d8836c0ee0848b6105d8863179f3a6
parent 51f0221e77a7019449635489f0dc55194161274c

fix bastion_instance_type, not using a env variable.\n\n The env variable was requered when the default flavor does not exists. Even when the bastion was not used.

molecule/default/create.yml

diff --git a/molecule/default/create.yml b/molecule/default/create.yml
index 9087041..84b5858 100644
--- a/molecule/default/create.yml
+++ b/molecule/default/create.yml
@@ -28,6 +28,7 @@
     stack_name: "{{ lookup('env', 'ATMOSPHERE_STACK_NAME') | default('atmosphere', True) }}"
     public_network: "{{ lookup('env', 'ATMOSPHERE_PUBLIC_NETWORK') | default('public', True) }}"
     image: "{{ lookup('env', 'ATMOSPHERE_IMAGE') | default('Ubuntu 20.04.3 LTS (x86_64) [2021-10-04]', True) }}"
+    bastion_instance_type: "{{ lookup('env', 'ATMOSPHERE_BASTION_INSTANCE_TYPE', default=lookup('env', 'ATMOSPHERE_INSTANCE_TYPE', default='v3-standard-4')) }}"
     controller_instance_type: "{{ lookup('env', 'ATMOSPHERE_CONTROLLER_INSTANCE_TYPE', default=lookup('env', 'ATMOSPHERE_INSTANCE_TYPE', default='v3-standard-16')) }}"
     compute_instance_type: "{{ lookup('env', 'ATMOSPHERE_COMPUTE_INSTANCE_TYPE', default=lookup('env', 'ATMOSPHERE_INSTANCE_TYPE', default='v3-standard-4')) }}"
     storage_instance_type: "{{ lookup('env', 'ATMOSPHERE_STORAGE_INSTANCE_TYPE', default=lookup('env', 'ATMOSPHERE_INSTANCE_TYPE', default='v3-standard-4')) }}"
@@ -42,6 +43,7 @@
         parameters:
           public_network: "{{ public_network }}"
           image: "{{ image }}"
+          bastion_instance_type: "{{ bastion_instance_type }}"
           controller_instance_type: "{{ controller_instance_type }}"
           compute_instance_type: "{{ compute_instance_type }}"
           storage_instance_type: "{{ storage_instance_type }}"

molecule/default/heat/stack.yaml

diff --git a/molecule/default/heat/stack.yaml b/molecule/default/heat/stack.yaml
index 01b57fd..c5b171f 100644
--- a/molecule/default/heat/stack.yaml
+++ b/molecule/default/heat/stack.yaml
@@ -49,7 +49,6 @@
     default: false
 
   bastion_instance_type:
-    default: v3-standard-4
     type: string
     constraints:
       - custom_constraint: nova.flavor