Merge pull request #2570 from avoidik/transfer-cloud-configs

Move cloud config configurations to proper location

roles/kubernetes/preinstall/defaults/main.yml

@@ -23,35 +23,6 @@ disable_ipv6_dns: false
 kube_cert_group: kube-cert
 kube_config_dir: /etc/kubernetes
 
-# For the openstack integration kubelet will need credentials to access
-# openstack apis like nova and cinder. Per default this values will be
-# read from the environment.
-openstack_auth_url: "{{ lookup('env','OS_AUTH_URL')  }}"
-openstack_username: "{{ lookup('env','OS_USERNAME')  }}"
-openstack_password: "{{ lookup('env','OS_PASSWORD')  }}"
-openstack_region: "{{ lookup('env','OS_REGION_NAME')  }}"
-openstack_tenant_id: "{{ lookup('env','OS_TENANT_ID')|default(lookup('env','OS_PROJECT_ID'),true)  }}"
-openstack_domain_name: "{{ lookup('env','OS_USER_DOMAIN_NAME') }}"
-openstack_domain_id: "{{ lookup('env','OS_USER_DOMAIN_ID') }}"
-
-# For the vsphere integration, kubelet will need credentials to access
-# vsphere apis
-# Documentation regarding these values can be found
-# https://github.com/kubernetes/kubernetes/blob/master/pkg/cloudprovider/providers/vsphere/vsphere.go#L105
-vsphere_vcenter_ip: "{{ lookup('env', 'VSPHERE_VCENTER') }}"
-vsphere_vcenter_port: "{{ lookup('env', 'VSPHERE_VCENTER_PORT') }}"
-vsphere_user: "{{ lookup('env', 'VSPHERE_USER') }}"
-vsphere_password: "{{ lookup('env', 'VSPHERE_PASSWORD') }}"
-vsphere_datacenter: "{{ lookup('env', 'VSPHERE_DATACENTER') }}"
-vsphere_datastore: "{{ lookup('env', 'VSPHERE_DATASTORE') }}"
-vsphere_working_dir: "{{ lookup('env', 'VSPHERE_WORKING_DIR') }}"
-vsphere_insecure: "{{ lookup('env', 'VSPHERE_INSECURE') }}"
-vsphere_resource_pool: "{{ lookup('env', 'VSPHERE_RESOURCE_POOL') }}"
-
-vsphere_scsi_controller_type: pvscsi
-# vsphere_public_network is name of the network the VMs are joined to
-vsphere_public_network: "{{ lookup('env', 'VSPHERE_PUBLIC_NETWORK')|default('') }}"
-
 # Container Linux by CoreOS cloud init config file to define /etc/resolv.conf content
 # for hostnet pods and infra needs
 resolveconf_cloud_init_conf: /etc/resolveconf_cloud_init.conf

roles/kubernetes/preinstall/tasks/azure-credential-check.yml

@@ -1,55 +0,0 @@
----
-- name: check azure_tenant_id value
-  fail:
-    msg: "azure_tenant_id is missing"
-  when: azure_tenant_id is not defined or azure_tenant_id == ""
-
-- name: check openstack_username value
-  fail:
-    msg: "azure_subscription_id is missing"
-  when: azure_subscription_id is not defined or azure_subscription_id == ""
-
-- name: check azure_aad_client_id value
-  fail:
-    msg: "azure_aad_client_id is missing"
-  when: azure_aad_client_id is not defined or azure_aad_client_id == ""
-
-- name: check azure_aad_client_secret value
-  fail:
-    msg: "azure_aad_client_secret is missing"
-  when: azure_aad_client_secret is not defined or azure_aad_client_secret == ""
-
-- name: check azure_resource_group value
-  fail:
-    msg: "azure_resource_group is missing"
-  when: azure_resource_group is not defined or azure_resource_group == ""
-
-- name: check azure_location value
-  fail:
-    msg: "azure_location is missing"
-  when: azure_location is not defined or azure_location == ""
-
-- name: check azure_subnet_name value
-  fail:
-    msg: "azure_subnet_name is missing"
-  when: azure_subnet_name is not defined or azure_subnet_name == ""
-
-- name: check azure_security_group_name value
-  fail:
-    msg: "azure_security_group_name is missing"
-  when: azure_security_group_name is not defined or azure_security_group_name == ""
-
-- name: check azure_vnet_name value
-  fail:
-    msg: "azure_vnet_name is missing"
-  when: azure_vnet_name is not defined or azure_vnet_name == ""
-
-- name: check azure_vnet_resource_group value
-  fail:
-    msg: "azure_vnet_resource_group is missing"
-  when: azure_vnet_resource_group is not defined or azure_vnet_resource_group == ""
-
-- name: check azure_route_table_name value
-  fail:
-    msg: "azure_route_table_name is missing"
-  when: azure_route_table_name is not defined or azure_route_table_name == ""

