Infrastructure/ansible
1
0
Fork 0
Code Issues Pull requests 6 Projects Releases Packages Wiki Activity Actions

copr: backend: use proper copr_nova* variables

Browse source
This commit is contained in:
Pavel Raiskup 2019-08-13 09:42:20 +02:00 • committed by Pierre-Yves Chibon
parent 1562dd6e62
commit 8f2eef6305
2 changed files with 5 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

8
roles/copr/backend/templates/keystonerc
View file

@ -7,17 +7,17 @@
# #
# *NOTE*: Using the 2.0 *auth api* does not mean that compute api is 2.0. We # *NOTE*: Using the 2.0 *auth api* does not mean that compute api is 2.0. We
# will use the 1.1 *compute api* # will use the 1.1 *compute api*
export OS_AUTH_URL=http://172.23.0.2:5000/v2.0 export OS_AUTH_URL={{ copr_nova_auth_url }}
# With the addition of Keystone we have standardized on the term **tenant** # With the addition of Keystone we have standardized on the term **tenant**
# as the entity that owns the resources. # as the entity that owns the resources.
export OS_TENANT_ID={{ copr_tenant_id }} export OS_TENANT_ID={{ copr_nova_tenant_id }}
export OS_TENANT_NAME={{ copr_nova_tenant_name }} export OS_TENANT_NAME={{ copr_nova_tenant_name }}
# In addition to the owning entity (tenant), openstack stores the entity # In addition to the owning entity (tenant), openstack stores the entity
# performing the action as the **user**. # performing the action as the **user**.
export OS_USERNAME=copr export OS_USERNAME={{ copr_nova_username }}
# With Keystone you pass the keystone password. # With Keystone you pass the keystone password.
export OS_PASSWORD={{ copr_nova_password }} export OS_PASSWORD={{ copr_password }}

4
roles/copr/backend/templates/provision/nova_cloud_vars.yml
View file

@ -6,9 +6,7 @@ OS_TENANT_NAME: "{{ copr_nova_tenant_name }}"
OS_USERNAME: "{{ copr_nova_username }}" OS_USERNAME: "{{ copr_nova_username }}"
# remove default values after transition to the new cloud is finished OS_PASSWORD: "{{ copr_password }}"
OS_PASSWORD_OLD: "{{ copr_nova_password|default('variable OS_PASSWORD_OLD is undefined') }}"
OS_PASSWORD: "{{ copr_password|default('variable OS_PASSWORD is undefined')}}"
flavor_name: "{{ copr_builder_flavor_name }}" flavor_name: "{{ copr_builder_flavor_name }}"
network_name: "{{ copr_builder_network_name }}" network_name: "{{ copr_builder_network_name }}"