From f1df36145d0d2d27b210b027e9fd1008238297f3 Mon Sep 17 00:00:00 2001 From: Clark Boylan Date: Wed, 21 Apr 2021 10:37:33 -0700 Subject: [PATCH] Add inmotion cloud to cloud launcher This adds the new inmotion cloud to clouds.yaml files and the cloud launcher config. This cloud is running on an openstack as a service platform so we have quite a bit of freedom to make changes here within the resource limitations if necessary. Change-Id: I2aed6dffde4a1d6e3044c4bd8df4ca60065ae1ea --- .../host_vars/bridge.openstack.org.yaml | 43 +++++++++++++++++++ .../files/inmotion_cacert.pem | 20 +++++++++ .../configure-openstacksdk/tasks/main.yaml | 9 ++-- .../clouds/bridge_all_clouds.yaml.j2 | 24 +++++++++++ .../templates/clouds/nodepool_clouds.yaml.j2 | 13 ++++++ .../templates/group_vars/nodepool.yaml.j2 | 3 ++ .../host_vars/bridge.openstack.org.yaml.j2 | 6 +++ 7 files changed, 115 insertions(+), 3 deletions(-) create mode 100644 playbooks/roles/configure-openstacksdk/files/inmotion_cacert.pem diff --git a/inventory/service/host_vars/bridge.openstack.org.yaml b/inventory/service/host_vars/bridge.openstack.org.yaml index a266667ac8..3abd0fa9cc 100644 --- a/inventory/service/host_vars/bridge.openstack.org.yaml +++ b/inventory/service/host_vars/bridge.openstack.org.yaml @@ -156,6 +156,22 @@ cloud_launcher_profiles: network_name: openstackzuul-network1 cidr: '10.0.1.0/24' + - name: opendevci-networking + networks: + - name: opendevci-network1 + subnets: + - name: opendevci-subnet1 + network_name: opendevci-network1 + cidr: '10.0.1.0/24' + + - name: opendevzuul-networking + networks: + - name: opendevzuul-network1 + subnets: + - name: opendevzuul-subnet1 + network_name: opendevzuul-network1 + cidr: '10.0.1.0/24' + cloud_launcher_clouds: # ovh - name: openstackci-ovh-bhs1 @@ -324,3 +340,30 @@ cloud_launcher_clouds: profiles: - openstackci-keypairs - openstackci-security + + # InMotion Cloud + - name: opendevci-inmotion + oscc_cloud: opendevci-inmotion + region_name: iad3 + profiles: + - openstackci-keypairs + - openstackci-security + - opendevci-networking + routers: + - name: opendevci-router1 + network: External + interfaces: + - opendevci-subnet1 + + - name: opendevzuul-inmotion + oscc_cloud: opendevzuul-osuosl + region_name: RegionOne + profiles: + - openstackci-keypairs + - openstackci-security + - opendevzuul-networking + routers: + - name: opendevzuul-router1 + network: External + interfaces: + - opendevzuul-subnet1 diff --git a/playbooks/roles/configure-openstacksdk/files/inmotion_cacert.pem b/playbooks/roles/configure-openstacksdk/files/inmotion_cacert.pem new file mode 100644 index 0000000000..0cf2ed3f16 --- /dev/null +++ b/playbooks/roles/configure-openstacksdk/files/inmotion_cacert.pem @@ -0,0 +1,20 @@ +-----BEGIN CERTIFICATE----- +MIIDRTCCAi2gAwIBAgIURsemqD9ImPMU6VhJSiN1CyGifxAwDQYJKoZIhvcNAQEL +BQAwUjELMAkGA1UEBhMCVVMxCzAJBgNVBAgMAk5DMQwwCgYDVQQHDANSVFAxDjAM +BgNVBAoMBWtvbGxhMRgwFgYDVQQDDA8xNzMuMjMxLjI1NS4yMjgwHhcNMjEwNDIx +MTUyMTUyWhcNMzEwNDE5MTUyMTUyWjBSMQswCQYDVQQGEwJVUzELMAkGA1UECAwC +TkMxDDAKBgNVBAcMA1JUUDEOMAwGA1UECgwFa29sbGExGDAWBgNVBAMMDzE3My4y +MzEuMjU1LjIyODCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAPNdzpCV +ofCLK2bmn0ALtaz8VzihZJvLqxOlDaN12ufGiaL54gaWkbpis4jQPlFS3hkkjAvF +RvR+0dWH5rjjG2uIdVksav0WxulOIR5G0ssv/1XlXl4heqcuYLCrZDNq5QONV4rx +hzu3H1ZH5JyYc6ecDo9JfEauei5Xc0J3Et5IvvZzksD1BUq71Qhf/awH8Y/4KtRA +9kN1kSRDJT9WBsAwaACQ3bOQACyVQzCj1TJt5Ne0zkMRNdzmAxk8dLgMkx2pkE97 +8RaPzgP0P/G8f4Wk0usSWC3b6t/8INQ+x3Pgw2ec7IUcj+hYr4bzZmaD/VRP0zFw +pS3IxFZu4phqgzcCAwEAAaMTMBEwDwYDVR0RBAgwBocEref/5DANBgkqhkiG9w0B +AQsFAAOCAQEAJLu91X1AUpkR2nBSi90eeccuProFzQP5+M+F8+xhCg9rvp9gEUkn +QwwgQviyRJsj+YhOvCEtWPMMr4z70MNcXjuc52rkmiivo8kHGPLIlt50Qo9rzE/m +DjGcbrfx03KzSZWNyVeGmG9frDD6BYWn/jDH0qnuS/ubcTIqbR8PnRO6FGaD83Lx +rTCOeLCe/adGxjeW1B8aCmP2ck3CXX1a4oV6c8OfgfECZtqwqv+rTUGDprWJJyy8 +PJ35qM1X4araQeRbE6G7hZp/XOpKgHleHLTu1/t7dH+Em6hbxEJJkEO+dtd8t6Mp +rySdEAvwAWyGisaAiI9cO26erQrgMVueag== +-----END CERTIFICATE----- diff --git a/playbooks/roles/configure-openstacksdk/tasks/main.yaml b/playbooks/roles/configure-openstacksdk/tasks/main.yaml index d4d40632c1..eedbe6c40d 100644 --- a/playbooks/roles/configure-openstacksdk/tasks/main.yaml +++ b/playbooks/roles/configure-openstacksdk/tasks/main.yaml @@ -6,13 +6,16 @@ path: '{{ openstacksdk_config_dir }}' state: directory -- name: Install limestone cacert +- name: Install cloud cacerts copy: - dest: '{{ openstacksdk_config_dir }}/limestone_cacert.pem' + dest: '{{ openstacksdk_config_dir }}/{{ item }}' group: '{{ openstacksdk_config_group }}' mode: 0640 owner: '{{ openstacksdk_config_owner }}' - src: limestone_cacert.pem + src: '{{ item }}' + loop: + - limestone_cacert.pem + - inmotion_cacert.pem - name: Install the clouds config file template: diff --git a/playbooks/templates/clouds/bridge_all_clouds.yaml.j2 b/playbooks/templates/clouds/bridge_all_clouds.yaml.j2 index 4b7b2a7b0d..d4ea9862ae 100644 --- a/playbooks/templates/clouds/bridge_all_clouds.yaml.j2 +++ b/playbooks/templates/clouds/bridge_all_clouds.yaml.j2 @@ -264,3 +264,27 @@ clouds: project_id: '{{ clouds.opendevzuul_osuosl_project_id }}' user_domain_name: "Default" identity_api_version: 3 + opendevci-inmotion: + regions: + - iad3 + auth: + auth_url: 'https://173.231.255.228:5000' + username: '{{ clouds.opendevci_inmotion_username }}' + password: '{{ clouds.opendevci_inmotion_password }}' + project_name: 'opendevci' + project_id: '{{ clouds.opendevci_inmotion_project_id }}' + user_domain_name: "Default" + identity_api_version: 3 + cacert: {{ openstacksdk_config_dir }}/inmotion_cacert.pem + opendevzuul-inmotion: + regions: + - iad3 + auth: + auth_url: 'https://173.231.255.228:5000' + username: '{{ clouds.opendevzuul_inmotion_username }}' + password: '{{ clouds.opendevzuul_inmotion_password }}' + project_name: 'opendevzuul' + project_id: '{{ clouds.opendevzuul_inmotion_project_id }}' + user_domain_name: "Default" + identity_api_version: 3 + cacert: {{ openstacksdk_config_dir }}/inmotion_cacert.pem diff --git a/playbooks/templates/clouds/nodepool_clouds.yaml.j2 b/playbooks/templates/clouds/nodepool_clouds.yaml.j2 index 1514e35a1b..cfdc665562 100644 --- a/playbooks/templates/clouds/nodepool_clouds.yaml.j2 +++ b/playbooks/templates/clouds/nodepool_clouds.yaml.j2 @@ -159,3 +159,16 @@ clouds: floating_ip_source: None identity_api_version: 3 image_format: 'raw' + inmotion: + regions: + - iad3 + auth: + auth_url: 'https://173.231.255.228:5000' + username: '{{ nodepool_inmotion_username }}' + password: '{{ nodepool_inmotion_password }}' + project_name: 'opendevzuul' + project_id: '{{ nodepool_inmotion_project_id }}' + user_domain_name: "Default" + identity_api_version: 3 + image_format: 'raw' + cacert: {{ openstacksdk_config_dir }}/inmotion_cacert.pem diff --git a/playbooks/zuul/templates/group_vars/nodepool.yaml.j2 b/playbooks/zuul/templates/group_vars/nodepool.yaml.j2 index ca95cd965d..419b23a41a 100644 --- a/playbooks/zuul/templates/group_vars/nodepool.yaml.j2 +++ b/playbooks/zuul/templates/group_vars/nodepool.yaml.j2 @@ -61,3 +61,6 @@ nodepool_airship_password: password nodepool_osuosl_username: user nodepool_osuosl_password: password nodepool_osuosl_project_id: project +nodepool_inmotion_username: user +nodepool_inmotion_password: password +nodepool_inmotion_project_id: project diff --git a/playbooks/zuul/templates/host_vars/bridge.openstack.org.yaml.j2 b/playbooks/zuul/templates/host_vars/bridge.openstack.org.yaml.j2 index b6bd4f5c0f..55c77c8f5d 100644 --- a/playbooks/zuul/templates/host_vars/bridge.openstack.org.yaml.j2 +++ b/playbooks/zuul/templates/host_vars/bridge.openstack.org.yaml.j2 @@ -62,6 +62,12 @@ clouds: opendevzuul_osuosl_username: user opendevzuul_osuosl_password: password opendevzuul_osuosl_project_id: project + opendevci_inmotion_username: user + opendevci_inmotion_password: password + opendevci_inmotion_project_id: project + opendevzuul_inmotion_username: user + opendevzuul_inmotion_password: password + opendevzuul_inmotion_project_id: project gitea_kube_key: Z2l0ZWFfazhzX2tleQ== ansible_cron_disable_job: true