Resolves #20

inventory/group_vars/all/all.yml

@@ -1,2 +1,4 @@
 ---
 ansible_primary_interface: ens160
+
+vsphere_linux_vapp_ovf: C:\vagrant\vApps\ubuntu_16.04_template.ovf

inventory/group_vars/all/environment.yml

@@ -1,3 +1,9 @@
 ---
 # vSphere core services for vms
-vsphere_vm_services_subnet: 10.0.102
+vsphere_vm_services_subnet: 10.0.102
+
+vsphere_vm_services_subnet_mask: 255.255.255.0
+
+vsphere_vm_services_subnet_mask_cidr: 24
+
+vsphere_vm_services_vswitch: VSS-VLAN-102

inventory/group_vars/all/vsphere_bootstrap_vms.yml

@@ -7,13 +7,13 @@ vsphere_bootstrap_vms: []
   #   gateway: "{{ vsphere_vm_services_subnet }}.1"
   #   ip: "{{ vsphere_vm_services_subnet }}.101"
   #   memory_mb: 512
-  #   netmask_cidr: 24
-  #   network_name: VSS-VLAN-102
-  #   vapp_source_path: C:\vagrant\vApps\ubuntu_16.04_template.ovf
+  #   netmask_cidr: "{{ vsphere_vm_services_subnet_mask_cidr }}"
+  #   network_name: "{{ vsphere_vm_services_vswitch }}"
+  #   vapp_source_path: "{{ vsphere_linux_vapp_ovf }}"
   # - vm_name: bootstrap_vm_2
   #   cpus: 2
   #   deploy: true
   #   datastore: Datastore_1
   #   memory_mb: 1024
-  #   network_name: VSS-VLAN-101
-  #   vapp_source_path: C:\vagrant\vApps\ubuntu_16.04_template.ovf
+  #   network_name: "{{ vsphere_vm_services_vswitch }}"
+  #   vapp_source_path: "{{ vsphere_linux_vapp_ovf }}"

inventory/group_vars/all/vsphere_ddi.yml

@@ -15,29 +15,29 @@ vsphere_ddi_vms:
     gateway: "{{ vsphere_vm_services_subnet }}.1"
     ip: "{{ vsphere_ddi_vm_ips[0] }}"
     memory_mb: 2048
-    netmask: 255.255.255.0
-    netmask_cidr: 24
-    network_name: VSS-VLAN-102
-    vapp_source_path: C:\vagrant\vApps\ubuntu_16.04_template.ovf
+    netmask: "{{ vsphere_vm_services_subnet_mask }}"
+    netmask_cidr: "{{ vsphere_vm_services_subnet_mask_cidr }}"
+    network_name: "{{ vsphere_vm_services_vswitch }}"
+    vapp_source_path: "{{ vsphere_linux_vapp_ovf }}"
   - vm_name: "ddi-01.{{ vsphere_pri_domain_name }}"
     cpus: 1
     deploy: true
     datastore: Datastore_1
     gateway: "{{ vsphere_vm_services_subnet }}.1"
     ip: "{{ vsphere_ddi_vm_ips[1] }}"
     memory_mb: 2048
-    netmask: 255.255.255.0
-    netmask_cidr: 24
-    network_name: VSS-VLAN-102
-    vapp_source_path: C:\vagrant\vApps\ubuntu_16.04_template.ovf
+    netmask: "{{ vsphere_vm_services_subnet_mask }}"
+    netmask_cidr: "{{ vsphere_vm_services_subnet_mask_cidr }}"
+    network_name: "{{ vsphere_vm_services_vswitch }}"
+    vapp_source_path: "{{ vsphere_linux_vapp_ovf }}"
   - vm_name: "ddi-02.{{ vsphere_pri_domain_name }}"
     cpus: 1
     deploy: true
     datastore: Datastore_1
     gateway: "{{ vsphere_vm_services_subnet }}.1"
     ip: "{{ vsphere_ddi_vm_ips[2] }}"
     memory_mb: 2048
-    netmask: 255.255.255.0
-    netmask_cidr: 24
-    network_name: VSS-VLAN-102
-    vapp_source_path: C:\vagrant\vApps\ubuntu_16.04_template.ovf
+    netmask: "{{ vsphere_vm_services_subnet_mask }}"
+    netmask_cidr: "{{ vsphere_vm_services_subnet_mask_cidr }}"
+    network_name: "{{ vsphere_vm_services_vswitch }}"
+    vapp_source_path: "{{ vsphere_linux_vapp_ovf }}"

inventory/group_vars/all/vsphere_dnsdist.yml

@@ -14,18 +14,18 @@ vsphere_dnsdist_vms:
     gateway: "{{ vsphere_vm_services_subnet }}.1"
     ip: "{{ vsphere_dnsdist_vm_ips[0] }}"
     memory_mb: 1024
-    netmask: 255.255.255.0
-    netmask_cidr: 24
-    network_name: VSS-VLAN-102
-    vapp_source_path: C:\vagrant\vApps\ubuntu_16.04_template.ovf
+    netmask: "{{ vsphere_vm_services_subnet_mask }}"
+    netmask_cidr: "{{ vsphere_vm_services_subnet_mask_cidr }}"
+    network_name: "{{ vsphere_vm_services_vswitch }}"
+    vapp_source_path: "{{ vsphere_linux_vapp_ovf }}"
   - vm_name: "dnsdist-01.{{ vsphere_pri_domain_name }}"
     cpus: 1
     deploy: true
     datastore: Datastore_1
     gateway: "{{ vsphere_vm_services_subnet }}.1"
     ip: "{{ vsphere_dnsdist_vm_ips[1] }}"
     memory_mb: 1024