roles/kubernetes/preinstall/tasks/main.yml

@@ -76,14 +76,6 @@
     - cloud-provider
     - facts
 
-- include_tasks: "{{ cloud_provider }}-credential-check.yml"
-  when:
-    - cloud_provider is defined
-    - cloud_provider in [ 'openstack', 'azure', 'vsphere' ]
-  tags:
-    - cloud-provider
-    - facts
-
 - name: Create cni directories
   file:
     path: "{{ item }}"

roles/kubernetes/preinstall/tasks/openstack-credential-check.yml

@@ -1,25 +0,0 @@
----
-- name: check openstack_auth_url value
-  fail:
-    msg: "openstack_auth_url is missing"
-  when: openstack_auth_url is not defined or openstack_auth_url == ""
-
-- name: check openstack_username value
-  fail:
-    msg: "openstack_username is missing"
-  when: openstack_username is not defined or openstack_username == ""
-
-- name: check openstack_password value
-  fail:
-    msg: "openstack_password is missing"
-  when: openstack_password is not defined or openstack_password == ""
-
-- name: check openstack_region value
-  fail:
-    msg: "openstack_region is missing"
-  when: openstack_region is not defined or openstack_region == ""
-
-- name: check openstack_tenant_id value
-  fail:
-    msg: "openstack_tenant_id is missing"
-  when: openstack_tenant_id is not defined or openstack_tenant_id == ""

roles/kubernetes/preinstall/tasks/vsphere-credential-check.yml

@@ -1,22 +0,0 @@
----
-- name: check vsphere environment variables
-  fail:
-    msg: "{{ item.name }} is missing"
-  when: item.value is not defined or item.value == ''
-  with_items:
-    - name: vsphere_vcenter_ip
-      value: "{{ vsphere_vcenter_ip }}"
-    - name: vsphere_vcenter_port
-      value: "{{ vsphere_vcenter_port }}"
-    - name: vsphere_user
-      value: "{{ vsphere_user }}"
-    - name: vsphere_password
-      value: "{{ vsphere_password }}"
-    - name: vsphere_datacenter
-      value: "{{ vsphere_datacenter }}"
-    - name: vsphere_datastore
-      value: "{{ vsphere_datastore }}"
-    - name: vsphere_working_dir
-      value: "{{ vsphere_working_dir }}"
-    - name: vsphere_insecure
-      value: "{{ vsphere_insecure }}"

roles/kubernetes/preinstall/templates/azure-cloud-config.j2

@@ -1,13 +0,0 @@
-{
-  "tenantId": "{{ azure_tenant_id }}",
-  "subscriptionId": "{{ azure_subscription_id }}",
-  "aadClientId": "{{ azure_aad_client_id }}",
-  "aadClientSecret": "{{ azure_aad_client_secret }}",
-  "resourceGroup": "{{ azure_resource_group }}",
-  "location": "{{ azure_location }}",
-  "subnetName": "{{ azure_subnet_name }}",
-  "securityGroupName": "{{ azure_security_group_name }}",
-  "vnetName": "{{ azure_vnet_name }}",
-  "vnetResourceGroup": "{{ azure_vnet_resource_group }}",
-  "routeTableName": "{{ azure_route_table_name }}"
-}

