diff --git a/roles/os_container_clusters/README.md b/roles/os_container_clusters/README.md index ee69dd8..f3adead 100644 --- a/roles/os_container_clusters/README.md +++ b/roles/os_container_clusters/README.md @@ -21,6 +21,8 @@ virtualenv. `os_container_clusters_auth` is a dict containing authentication information compatible with the `auth` argument of `openstack.cloud` Ansible modules. +`os_container_clusters_region` is an optional name of an OpenStack region. + `os_container_clusters_cacert` is an optional path to a CA certificate bundle. `os_container_clusters_templates` is a list of Magnum container cluster diff --git a/roles/os_container_clusters/tasks/main.yml b/roles/os_container_clusters/tasks/main.yml index c5bec09..33b81da 100644 --- a/roles/os_container_clusters/tasks/main.yml +++ b/roles/os_container_clusters/tasks/main.yml @@ -15,6 +15,7 @@ ansible_python_interpreter: "{{ os_container_clusters_venv ~ '/bin/python' if os_container_clusters_venv != None else old_ansible_python_interpreter }}" openstack.cloud.coe_cluster_template: auth: "{{ os_container_clusters_auth }}" + region_name: "{{ os_container_clusters_region | default(omit) }}" auth_type: "{{ os_container_clusters_auth_type }}" cacert: "{{ os_container_clusters_cacert | default(omit) }}" interface: "{{ os_container_clusters_interface | default(omit, true) }}" diff --git a/roles/os_deploy_templates/README.md b/roles/os_deploy_templates/README.md index 0455b7c..54659d7 100644 --- a/roles/os_deploy_templates/README.md +++ b/roles/os_deploy_templates/README.md @@ -27,6 +27,8 @@ the `auth_type` argument of `openstack.cloud` Ansible modules. `os_deploy_templates_auth` is a dict containing authentication information compatible with the `auth` argument of `openstack.cloud` Ansible modules. +`os_deploy_templates_region` is an optional name of an OpenStack region. + `os_deploy_templates_cacert` is an optional path to a CA certificate bundle. `os_deploy_templates_interface` is the endpoint URL type to fetch from the service diff --git a/roles/os_deploy_templates/tasks/deploy_templates.yml b/roles/os_deploy_templates/tasks/deploy_templates.yml index 8037d8c..a05bd05 100644 --- a/roles/os_deploy_templates/tasks/deploy_templates.yml +++ b/roles/os_deploy_templates/tasks/deploy_templates.yml @@ -3,6 +3,7 @@ openstack.cloud.baremetal_deploy_template: auth_type: "{{ os_deploy_templates_auth_type }}" auth: "{{ os_deploy_templates_auth }}" + region_name: "{{ os_deploy_templates_region | default(omit) }}" cacert: "{{ os_deploy_templates_cacert | default(omit) }}" interface: "{{ os_deploy_templates_interface | default(omit, true) }}" name: "{{ item.name | default(omit) }}" diff --git a/roles/os_flavors/README.md b/roles/os_flavors/README.md index c469af2..064ac4b 100644 --- a/roles/os_flavors/README.md +++ b/roles/os_flavors/README.md @@ -21,6 +21,8 @@ the `auth_type` argument of `openstack.cloud` Ansible modules. `os_flavors_auth` is a dict containing authentication information compatible with the `auth` argument of `openstack.cloud` Ansible modules. +`os_flavors_region` is an optional name of an OpenStack region. + `os_flavors_cacert` is an optional path to a CA certificate bundle. `os_flavors_interface` is the endpoint URL type to fetch from the service diff --git a/roles/os_flavors/tasks/flavors.yml b/roles/os_flavors/tasks/flavors.yml index b7d1765..0d6ad28 100644 --- a/roles/os_flavors/tasks/flavors.yml +++ b/roles/os_flavors/tasks/flavors.yml @@ -3,6 +3,7 @@ openstack.cloud.compute_flavor: auth_type: "{{ os_flavors_auth_type }}" auth: "{{ os_flavors_auth }}" + region_name: "{{ os_flavors_region | default(omit) }}" cacert: "{{ os_flavors_cacert | default(omit) }}" interface: "{{ os_flavors_interface | default(omit, true) }}" name: "{{ item.name }}" @@ -22,6 +23,7 @@ openstack.cloud.compute_flavor_access: auth_type: "{{ os_flavors_auth_type }}" auth: "{{ os_flavors_auth }}" + region_name: "{{ os_flavors_region | default(omit) }}" cacert: "{{ os_flavors_cacert | default(omit) }}" interface: "{{ os_flavors_interface | default(omit, true) }}" name: "{{ item.0.name }}" diff --git a/roles/os_host_aggregates/README.md b/roles/os_host_aggregates/README.md index 5f9cbfe..e0b6a08 100644 --- a/roles/os_host_aggregates/README.md +++ b/roles/os_host_aggregates/README.md @@ -21,6 +21,8 @@ virtualenv. `os_host_aggregates_auth` is a dict containing authentication information compatible with the `auth` argument of `openstack.cloud` Ansible modules. +`os_host_aggregates_region` is an optional name of an OpenStack region. + `os_host_aggregates_cacert` is an optional path to a CA certificate bundle. `os_host_aggregates_interface` is the endpoint URL type to fetch from the diff --git a/roles/os_host_aggregates/tasks/host-aggregates.yml b/roles/os_host_aggregates/tasks/host-aggregates.yml index ecb85d9..613864a 100644 --- a/roles/os_host_aggregates/tasks/host-aggregates.yml +++ b/roles/os_host_aggregates/tasks/host-aggregates.yml @@ -3,6 +3,7 @@ openstack.cloud.host_aggregate: auth_type: "{{ os_host_aggregates_auth_type }}" auth: "{{ os_host_aggregates_auth }}" + region_name: "{{ os_host_aggregates_region | default(omit) }}" cacert: "{{ os_host_aggregates_cacert | default(omit) }}" interface: "{{ os_host_aggregates_interface | default(omit, true) }}" name: "{{ item.name }}" diff --git a/roles/os_networks/README.md b/roles/os_networks/README.md index caa44b6..8ad07e0 100644 --- a/roles/os_networks/README.md +++ b/roles/os_networks/README.md @@ -21,6 +21,8 @@ Role Variables `os_networks_auth` is a dict containing authentication information compatible with the `auth` argument of `openstack.cloud` Ansible modules. +`os_networks_region` is an optional name of an OpenStack region. + `os_networks_cacert` is an optional path to a CA certificate bundle. `os_networks_cloud` is an optional name of a cloud in `clouds.yaml`. diff --git a/roles/os_networks/tasks/networks.yml b/roles/os_networks/tasks/networks.yml index 8b314a7..b9b45ea 100644 --- a/roles/os_networks/tasks/networks.yml +++ b/roles/os_networks/tasks/networks.yml @@ -3,6 +3,7 @@ openstack.cloud.router: auth_type: "{{ os_networks_auth_type }}" auth: "{{ os_networks_auth }}" + region_name: "{{ os_networks_region | default(omit) }}" cacert: "{{ os_networks_cacert | default(omit) }}" cloud: "{{ os_networks_cloud | default(omit) }}" interface: "{{ os_networks_interface | default(omit, true) }}" @@ -16,6 +17,7 @@ openstack.cloud.network: auth_type: "{{ os_networks_auth_type }}" auth: "{{ os_networks_auth }}" + region_name: "{{ os_networks_region | default(omit) }}" cacert: "{{ os_networks_cacert | default(omit) }}" cloud: "{{ os_networks_cloud | default(omit) }}" interface: "{{ os_networks_interface | default(omit, true) }}" @@ -36,6 +38,7 @@ openstack.cloud.subnet: auth_type: "{{ os_networks_auth_type }}" auth: "{{ os_networks_auth }}" + region_name: "{{ os_networks_region | default(omit) }}" cacert: "{{ os_networks_cacert | default(omit) }}" cloud: "{{ os_networks_cloud | default(omit) }}" interface: "{{ os_networks_interface | default(omit, true) }}" @@ -72,6 +75,7 @@ # openstack.cloud.router: # auth_type: "{{ os_networks_auth_type }}" # auth: "{{ os_networks_auth }}" +# region_name: "{{ os_networks_region | default(omit) }}" # cacert: "{{ os_networks_cacert | default(omit) }}" # cloud: "{{ os_networks_cloud | default(omit) }}" # interface: "{{ os_networks_interface | default(omit, true) }}" @@ -100,6 +104,7 @@ openstack.cloud.security_group: auth_type: "{{ os_networks_auth_type }}" auth: "{{ os_networks_auth }}" + region_name: "{{ os_networks_region | default(omit) }}" cacert: "{{ os_networks_cacert | default(omit) }}" cloud: "{{ os_networks_cloud | default(omit) }}" interface: "{{ os_networks_interface | default(omit, true) }}" @@ -114,6 +119,7 @@ openstack.cloud.security_group_rule: auth_type: "{{ os_networks_auth_type }}" auth: "{{ os_networks_auth }}" + region_name: "{{ os_networks_region | default(omit) }}" cacert: "{{ os_networks_cacert | default(omit) }}" cloud: "{{ os_networks_cloud | default(omit) }}" interface: "{{ os_networks_interface | default(omit, true) }}" diff --git a/roles/os_networks/tasks/rbac.yml b/roles/os_networks/tasks/rbac.yml index 473e643..404380e 100644 --- a/roles/os_networks/tasks/rbac.yml +++ b/roles/os_networks/tasks/rbac.yml @@ -7,6 +7,7 @@ openstack.cloud.networks_info: auth_type: "{{ os_networks_auth_type }}" auth: "{{ os_networks_auth }}" + region_name: "{{ os_networks_region | default(omit) }}" cacert: "{{ os_networks_cacert | default(omit) }}" cloud: "{{ os_networks_cloud | default(omit) }}" interface: "{{ os_networks_interface | default(omit, true) }}" @@ -26,6 +27,7 @@ openstack.cloud.project_info: auth_type: "{{ os_networks_auth_type }}" auth: "{{ os_networks_auth }}" + region_name: "{{ os_networks_region | default(omit) }}" cacert: "{{ os_networks_cacert | default(omit) }}" cloud: "{{ os_networks_cloud | default(omit) }}" interface: "{{ os_networks_interface | default(omit, true) }}" @@ -41,6 +43,7 @@ openstack.cloud.project_info: auth_type: "{{ os_networks_auth_type }}" auth: "{{ os_networks_auth }}" + region_name: "{{ os_networks_region | default(omit) }}" cacert: "{{ os_networks_cacert | default(omit) }}" cloud: "{{ os_networks_cloud | default(omit) }}" interface: "{{ os_networks_interface | default(omit, true) }}" @@ -59,6 +62,7 @@ openstack.cloud.neutron_rbac_policy: auth_type: "{{ os_networks_auth_type }}" auth: "{{ os_networks_auth }}" + region_name: "{{ os_networks_region | default(omit) }}" cacert: "{{ os_networks_cacert | default(omit) }}" cloud: "{{ os_networks_cloud | default(omit) }}" interface: "{{ os_networks_interface | default(omit, true) }}" diff --git a/roles/os_networks/tasks/router_workaround.yml b/roles/os_networks/tasks/router_workaround.yml index 84f1a5a..4fbf718 100644 --- a/roles/os_networks/tasks/router_workaround.yml +++ b/roles/os_networks/tasks/router_workaround.yml @@ -12,6 +12,7 @@ name: "{{ item.network }}" auth_type: "{{ os_networks_auth_type }}" auth: "{{ os_networks_auth }}" + region_name: "{{ os_networks_region | default(omit) }}" cacert: "{{ os_networks_cacert | default(omit) }}" cloud: "{{ os_networks_cloud | default(omit) }}" interface: "{{ os_networks_interface | default(omit, true) }}" @@ -22,6 +23,7 @@ openstack.cloud.router: auth_type: "{{ os_networks_auth_type }}" auth: "{{ os_networks_auth }}" + region_name: "{{ os_networks_region | default(omit) }}" cacert: "{{ os_networks_cacert | default(omit) }}" cloud: "{{ os_networks_cloud | default(omit) }}" interface: "{{ os_networks_interface | default(omit, true) }}" diff --git a/roles/os_projects/README.md b/roles/os_projects/README.md index feb0b3b..a440bc0 100644 --- a/roles/os_projects/README.md +++ b/roles/os_projects/README.md @@ -21,6 +21,8 @@ the `auth_type` argument of `openstack.cloud` Ansible modules. `os_projects_auth` is a dict containing authentication information compatible with the `auth` argument of `openstack.cloud` Ansible modules. +`os_projects_region` is an optional name of an OpenStack region. + `os_projects_cacert` is an optional path to a CA certificate bundle. `os_projects_cloud` is an optional name of a cloud in `clouds.yaml`. diff --git a/roles/os_projects/tasks/projects.yml b/roles/os_projects/tasks/projects.yml index e768377..54c6fa4 100644 --- a/roles/os_projects/tasks/projects.yml +++ b/roles/os_projects/tasks/projects.yml @@ -3,6 +3,7 @@ openstack.cloud.identity_domain: auth_type: "{{ os_projects_auth_type }}" auth: "{{ os_projects_admin_auth }}" + region_name: "{{ os_projects_region | default(omit) }}" cacert: "{{ os_projects_cacert | default(omit) }}" cloud: "{{ os_projects_cloud | default(omit) }}" interface: "{{ os_projects_interface | default(omit, true) }}" @@ -85,6 +86,7 @@ openstack.cloud.project: auth_type: "{{ os_projects_auth_type }}" auth: "{{ os_projects_admin_auth }}" + region_name: "{{ os_projects_region | default(omit) }}" cacert: "{{ os_projects_cacert | default(omit) }}" cloud: "{{ os_projects_cloud | default(omit) }}" interface: "{{ os_projects_interface | default(omit, true) }}" @@ -105,6 +107,7 @@ openstack.cloud.identity_role: auth_type: "{{ os_projects_auth_type }}" auth: "{{ os_projects_admin_auth }}" + region_name: "{{ os_projects_region | default(omit) }}" cacert: "{{ os_projects_cacert | default(omit) }}" cloud: "{{ os_projects_cloud | default(omit) }}" interface: "{{ os_projects_interface | default(omit, true) }}" @@ -173,6 +176,7 @@ openstack.cloud.quota: auth_type: "{{ os_projects_auth_type }}" auth: "{{ os_projects_admin_auth }}" + region_name: "{{ os_projects_region | default(omit) }}" cacert: "{{ os_projects_cacert | default(omit) }}" cloud: "{{ os_projects_cloud | default(omit) }}" interface: "{{ os_projects_interface | default(omit, true) }}" diff --git a/roles/os_projects/tasks/users.yml b/roles/os_projects/tasks/users.yml index f090f25..a25a542 100644 --- a/roles/os_projects/tasks/users.yml +++ b/roles/os_projects/tasks/users.yml @@ -3,6 +3,7 @@ openstack.cloud.identity_user: auth_type: "{{ os_projects_auth_type }}" auth: "{{ os_projects_admin_auth }}" + region_name: "{{ os_projects_region | default(omit) }}" cacert: "{{ os_projects_cacert | default(omit) }}" cloud: "{{ os_projects_cloud | default(omit) }}" interface: "{{ os_projects_interface | default(omit, true) }}" @@ -26,6 +27,7 @@ openstack.cloud.role_assignment: auth_type: "{{ os_projects_auth_type }}" auth: "{{ os_projects_admin_auth }}" + region_name: "{{ os_projects_region | default(omit) }}" cacert: "{{ os_projects_cacert | default(omit) }}" cloud: "{{ os_projects_cloud | default(omit) }}" interface: "{{ os_projects_interface | default(omit, true) }}" @@ -45,6 +47,7 @@ openstack.cloud.role_assignment: auth_type: "{{ os_projects_auth_type }}" auth: "{{ os_projects_admin_auth }}" + region_name: "{{ os_projects_region | default(omit) }}" cacert: "{{ os_projects_cacert | default(omit) }}" cloud: "{{ os_projects_cloud | default(omit) }}" interface: "{{ os_projects_interface | default(omit, true) }}" diff --git a/roles/os_volumes/README.md b/roles/os_volumes/README.md index cdbe4c2..e4edc33 100644 --- a/roles/os_volumes/README.md +++ b/roles/os_volumes/README.md @@ -20,6 +20,8 @@ Role Variables `os_volumes_auth` is a dict containing authentication information compatible with the `auth` argument of `openstack.cloud` Ansible modules. +`os_volumes_region` is an optional name of an OpenStack region. + `os_volumes` is a list of volumes to register. Each item should be a dict containing the following items: - `display_description`: Optional description of the volume. diff --git a/roles/os_volumes/tasks/volumes.yml b/roles/os_volumes/tasks/volumes.yml index f07aeba..56edad6 100644 --- a/roles/os_volumes/tasks/volumes.yml +++ b/roles/os_volumes/tasks/volumes.yml @@ -46,6 +46,7 @@ openstack.cloud.volume: auth_type: "{{ os_volumes_auth_type }}" auth: "{{ os_volumes_auth }}" + region_name: "{{ os_volumes_region | default(omit) }}" display_name: "{{ item.display_name }}" display_description: "{{ item.display_description | default(omit) }}" image: "{{ item.image | default(omit) }}"