openstack/openstack-ansible
Code Issues Proposed changes

Merge "Update keystone middleware in nova for Kilo"

Browse Source
This commit is contained in:
Jenkins 2015-04-13 13:19:05 +00:00 committed by Gerrit Code Review
commit 2f1bb2e1f4
4 changed files with 22 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
playbooks/inventory/group_vars/all.yml
View File

@ -82,7 +82,9 @@ memcached_servers: "{% for host in groups['memcached'] %}{{ hostvars[host]['cont
nova_service_port: 8774 nova_service_port: 8774
nova_service_proto: http nova_service_proto: http
nova_service_user_name: nova nova_service_user_name: nova
nova_service_tenant_name: service nova_service_project_name: service
nova_service_project_domain_id: default
nova_service_user_domain_id: default
nova_service_adminuri: "{{ nova_service_proto }}://{{ internal_lb_vip_address }}:{{ nova_service_port }}" nova_service_adminuri: "{{ nova_service_proto }}://{{ internal_lb_vip_address }}:{{ nova_service_port }}"
nova_service_adminurl: "{{ nova_service_adminuri }}/v2/%(tenant_id)s" nova_service_adminurl: "{{ nova_service_adminuri }}/v2/%(tenant_id)s"
nova_service_region: RegionOne nova_service_region: RegionOne

7
playbooks/roles/os_nova/defaults/main.yml
View File

@ -40,10 +40,15 @@ nova_virt_type: kvm
## Nova Auth ## Nova Auth
nova_service_region: RegionOne nova_service_region: RegionOne
nova_service_tenant_name: "service" nova_service_project_name: "service"
nova_service_project_domain_id: default
nova_service_user_domain_id: default
nova_service_user_name: "nova" nova_service_user_name: "nova"
nova_service_role_name: "admin" nova_service_role_name: "admin"
## Keystone authentication middleware
nova_keystone_auth_plugin: password
## Nova enabled apis ## Nova enabled apis
nova_enabled_apis: "osapi_compute,metadata" nova_enabled_apis: "osapi_compute,metadata"

10
playbooks/roles/os_nova/tasks/nova_service_setup.yml
View File

@ -16,7 +16,7 @@
- include: nova_service_add.yml - include: nova_service_add.yml
vars: vars:
service_user_name: "{{ nova_service_user_name }}" service_user_name: "{{ nova_service_user_name }}"
service_tenant_name: "{{ nova_service_tenant_name }}" service_tenant_name: "{{ nova_service_project_name }}"
service_name: "{{ nova_service_name }}" service_name: "{{ nova_service_name }}"
service_type: "{{ nova_service_type }}" service_type: "{{ nova_service_type }}"
service_region: "{{ nova_service_region }}" service_region: "{{ nova_service_region }}"
@ -34,7 +34,7 @@
- include: nova_service_add.yml - include: nova_service_add.yml
vars: vars:
service_user_name: "{{ nova_service_user_name }}" service_user_name: "{{ nova_service_user_name }}"
service_tenant_name: "{{ nova_service_tenant_name }}" service_tenant_name: "{{ nova_service_project_name }}"
service_name: "{{ nova_v21_service_name }}" service_name: "{{ nova_v21_service_name }}"
service_type: "{{ nova_v21_service_type }}" service_type: "{{ nova_v21_service_type }}"
service_region: "{{ nova_service_region }}" service_region: "{{ nova_service_region }}"
@ -51,7 +51,7 @@
- include: nova_service_add.yml - include: nova_service_add.yml
vars: vars:
service_user_name: "{{ nova_service_user_name }}" service_user_name: "{{ nova_service_user_name }}"
service_tenant_name: "{{ nova_service_tenant_name }}" service_tenant_name: "{{ nova_service_project_name }}"
service_name: "{{ nova_v3_service_name }}" service_name: "{{ nova_v3_service_name }}"
service_type: "{{ nova_v3_service_type }}" service_type: "{{ nova_v3_service_type }}"
service_region: "{{ nova_service_region }}" service_region: "{{ nova_service_region }}"
@ -70,7 +70,7 @@
- include: nova_service_add.yml - include: nova_service_add.yml
vars: vars:
service_user_name: "{{ nova_service_user_name }}" service_user_name: "{{ nova_service_user_name }}"
service_tenant_name: "{{ nova_service_tenant_name }}" service_tenant_name: "{{ nova_service_project_name }}"
service_name: "{{ nova_s3_service_name }}" service_name: "{{ nova_s3_service_name }}"
service_type: "{{ nova_s3_service_type }}" service_type: "{{ nova_s3_service_type }}"
service_region: "{{ nova_service_region }}" service_region: "{{ nova_service_region }}"
@ -89,7 +89,7 @@
- include: nova_service_add.yml - include: nova_service_add.yml
vars: vars:
service_user_name: "{{ nova_service_user_name }}" service_user_name: "{{ nova_service_user_name }}"
service_tenant_name: "{{ nova_service_tenant_name }}" service_tenant_name: "{{ nova_service_project_name }}"
service_name: "{{ nova_ec2_service_name }}" service_name: "{{ nova_ec2_service_name }}"
service_type: "{{ nova_ec2_service_type }}" service_type: "{{ nova_ec2_service_type }}"
service_region: "{{ nova_service_region }}" service_region: "{{ nova_service_region }}"

13
playbooks/roles/os_nova/templates/nova.conf.j2
View File

@ -146,12 +146,15 @@ enabled = False
[keystone_authtoken] [keystone_authtoken]
auth_plugin = {{ nova_keystone_auth_plugin }}
signing_dir = {{ nova_system_home_folder }}/cache/api signing_dir = {{ nova_system_home_folder }}/cache/api
identity_uri = {{ keystone_service_adminuri }} auth_url = {{ keystone_service_adminuri }}
auth_uri = {{ keystone_service_internalurl }} auth_uri = {{ keystone_service_internaluri }}
admin_tenant_name = {{ nova_service_tenant_name }} project_domain_id = {{ nova_service_project_domain_id }}
admin_user = {{ nova_service_user_name }} user_domain_id = {{ nova_service_user_domain_id }}
admin_password = {{ nova_service_password }} project_name = {{ nova_service_project_name }}
username = {{ nova_service_user_name }}
password = {{ nova_service_password }}
memcached_servers = {{ memcached_servers }} memcached_servers = {{ memcached_servers }}