Merge "Moved the playbook vars to defaults"

playbooks/lxc-hosts-setup.yml

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

playbooks/os-heat-install.yml

@@ -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

playbooks/os-tempest-install.yml

@@ -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

playbooks/plugins/lookups/py_pkgs.py

@@ -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``

playbooks/roles/repo_server/files/openstack-wheel-builder.py

@@ -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``

scripts/sources-branch-updater.sh

@@ -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'