updated aks and cdn creation scripts

env_vars/env-dev.yml

@@ -1,6 +1,6 @@
 ---
 # Add here variables specific to DEV environment
-"az_environment": "development"
+"az_environment": "dev"
 
 "aks_loadbalancer_ip": "10.240.0.9"
 

roles/aks-setup/tasks/main.yml

@@ -1,18 +1,18 @@
 ---
-- name: "Create {{project}}-{{ az_environment }}-aks-rg"
+- name: "Create {{resource_group_name}}"
   command: "az group create \
-    --name {{project}}-{{ az_environment }}-aks-rg \
+    --name {{resource_group_name}} \
     --location {{ az_region }}"
   delegate_to: localhost
   ignore_errors: "{{ ansible_check_mode }}"
 
 - name: "Create {{project}}-{{ az_environment }}-aks"
   command: "az aks create \
-    --resource-group {{project}}-{{ az_environment }}-aks-rg \
+    --resource-group {{resource_group_name}} \
     --name {{project}}-{{ az_environment }}-aks \
-    --node-count 12 \
-    --node-vm-size Standard_F8s_v2 \
-    --kubernetes-version 1.14.6 \
+    --node-count {{node_count}} \
+    --node-vm-size {{node_vm_size}} \
+    --kubernetes-version {{kubernetes_version}} \
     --enable-addons monitoring \
     --generate-ssh-keys \
     --service-principal {{service_principal}} \

roles/cdn-setup/defaults/main.yml

@@ -1,16 +1,7 @@
 ---
 # defaults file for digitransit-azure-cdn
-rg_env_prefix: "{{project}}-{{az_environment}}{{gateway_name_postfix}}"
-resource_group_name: "{{rg_env_prefix}}-appgw-rg"
+resource_group_name: "{{project}}-{{az_environment}}-cdn"
 cdn_sku: Standard_Verizon
 origin_host: dev-api.digitransit.fi
 origin_header: dev-api.digitransit.fi
-origin_path: /
-compression: true
 mime_types: "text/plain text/html text/css text/javascript application/x-javascript application/javascript application/json application/xml"
-https: false
-http: false
-http_port: 80
-https_port: 443
-#this is more for logical naming of the object its pointing to i.e the endpoint
-endpoint: origin

roles/cdn-setup/tasks/main.yml

@@ -1,19 +1,26 @@
 ---
-- name: "Create {{rg_env_prefix}}-cdn"
+- name: "Create {{resource_group_name}}"
+  command: "az group create \
+    --name {{resource_group_name}} \
+    --location {{ az_region }}"
+  delegate_to: localhost
+  ignore_errors: "{{ ansible_check_mode }}"
+
+- name: "Create {{project}}-{{az_environment}}-cdn"
   command: "az cdn profile create \
     --resource-group {{resource_group_name}} \
-    --name {{rg_env_prefix}}-cdn \
+    --name {{project}}-{{az_environment}}-cdn \
     --location {{az_region}} \
     --sku {{cdn_sku}}"
   delegate_to: localhost
   ignore_errors: "{{ ansible_check_mode }}"
 
-- name: "Create {{rg_env_prefix}}-cdn-origin"
+- name: "Create {{project}}-{{az_environment}}-cdn-origin"
   command: "az cdn endpoint create \
     --origin {{origin_host}} \
     --resource-group {{resource_group_name}} \
-    --name {{rg_env_prefix}}-cdn-origin \
-    --profile-name {{rg_env_prefix}}-cdn \
+    --name {{project}}-{{az_environment}}-cdn-origin \
+    --profile-name {{project}}-{{az_environment}}-cdn \
     --content-types-to-compress {{mime_types}} \
     --enable-compression \
     --origin-host-header {{origin_header}} \