diff --git a/playbooks/templates/clouds/bridge_all_clouds.yaml.j2 b/playbooks/templates/clouds/bridge_all_clouds.yaml.j2 index c8e71d713b..0c6cb5a73b 100644 --- a/playbooks/templates/clouds/bridge_all_clouds.yaml.j2 +++ b/playbooks/templates/clouds/bridge_all_clouds.yaml.j2 @@ -276,3 +276,29 @@ clouds: user_domain_name: openstack-infra interface: public identity_api_version: '3' + openstackci-fortnebula: + regions: + - regionOne + api_timeout: 60 + auth: + auth_url: https://openstack.fortnebula.com:13000/v3 + username: '{{ clouds.openstackci_fortnebula_username }}' + password: '{{ clouds.openstackci_fortnebula_password }}' + project_name: '{{ clouds.openstackci_fortnebula_project_name }}' + project_domain_name: Default + user_domain_name: Default + identity_api_version: 3 + image_format: 'raw' + openstackzuul-fortnebula: + regions: + - regionOne + api_timeout: 60 + auth: + auth_url: https://openstack.fortnebula.com:13000/v3 + username: '{{ clouds.openstackzuul_fortnebula_username }}' + password: '{{ clouds.openstackzuul_fortnebula_password }}' + project_name: '{{ clouds.openstackzuul_fortnebula_project_name }}' + project_domain_name: Default + user_domain_name: Default + identity_api_version: 3 + image_format: 'raw' diff --git a/playbooks/templates/clouds/bridge_clouds.yaml.j2 b/playbooks/templates/clouds/bridge_clouds.yaml.j2 index 2022dd14ab..b073d5c8d7 100644 --- a/playbooks/templates/clouds/bridge_clouds.yaml.j2 +++ b/playbooks/templates/clouds/bridge_clouds.yaml.j2 @@ -146,3 +146,16 @@ clouds: user_domain_name: openstack-infra interface: public identity_api_version: '3' + openstackci-fortnebula: + regions: + - regionOne + api_timeout: 60 + auth: + auth_url: https://openstack.fortnebula.com:13000/v3 + username: '{{ clouds.openstackci_fortnebula_username }}' + password: '{{ clouds.openstackci_fortnebula_password }}' + project_name: '{{ clouds.openstackci_fortnebula_project_name }}' + project_domain_name: Default + user_domain_name: Default + identity_api_version: 3 + image_format: 'raw' diff --git a/playbooks/templates/clouds/nodepool_builder_clouds.yaml.j2 b/playbooks/templates/clouds/nodepool_builder_clouds.yaml.j2 index db1aa998b4..8759e3c32b 100644 --- a/playbooks/templates/clouds/nodepool_builder_clouds.yaml.j2 +++ b/playbooks/templates/clouds/nodepool_builder_clouds.yaml.j2 @@ -169,3 +169,16 @@ clouds: project_domain_name: openstack-infra user_domain_name: openstack-infra interface: public + fortnebula: + regions: + - regionOne + api_timeout: 60 + auth: + auth_url: https://openstack.fortnebula.com:13000/v3 + username: '{{ nodepool_fortnebula_username }}' + password: '{{ nodepool_fortnebula_password }}' + project_name: '{{ nodepool_fortnebula_project }}' + project_domain_name: Default + user_domain_name: Default + identity_api_version: 3 + image_format: 'raw' diff --git a/playbooks/templates/clouds/nodepool_launcher_clouds.yaml.j2 b/playbooks/templates/clouds/nodepool_launcher_clouds.yaml.j2 index caadeac6b1..bb0ed37a30 100644 --- a/playbooks/templates/clouds/nodepool_launcher_clouds.yaml.j2 +++ b/playbooks/templates/clouds/nodepool_launcher_clouds.yaml.j2 @@ -146,3 +146,16 @@ clouds: project_domain_name: openstack-infra user_domain_name: openstack-infra interface: public + fortnebula: + regions: + - regionOne + api_timeout: 60 + auth: + auth_url: https://openstack.fortnebula.com:13000/v3 + username: '{{ nodepool_fortnebula_username }}' + password: '{{ nodepool_fortnebula_password }}' + project_name: '{{ nodepool_fortnebula_project }}' + project_domain_name: Default + user_domain_name: Default + identity_api_version: 3 + image_format: 'raw' diff --git a/playbooks/zuul/templates/group_vars/control-plane-clouds.yaml.j2 b/playbooks/zuul/templates/group_vars/control-plane-clouds.yaml.j2 index b8db828e23..e9cbaa682e 100644 --- a/playbooks/zuul/templates/group_vars/control-plane-clouds.yaml.j2 +++ b/playbooks/zuul/templates/group_vars/control-plane-clouds.yaml.j2 @@ -58,3 +58,9 @@ clouds: openstackzuul_arm64ci_username: user openstackzuul_arm64ci_password: password openstackzuul_arm64ci_project_name: project + openstackci_fortnebula_username: user + openstackci_fortnebula_password: password + openstackci_fortnebula_project_name: project + openstackzuul_fortnebula_username: user + openstackzuul_fortnebula_password: password + openstackzuul_fortnebula_project_name: project diff --git a/playbooks/zuul/templates/group_vars/nodepool.yaml.j2 b/playbooks/zuul/templates/group_vars/nodepool.yaml.j2 index 21393b5ab8..33c51e9ac9 100644 --- a/playbooks/zuul/templates/group_vars/nodepool.yaml.j2 +++ b/playbooks/zuul/templates/group_vars/nodepool.yaml.j2 @@ -29,3 +29,6 @@ nodepool_packethost_project: project nodepool_arm64ci_username: user nodepool_arm64ci_password: password nodepool_arm64ci_project: project +nodepool_fortnebula_username: user +nodepool_fortnebula_password: password +nodepool_fortnebula_project: 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 8a10d384ac..b14ce0022e 100644 --- a/playbooks/zuul/templates/host_vars/bridge.openstack.org.yaml.j2 +++ b/playbooks/zuul/templates/host_vars/bridge.openstack.org.yaml.j2 @@ -58,5 +58,11 @@ clouds: openstackzuul_arm64ci_username: user openstackzuul_arm64ci_password: password openstackzuul_arm64ci_project_name: project + openstackci_fortnebula_username: user + openstackci_fortnebula_password: password + openstackci_fortnebula_project_name: project + openstackzuul_fortnebula_username: user + openstackzuul_fortnebula_password: password + openstackzuul_fortnebula_project_name: project gitea_kube_key: Z2l0ZWFfazhzX2tleQ== ansible_cron_install_cron: false