openstack
/
openstack-ansible-openstack_openrc
Code Issues Proposed changes

Adding support of system scoped openrc and clouds.yaml 

Change-Id: Iff5a0892d812601c0fa3fd549b7f00a468cfdd97
Closes-Bug: 1903656
This commit is contained in:
siavashsardari 2020-11-10 11:46:22 +03:30
parent 87e9d56d06
commit 435edf30aa
2 changed files with 30 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
defaults/main.yml
View File

@ -13,6 +13,9 @@
# See the License for the specific language governing permissions and
# limitations under the License.
## Use System Scope Authentication
openrc_clouds_yaml_system_scope: false
## Endpoint types
openrc_cinder_endpoint_type: internalURL
openrc_nova_endpoint_type: internalURL

28
templates/clouds.yaml.j2
View File

@ -3,12 +3,16 @@ clouds:
default:
auth:
auth_url: {{ openrc_os_auth_url }}
{% if openrc_clouds_yaml_system_scope %}
system_scope: all
{% else %}
project_name: {{ openrc_os_tenant_name }}
tenant_name: {{ openrc_os_tenant_name }}
project_domain_name: {{ openrc_os_domain_name }}
{% endif %}
username: {{ openrc_os_username }}
password: {{ openrc_os_password }}
user_domain_name: {{ openrc_os_domain_name }}
project_domain_name: {{ openrc_os_domain_name }}
region_name: {{ openrc_region_name }}
interface: {{ openrc_clouds_yml_interface }}
{% if openrc_os_auth_url.endswith('v2.0') %}
@ -20,3 +24,25 @@ clouds:
verify: false
insecure: true
{% endif %}
{% if openrc_clouds_yaml_system_scope %}
default_project_scope:
auth:
auth_url: {{ openrc_os_auth_url }}
project_name: {{ openrc_os_tenant_name }}
tenant_name: {{ openrc_os_tenant_name }}
project_domain_name: {{ openrc_os_domain_name }}
username: {{ openrc_os_username }}
password: {{ openrc_os_password }}
user_domain_name: {{ openrc_os_domain_name }}
region_name: {{ openrc_region_name }}
interface: {{ openrc_clouds_yml_interface }}
{% if openrc_os_auth_url.endswith('v2.0') %}
identity_api_version: "2.0"
{% else %}
identity_api_version: "3"
{% endif %}
{% if openrc_insecure | bool %}
verify: false
insecure: true
{% endif %}
{% endif %}