Moved the playbook vars to defaults

This change will make it so that the specific versions of OpenStack
package sources can be overridden using hostvars and or a
user_variable. This should assist in the developer case where various
versions of things may be desirable.

Change-Id: I30d84ee6840f224a7687179c522e6e9c38ec58a4
This commit is contained in:
Kevin Carter 2015-05-14 11:08:37 -05:00
parent 56b84f0e34
commit 3e7666373a
11 changed files with 6 additions and 6 deletions

View File

@ -27,4 +27,4 @@
- "lxc-rsyslog-client"
- "rsyslog-client"
vars_files:
- vars/repo_packages/python2_lxc.yml
- defaults/repo_packages/python2_lxc.yml

View File

@ -61,4 +61,4 @@
ansible_hostname: "{{ container_name }}"
is_metal: "{{ properties.is_metal|default(false) }}"
vars_files:
- vars/repo_packages/openstack_services.yml
- defaults/repo_packages/openstack_services.yml

View File

@ -26,7 +26,7 @@
- "tempest-rsyslog-client"
- "rsyslog-client"
vars_files:
- vars/repo_packages/openstack_services.yml
- defaults/repo_packages/openstack_services.yml
vars:
# This sets the tempest group to the utility group
tempest_main_group: utility_all

View File

@ -88,7 +88,7 @@ class DependencyFileProcessor(object):
@staticmethod
def _get_files(path):
"""Return a list of all files in the vars/repo_packages directory.
"""Return a list of all files in the defaults/repo_packages directory.
:type path: ``str``
:returns: ``list``

View File

@ -85,7 +85,7 @@ class DependencyFileProcessor(object):
@staticmethod
def _get_files(path):
"""Return a list of all files in the vars/repo_packages directory.
"""Return a list of all files in the defaults/repo_packages directory.
:type path: ``str``
:returns: ``list``

View File

@ -19,7 +19,7 @@
# all of the services that we support in an "automated" fashion.
ONLINE_BRANCH=${ONLINE_BRANCH:-"stable/kilo"}
SERVICE_FILE=${SERVICE_FILE:-"playbooks/vars/repo_packages/openstack_services.yml"}
SERVICE_FILE=${SERVICE_FILE:-"playbooks/defaults/repo_packages/openstack_services.yml"}
IFS=$'\n'