diff options
| author | SamYaple <sam@yaple.net> | 2016-02-29 15:08:30 +0000 |
|---|---|---|
| committer | SamYaple <sam@yaple.net> | 2016-02-29 18:40:15 +0000 |
| commit | f1bf9a4a1eb0fa83618d0cf6e0e7f6f531d066af (patch) | |
| tree | 32f47e58dd751d5b8d2b315895654aa5de133cad | |
| parent | 89eda4d4eea2235004b02ee31f2987c945ab8378 (diff) | |
| download | kolla-f1bf9a4a1eb0fa83618d0cf6e0e7f6f531d066af.tar.gz kolla-f1bf9a4a1eb0fa83618d0cf6e0e7f6f531d066af.zip | |
Move shared variables to group_vars/all.yml
This follows the structure we have for Ironic and Nova
Closes-Bug: #1551316
Change-Id: I609e3dda40c65b73bb5e1208f702740416a042ed
| -rw-r--r-- | ansible/group_vars/all.yml | 2 | ||||
| -rw-r--r-- | ansible/roles/neutron/defaults/main.yml | 2 | ||||
| -rw-r--r-- | ansible/roles/nova/defaults/main.yml | 2 | ||||
| -rw-r--r-- | ansible/roles/nova/templates/nova.conf.j2 | 4 |
4 files changed, 4 insertions, 6 deletions
diff --git a/ansible/group_vars/all.yml b/ansible/group_vars/all.yml index aef66ab4d..d63224109 100644 --- a/ansible/group_vars/all.yml +++ b/ansible/group_vars/all.yml @@ -193,6 +193,8 @@ enable_elk: "no" enable_mongodb: "no" ironic_keystone_user: "ironic" +neutron_keystone_user: "neutron" +nova_keystone_user: "nova" # Nova fake driver and the number of fake driver per compute node enable_nova_fake: "no" diff --git a/ansible/roles/neutron/defaults/main.yml b/ansible/roles/neutron/defaults/main.yml index 5b7887370..d2d224069 100644 --- a/ansible/roles/neutron/defaults/main.yml +++ b/ansible/roles/neutron/defaults/main.yml @@ -54,8 +54,6 @@ neutron_internal_address: "{{ kolla_internal_fqdn }}" neutron_logging_debug: "{{ openstack_logging_debug }}" -neutron_keystone_user: "neutron" - 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 }}'}" diff --git a/ansible/roles/nova/defaults/main.yml b/ansible/roles/nova/defaults/main.yml index 01bdaea9c..1fe842357 100644 --- a/ansible/roles/nova/defaults/main.yml +++ b/ansible/roles/nova/defaults/main.yml @@ -73,6 +73,4 @@ nova_internal_address: "{{ kolla_internal_fqdn }}" 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 }}'}" diff --git a/ansible/roles/nova/templates/nova.conf.j2 b/ansible/roles/nova/templates/nova.conf.j2 index b208a833d..ef5fcf0fe 100644 --- a/ansible/roles/nova/templates/nova.conf.j2 +++ b/ansible/roles/nova/templates/nova.conf.j2 @@ -119,7 +119,7 @@ auth_plugin = password project_domain_name = default user_domain_id = default project_name = service -username = neutron +username = {{ neutron_keystone_user }} password = {{ neutron_keystone_password }} [database] @@ -135,7 +135,7 @@ auth_type = password project_domain_id = default user_domain_id = default project_name = service -username = nova +username = {{ nova_keystone_user }} password = {{ nova_keystone_password }} [libvirt] |