Add default values to provision-openstack.yml

playbooks/provisioning/openstack/provision-openstack.yml

@@ -1,7 +1,7 @@
 ---
 - hosts: localhost
   pre_tasks:
-  - include: roles/common/pre_tasks/pre_tasks.yml
+  - include: pre_tasks.yml
   roles:
   - role: openstack-stack
     stack_name: "{{ env_id }}.{{ public_dns_domain }}"
@@ -10,14 +10,14 @@
     subnet_prefix: "{{ openstack_subnet_prefix }}"
     ssh_public_key: "{{ openstack_ssh_public_key }}"
     openstack_image: "{{ openstack_default_image_name }}"
-    lb_flavor: "{{ openstack_lb_flavor | default('m1.small') }}"
-    etcd_flavor: "{{ openstack_default_flavor }}"
-    master_flavor: "{{ openstack_default_flavor }}"
-    node_flavor: "{{ openstack_default_flavor }}"
-    infra_flavor: "{{ openstack_default_flavor }}"
-    dns_flavor: "{{ openstack_dns_flavor | default('m1.small') }}"
+    lb_flavor: "{{ openstack_default_flavor | default('m1.small') }}"
+    etcd_flavor: "{{ openstack_default_flavor | default('m1.small') }}"
+    master_flavor: "{{ openstack_default_flavor | default('m1.medium') }}"
+    node_flavor: "{{ openstack_default_flavor | default('m1.medium') }}"
+    infra_flavor: "{{ openstack_default_flavor | default('m1.medium') }}"
+    dns_flavor: "{{ openstack_default_flavor | default('m1.small') }}"
     external_network: "{{ openstack_external_network_name }}"
-    num_etcd: 0
+    num_etcd: "{{ openstack_num_etcd | default(0) }}"
     num_masters: "{{ openstack_num_masters }}"
     num_nodes: "{{ openstack_num_nodes }}"
     num_infra: "{{ openstack_num_infra }}"