-    netmask: 255.255.255.0
-    netmask_cidr: 24
-    network_name: VSS-VLAN-102
-    vapp_source_path: C:\vagrant\vApps\ubuntu_16.04_template.ovf
+    netmask: "{{ vsphere_vm_services_subnet_mask }}"
+    netmask_cidr: "{{ vsphere_vm_services_subnet_mask_cidr }}"
+    network_name: "{{ vsphere_vm_services_vswitch }}"
+    vapp_source_path: "{{ vsphere_linux_vapp_ovf }}"

inventory/group_vars/all/vsphere_lb.yml

@@ -9,18 +9,18 @@ vsphere_lb_vms:
     gateway: "{{ vsphere_vm_services_subnet }}.1"
     ip: "{{ vsphere_vm_services_subnet }}.20"
     memory_mb: 1024
-    netmask: 255.255.255.0
-    netmask_cidr: 24
-    network_name: VSS-VLAN-102
-    vapp_source_path: C:\vagrant\vApps\ubuntu_16.04_template.ovf
+    netmask: "{{ vsphere_vm_services_subnet_mask }}"
+    netmask_cidr: "{{ vsphere_vm_services_subnet_mask_cidr }}"
+    network_name: "{{ vsphere_vm_services_vswitch }}"
+    vapp_source_path: "{{ vsphere_linux_vapp_ovf }}"
   - vm_name: "lb-01.{{ vsphere_pri_domain_name }}"
     cpus: 1
     deploy: true
     datastore: Datastore_1
     gateway: "{{ vsphere_vm_services_subnet }}.1"
     ip: "{{ vsphere_vm_services_subnet }}.21"
     memory_mb: 1024
-    netmask: 255.255.255.0
-    netmask_cidr: 24
-    network_name: VSS-VLAN-102
-    vapp_source_path: C:\vagrant\vApps\ubuntu_16.04_template.ovf
+    netmask: "{{ vsphere_vm_services_subnet_mask }}"
+    netmask_cidr: "{{ vsphere_vm_services_subnet_mask_cidr }}"
+    network_name: "{{ vsphere_vm_services_vswitch }}"
+    vapp_source_path: "{{ vsphere_linux_vapp_ovf }}"

inventory/group_vars/all/vsphere_samba.yml

@@ -14,32 +14,32 @@ vsphere_samba_vms:
     gateway: "{{ vsphere_vm_services_subnet }}.1"
     ip: "{{ vsphere_samba_vm_ips[0] }}"
     memory_mb: 512
-    netmask: 255.255.255.0
-    netmask_cidr: 24
-    network_name: VSS-VLAN-102
-    vapp_source_path: C:\vagrant\vApps\ubuntu_16.04_template.ovf
+    netmask: "{{ vsphere_vm_services_subnet_mask }}"
+    netmask_cidr: "{{ vsphere_vm_services_subnet_mask_cidr }}"
+    network_name: "{{ vsphere_vm_services_vswitch }}"
+    vapp_source_path: "{{ vsphere_linux_vapp_ovf }}"
   - vm_name: "samba-dc-01.{{ vsphere_pri_domain_name }}"
     cpus: 1
     deploy: true
     datastore: Datastore_1
     gateway: "{{ vsphere_vm_services_subnet }}.1"
     ip: "{{ vsphere_samba_vm_ips[1] }}"
     memory_mb: 512
-    netmask: 255.255.255.0
-    netmask_cidr: 24
-    network_name: VSS-VLAN-102
-    vapp_source_path: C:\vagrant\vApps\ubuntu_16.04_template.ovf
+    netmask: "{{ vsphere_vm_services_subnet_mask }}"
+    netmask_cidr: "{{ vsphere_vm_services_subnet_mask_cidr }}"
+    network_name: "{{ vsphere_vm_services_vswitch }}"
+    vapp_source_path: "{{ vsphere_linux_vapp_ovf }}"
   - vm_name: "samba-dc-02.{{ vsphere_pri_domain_name }}"
     cpus: 1
     deploy: true
     datastore: Datastore_1
     gateway: "{{ vsphere_vm_services_subnet }}.1"
     ip: "{{ vsphere_samba_vm_ips[2] }}"
     memory_mb: 512
-    netmask: 255.255.255.0
-    netmask_cidr: 24
-    network_name: VSS-VLAN-102
-    vapp_source_path: C:\vagrant\vApps\ubuntu_16.04_template.ovf
+    netmask: "{{ vsphere_vm_services_subnet_mask }}"
+    netmask_cidr: "{{ vsphere_vm_services_subnet_mask_cidr }}"
+    network_name: "{{ vsphere_vm_services_vswitch }}"
+    vapp_source_path: "{{ vsphere_linux_vapp_ovf }}"
 
 
 vsphere_samba_vms_inventory_file: ../inventory/vsphere_samba_vms.inv

inventory/group_vars/vsphere_dhcp_vms/isc-dhcp.yml

@@ -69,13 +69,13 @@ isc_dhcp_scopes:
   - subnet: "{{ vsphere_vm_services_subnet }}.0"
     default_lease_time: '{{ isc_dhcp_default_lease_time }}'
     max_lease_time: '{{ isc_dhcp_max_lease_time }}'
-    netmask: 255.255.255.0
+    netmask: "{{ vsphere_vm_services_subnet_mask }}"
     # Define scope specific options to configure
     options:
       - name: routers
         value: "{{ vsphere_vm_services_subnet }}.1"
       - name: subnet-mask
-        value: 255.255.255.0
+        value: "{{ vsphere_vm_services_subnet_mask }}"
       - name: broadcast-address
         value: "{{ vsphere_vm_services_subnet }}.255"
       - name: domain-name-servers