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:
parent
56b84f0e34
commit
3e7666373a
@ -27,4 +27,4 @@
|
|||||||
- "lxc-rsyslog-client"
|
- "lxc-rsyslog-client"
|
||||||
- "rsyslog-client"
|
- "rsyslog-client"
|
||||||
vars_files:
|
vars_files:
|
||||||
- vars/repo_packages/python2_lxc.yml
|
- defaults/repo_packages/python2_lxc.yml
|
||||||
|
@ -61,4 +61,4 @@
|
|||||||
ansible_hostname: "{{ container_name }}"
|
ansible_hostname: "{{ container_name }}"
|
||||||
is_metal: "{{ properties.is_metal|default(false) }}"
|
is_metal: "{{ properties.is_metal|default(false) }}"
|
||||||
vars_files:
|
vars_files:
|
||||||
- vars/repo_packages/openstack_services.yml
|
- defaults/repo_packages/openstack_services.yml
|
||||||
|
@ -26,7 +26,7 @@
|
|||||||
- "tempest-rsyslog-client"
|
- "tempest-rsyslog-client"
|
||||||
- "rsyslog-client"
|
- "rsyslog-client"
|
||||||
vars_files:
|
vars_files:
|
||||||
- vars/repo_packages/openstack_services.yml
|
- defaults/repo_packages/openstack_services.yml
|
||||||
vars:
|
vars:
|
||||||
# This sets the tempest group to the utility group
|
# This sets the tempest group to the utility group
|
||||||
tempest_main_group: utility_all
|
tempest_main_group: utility_all
|
||||||
|
@ -88,7 +88,7 @@ class DependencyFileProcessor(object):
|
|||||||
|
|
||||||
@staticmethod
|
@staticmethod
|
||||||
def _get_files(path):
|
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``
|
:type path: ``str``
|
||||||
:returns: ``list``
|
:returns: ``list``
|
||||||
|
@ -85,7 +85,7 @@ class DependencyFileProcessor(object):
|
|||||||
|
|
||||||
@staticmethod
|
@staticmethod
|
||||||
def _get_files(path):
|
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``
|
:type path: ``str``
|
||||||
:returns: ``list``
|
:returns: ``list``
|
||||||
|
@ -19,7 +19,7 @@
|
|||||||
# all of the services that we support in an "automated" fashion.
|
# all of the services that we support in an "automated" fashion.
|
||||||
|
|
||||||
ONLINE_BRANCH=${ONLINE_BRANCH:-"stable/kilo"}
|
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'
|
IFS=$'\n'
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user