diff options
| author | Sam Yaple <sam@yaple.net> | 2015-08-18 01:49:17 +0000 |
|---|---|---|
| committer | Sam Yaple <sam@yaple.net> | 2015-08-19 03:18:16 +0000 |
| commit | 8d65921bc31d0ef1ba24bf2cae064f57cae01a9c (patch) | |
| tree | 5589198285f7db2569855a3624dd99e76055fb07 | |
| parent | 718db54fa80bbd892670a7a5c1eca5ad991f53eb (diff) | |
| download | kolla-8d65921bc31d0ef1ba24bf2cae064f57cae01a9c.tar.gz kolla-8d65921bc31d0ef1ba24bf2cae064f57cae01a9c.zip | |
Move defaults.yml to group_vars/all.yml
The purpose for having defaults.yml on the command line was originally
for variable inheritance. Over the past month we have slowly changed
how things are inherited (like ports) allowing us to place these
'defaults' into the group_vars/all.yml location as they should be
values that go unchanged (but can be overridden).
Change-Id: I2becec66bf431bfc9d88fc825b5380c1e173ca70
Partially-Implements: blueprint update-configs
| -rw-r--r-- | ansible/group_vars/all.yml (renamed from etc/kolla/defaults.yml) | 17 | ||||
| -rw-r--r-- | etc/kolla/globals.yml | 14 | ||||
| -rwxr-xr-x | tools/kolla-ansible | 2 |
3 files changed, 18 insertions, 15 deletions
diff --git a/etc/kolla/defaults.yml b/ansible/group_vars/all.yml index 8b096cb0e..0d0100d8a 100644 --- a/etc/kolla/defaults.yml +++ b/ansible/group_vars/all.yml @@ -56,3 +56,20 @@ enable_mariadb: "yes" enable_neutron: "yes" enable_nova: "yes" enable_rabbitmq: "yes" + + +# Openstack authentication strings. You should only need to adjust these if you +# are changing the admin tenant/project or user. +openstack_auth: + auth_url: "http://{{ kolla_internal_address }}:{{ keystone_admin_port }}" + username: "admin" + password: "{{ keystone_admin_password }}" + project_name: "admin" + +# This shouldn't be needed for long. It is only temporary until we get the +# ansible modules sorted out +openstack_auth_v2: + auth_url: "http://{{ kolla_internal_address }}:{{ keystone_admin_port }}/v2.0" + username: "admin" + password: "{{ keystone_admin_password }}" + project_name: "admin" diff --git a/etc/kolla/globals.yml b/etc/kolla/globals.yml index ec78f1251..d31a1b617 100644 --- a/etc/kolla/globals.yml +++ b/etc/kolla/globals.yml @@ -74,20 +74,6 @@ openstack_logging_debug: "False" openstack_region_name: "RegionOne" -openstack_auth: - auth_url: "http://{{ kolla_internal_address }}:{{ keystone_admin_port }}" - username: "admin" - password: "{{ keystone_admin_password }}" - project_name: "admin" - -# This shouldn't be needed for long. It is only temporary until we get the -# ansible modules sorted out -openstack_auth_v2: - auth_url: "http://{{ kolla_internal_address }}:{{ keystone_admin_port }}/v2.0" - username: "admin" - password: "{{ keystone_admin_password }}" - project_name: "admin" - #################### # RabbitMQ options diff --git a/tools/kolla-ansible b/tools/kolla-ansible index 43341788d..abfe433fb 100755 --- a/tools/kolla-ansible +++ b/tools/kolla-ansible @@ -70,7 +70,7 @@ case "$1" in (deploy) ACTION="Deploying Playbook" - CMD="ansible-playbook -i $INVENTORY -e @/etc/kolla/defaults.yml -e @/etc/kolla/globals.yml -e @/etc/kolla/passwords.yml $PLAYBOOK" + CMD="ansible-playbook -i $INVENTORY -e @/etc/kolla/globals.yml -e @/etc/kolla/passwords.yml $PLAYBOOK" ;; (*) usage |