roles/kubernetes/preinstall/templates/openstack-cloud-config.j2

@@ -1,38 +0,0 @@
-[Global]
-auth-url="{{ openstack_auth_url }}"
-username="{{ openstack_username }}"
-password="{{ openstack_password }}"
-region="{{ openstack_region }}"
-tenant-id="{{ openstack_tenant_id }}"
-{% if openstack_domain_name is defined and openstack_domain_name != "" %}
-domain-name="{{ openstack_domain_name }}"
-{% elif openstack_domain_id is defined and openstack_domain_id != "" %}
-domain-id ="{{ openstack_domain_id }}"
-{% endif %}
-
-{% if openstack_blockstorage_version is defined %}
-[BlockStorage]
-bs-version={{ openstack_blockstorage_version }}
-{% endif %}
-
-{% if openstack_lbaas_enabled and openstack_lbaas_subnet_id is defined %}
-[LoadBalancer]
-subnet-id={{ openstack_lbaas_subnet_id }}
-{% if openstack_lbaas_floating_network_id is defined %}
-floating-network-id={{ openstack_lbaas_floating_network_id }}
-{% endif %}
-{% if openstack_lbaas_use_octavia is defined %}
-use-octavia={{ openstack_lbaas_use_octavia }}
-{% endif %}
-{% if openstack_lbaas_method is defined %}
-lb-method={{ openstack_lbaas_method }}
-{% endif %}
-{% if openstack_lbaas_provider is defined %}
-lb-provider={{ openstack_lbaas_provider }}
-{% endif %}
-
-create-monitor={{ openstack_lbaas_create_monitor }}
-monitor-delay={{ openstack_lbaas_monitor_delay }}
-monitor-timeout={{ openstack_lbaas_monitor_timeout }}
-monitor-max-retries={{ openstack_lbaas_monitor_max_retries }}
-{% endif %}

roles/kubernetes/preinstall/templates/vsphere-cloud-config.j2

@@ -1,41 +0,0 @@
-[Global]
-user = "{{ vsphere_user }}"
-password = "{{ vsphere_password }}"
-port = {{ vsphere_vcenter_port }}
-insecure-flag = {{ vsphere_insecure }}
-
-{% if kube_version | version_compare('v1.9.2', '>=') %}
-datacenters = "{{ vsphere_datacenter }}"
-{% else %}
-datastore = "{{ vsphere_datastore }}"
-datacenter = "{{ vsphere_datacenter }}"
-working-dir = "{{ vsphere_working_dir }}"
-server = "{{ vsphere_vcenter_ip }}"
-{% if vsphere_vm_uuid is defined and vsphere_vm_uuid != ""  %}
-vm-uuid = "{{ vsphere_vm_uuid }}"
-{% endif %}
-{% endif %}
-
-{% if kube_version | version_compare('v1.9.2', '>=') %}
-
-[VirtualCenter "{{ vsphere_vcenter_ip }}"]
-
-
-[Workspace]
-server = "{{ vsphere_vcenter_ip }}"
-datacenter = "{{ vsphere_datacenter }}"
-folder = "{{ vsphere_working_dir }}"
-default-datastore = "{{ vsphere_datastore }}"
-{% if vsphere_resource_pool is defined and vsphere_resource_pool != ""  %}
-resourcepool-path = "{{ vsphere_resource_pool }}"
-{% endif %}
-{% endif %}
-
-
-[Disk]
-scsicontrollertype = {{ vsphere_scsi_controller_type }}
-
-{% if vsphere_public_network is defined and vsphere_public_network != ""  %}
-[Network]
-public-network = {{ vsphere_public_network }}
-{% endif %}