diff --git a/cloud/ansible/openstack/clouds.yaml b/cloud/ansible/openstack/clouds.yaml new file mode 100644 index 00000000..fd0b2831 --- /dev/null +++ b/cloud/ansible/openstack/clouds.yaml @@ -0,0 +1,8 @@ +clouds: + open-telekom-cloud: + profile: otc + auth: + project_name: eu-de_your_project + username: your_api_user + password: your_password + user_domain_name: OTC-EU-DE-000000000010000XXXXX diff --git a/cloud/ansible/openstack/roles/deploy/tasks/main.yaml b/cloud/ansible/openstack/roles/deploy/tasks/main.yaml index 7e7826b8..bd68b1bf 100644 --- a/cloud/ansible/openstack/roles/deploy/tasks/main.yaml +++ b/cloud/ansible/openstack/roles/deploy/tasks/main.yaml @@ -2,51 +2,26 @@ shell: echo t-pot-ansible-$(pwgen -ns 6 -1) register: tpot_name -- name: Import OpenStack authentication variables - include_vars: - file: roles/deploy/vars/os_auth.yaml - no_log: true - - name: Create security group os_security_group: - auth: - auth_url: "{{ auth_url }}" - username: "{{ username }}" - password: "{{ password }}" - project_name: "{{ project_name }}" - os_user_domain_name: "{{ os_user_domain_name }}" + cloud: open-telekom-cloud name: sg-tpot-any description: tpot any-any - name: Add rules to security group os_security_group_rule: - auth: - auth_url: "{{ auth_url }}" - username: "{{ username }}" - password: "{{ password }}" - project_name: "{{ project_name }}" - os_user_domain_name: "{{ os_user_domain_name }}" + cloud: open-telekom-cloud security_group: sg-tpot-any remote_ip_prefix: 0.0.0.0/0 - name: Create network os_network: - auth: - auth_url: "{{ auth_url }}" - username: "{{ username }}" - password: "{{ password }}" - project_name: "{{ project_name }}" - os_user_domain_name: "{{ os_user_domain_name }}" + cloud: open-telekom-cloud name: network-tpot - name: Create subnet os_subnet: - auth: - auth_url: "{{ auth_url }}" - username: "{{ username }}" - password: "{{ password }}" - project_name: "{{ project_name }}" - os_user_domain_name: "{{ os_user_domain_name }}" + cloud: open-telekom-cloud network_name: network-tpot name: subnet-tpot cidr: 192.168.0.0/24 @@ -56,26 +31,15 @@ - name: Create router os_router: - auth: - auth_url: "{{ auth_url }}" - username: "{{ username }}" - password: "{{ password }}" - project_name: "{{ project_name }}" - os_user_domain_name: "{{ os_user_domain_name }}" + cloud: open-telekom-cloud name: router-tpot interfaces: - subnet-tpot - name: Launch an instance os_server: - auth: - auth_url: "{{ auth_url }}" - username: "{{ username }}" - password: "{{ password }}" - project_name: "{{ project_name }}" - os_user_domain_name: "{{ os_user_domain_name }}" + cloud: open-telekom-cloud name: "{{ tpot_name.stdout }}" - region_name: "{{ region_name }}" availability_zone: "{{ availability_zone }}" image: "{{ image }}" boot_from_volume: yes diff --git a/cloud/ansible/openstack/roles/deploy/vars/main.yaml b/cloud/ansible/openstack/roles/deploy/vars/main.yaml index 0854d0ed..d2b0664a 100644 --- a/cloud/ansible/openstack/roles/deploy/vars/main.yaml +++ b/cloud/ansible/openstack/roles/deploy/vars/main.yaml @@ -1,4 +1,3 @@ -region_name: eu-de availability_zone: eu-de-03 image: Standard_Debian_10_latest volume_size: 128 diff --git a/cloud/ansible/openstack/roles/deploy/vars/os_auth.yaml b/cloud/ansible/openstack/roles/deploy/vars/os_auth.yaml deleted file mode 100644 index fdb1a29b..00000000 --- a/cloud/ansible/openstack/roles/deploy/vars/os_auth.yaml +++ /dev/null @@ -1,5 +0,0 @@ -auth_url: https://iam.eu-de.otc.t-systems.com/v3 -username: your_api_user -password: your_password -project_name: eu-de_your_project -os_user_domain_name: OTC-EU-DE-000000000010000XXXXX