openstack/kolla
Code Issues Proposed changes

Move shared variables to group_vars/all.yml

Browse Source 
This follows the structure we have for Ironic and Nova

Closes-Bug: #1551316
Change-Id: I609e3dda40c65b73bb5e1208f702740416a042ed
This commit is contained in:
SamYaple 2016-02-29 15:08:30 +00:00
parent 89eda4d4ee
commit f1bf9a4a1e
4 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ansible/group_vars/all.yml
View File

@ -193,6 +193,8 @@ enable_elk: "no"
enable_mongodb: "no" enable_mongodb: "no"
ironic_keystone_user: "ironic" ironic_keystone_user: "ironic"
neutron_keystone_user: "neutron"
nova_keystone_user: "nova"
# Nova fake driver and the number of fake driver per compute node # Nova fake driver and the number of fake driver per compute node
enable_nova_fake: "no" enable_nova_fake: "no"

2
ansible/roles/neutron/defaults/main.yml
View File

@ -54,8 +54,6 @@ neutron_internal_address: "{{ kolla_internal_fqdn }}"
neutron_logging_debug: "{{ openstack_logging_debug }}" neutron_logging_debug: "{{ openstack_logging_debug }}"
neutron_keystone_user: "neutron"
neutron_bridge_name: "br-ex" neutron_bridge_name: "br-ex"
openstack_neutron_auth: "{'auth_url':'{{ openstack_auth_v2.auth_url }}','username':'{{ openstack_auth_v2.username }}','password':'{{ openstack_auth_v2.password }}','project_name':'{{ openstack_auth_v2.project_name }}'}" openstack_neutron_auth: "{'auth_url':'{{ openstack_auth_v2.auth_url }}','username':'{{ openstack_auth_v2.username }}','password':'{{ openstack_auth_v2.password }}','project_name':'{{ openstack_auth_v2.project_name }}'}"

2
ansible/roles/nova/defaults/main.yml
View File

@ -73,6 +73,4 @@ nova_internal_address: "{{ kolla_internal_fqdn }}"
nova_logging_debug: "{{ openstack_logging_debug }}" nova_logging_debug: "{{ openstack_logging_debug }}"
nova_keystone_user: "nova"
openstack_nova_auth: "{'auth_url':'{{ openstack_auth_v2.auth_url }}','username':'{{ openstack_auth_v2.username }}','password':'{{ openstack_auth_v2.password }}','project_name':'{{ openstack_auth_v2.project_name }}'}" openstack_nova_auth: "{'auth_url':'{{ openstack_auth_v2.auth_url }}','username':'{{ openstack_auth_v2.username }}','password':'{{ openstack_auth_v2.password }}','project_name':'{{ openstack_auth_v2.project_name }}'}"

4
ansible/roles/nova/templates/nova.conf.j2
View File

@ -119,7 +119,7 @@ auth_plugin = password
project_domain_name = default project_domain_name = default
user_domain_id = default user_domain_id = default
project_name = service project_name = service
username = neutron username = {{ neutron_keystone_user }}
password = {{ neutron_keystone_password }} password = {{ neutron_keystone_password }}
[database] [database]
@ -135,7 +135,7 @@ auth_type = password
project_domain_id = default project_domain_id = default
user_domain_id = default user_domain_id = default
project_name = service project_name = service
username = nova username = {{ nova_keystone_user }}
password = {{ nova_keystone_password }} password = {{ nova_keystone_password }}
[libvirt] [libvirt]