Include package pins for OpenStack services

In order to transition all roles to using the new venv build mechanism, we need to make sure that the git pins override the role pins. Change-Id: If8c8bd211e20c1f61b3ccb1237c5961843243e1e
2019-03-26 12:57:01 -04:00 · 2019-03-26 12:57:01 -04:00 · 5cc7566447
commit 5cc7566447
parent b590c1d43d
23 changed files with 24 additions and 1 deletions
--- a/playbooks/common-playbooks/cinder.yml
+++ b/playbooks/common-playbooks/cinder.yml
@ -20,6 +20,7 @@
  user: root
  environment: "{{ deployment_environment_variables | default({}) }}"
  vars_files:
+    - "../defaults/repo_packages/openstack_services.yml"
    - "../defaults/{{ install_method }}_install.yml"
  tags:
    - cinder
--- a/playbooks/common-playbooks/neutron.yml
+++ b/playbooks/common-playbooks/neutron.yml
@ -20,6 +20,7 @@
  user: root
  environment: "{{ deployment_environment_variables | default({}) }}"
  vars_files:
+    - "../defaults/repo_packages/openstack_services.yml"
    - "../defaults/{{ install_method }}_install.yml"
  tags:
    - neutron
--- a/playbooks/common-playbooks/nova.yml
+++ b/playbooks/common-playbooks/nova.yml
@ -20,7 +20,8 @@
  user: root
  environment: "{{ deployment_environment_variables | default({}) }}"
  vars_files:
-    - ../defaults/repo_packages/nova_consoles.yml
+    - "../defaults/repo_packages/openstack_services.yml"
+    - "../defaults/repo_packages/nova_consoles.yml"
    - "../defaults/{{ install_method }}_install.yml"
  tags:
    - nova
--- a/playbooks/os-aodh-install.yml
+++ b/playbooks/os-aodh-install.yml
@ -19,6 +19,7 @@
  user: root
  environment: "{{ deployment_environment_variables | default({}) }}"
  vars_files:
+    - "defaults/repo_packages/openstack_services.yml"
    - "defaults/{{ install_method }}_install.yml"
  tags:
    - aodh
--- a/playbooks/os-barbican-install.yml
+++ b/playbooks/os-barbican-install.yml
@ -19,6 +19,7 @@
  user: root
  environment: "{{ deployment_environment_variables | default({}) }}"
  vars_files:
+    - "defaults/repo_packages/openstack_services.yml"
    - "defaults/{{ install_method }}_install.yml"
  tags:
    - barbican
--- a/playbooks/os-blazar-install.yml
+++ b/playbooks/os-blazar-install.yml
@ -19,6 +19,7 @@
  environment: "{{ deployment_environment_variables | default({}) }}"
  user: root
  vars_files:
+    - "defaults/repo_packages/openstack_services.yml"
    - "defaults/{{ install_method }}_install.yml"
  tags:
    - blazar
--- a/playbooks/os-ceilometer-install.yml
+++ b/playbooks/os-ceilometer-install.yml
@ -18,6 +18,7 @@
  gather_facts: "{{ osa_gather_facts | default(True) }}"
  user: root
  vars_files:
+    - "defaults/repo_packages/openstack_services.yml"
    - "defaults/{{ install_method }}_install.yml"
  pre_tasks:
    - include_tasks: "common-tasks/os-{{ container_tech | default('lxc') }}-container-setup.yml"
--- a/playbooks/os-congress-install.yml
+++ b/playbooks/os-congress-install.yml
@ -20,6 +20,7 @@
  user: root
  environment: "{{ deployment_environment_variables | default({}) }}"
  vars_files:
+    - "defaults/repo_packages/openstack_services.yml"
    - "defaults/{{ install_method }}_install.yml"
  tags:
    - congress
--- a/playbooks/os-designate-install.yml
+++ b/playbooks/os-designate-install.yml
@ -22,6 +22,7 @@
  user: root
  environment: "{{ deployment_environment_variables | default({}) }}"
  vars_files:
+    - "defaults/repo_packages/openstack_services.yml"
    - "defaults/{{ install_method }}_install.yml"
  tags:
    - designate
--- a/playbooks/os-gnocchi-install.yml
+++ b/playbooks/os-gnocchi-install.yml
@ -18,6 +18,7 @@
  user: root
  environment: "{{ deployment_environment_variables | default({}) }}"
  vars_files:
+    - "defaults/repo_packages/gnocchi.yml"
    - "defaults/{{ install_method }}_install.yml"
  tags:
    - gnocchi
--- a/playbooks/os-horizon-install.yml
+++ b/playbooks/os-horizon-install.yml
@ -19,6 +19,7 @@
  user: root
  environment: "{{ deployment_environment_variables | default({}) }}"
  vars_files:
+    - "defaults/repo_packages/openstack_services.yml"
    - "defaults/{{ install_method }}_install.yml"
  tags:
    - horizon
--- a/playbooks/os-ironic-install.yml
+++ b/playbooks/os-ironic-install.yml
@ -19,6 +19,7 @@
  user: root
  environment: "{{ deployment_environment_variables | default({}) }}"
  vars_files:
+    - "defaults/repo_packages/openstack_services.yml"
    - "defaults/{{ install_method }}_install.yml"
  tags:
    - ironic
--- a/playbooks/os-keystone-install.yml
+++ b/playbooks/os-keystone-install.yml
@ -37,6 +37,7 @@
  user: root
  environment: "{{ deployment_environment_variables | default({}) }}"
  vars_files:
+    - "defaults/repo_packages/openstack_services.yml"
    - "defaults/{{ install_method }}_install.yml"
  tags:
    - keystone
--- a/playbooks/os-magnum-install.yml
+++ b/playbooks/os-magnum-install.yml
@ -21,6 +21,7 @@
  user: root
  environment: "{{ deployment_environment_variables | default({}) }}"
  vars_files:
+    - "defaults/repo_packages/openstack_services.yml"
    - "defaults/{{ install_method }}_install.yml"
  tags:
    - magnum
--- a/playbooks/os-mistral-install.yml
+++ b/playbooks/os-mistral-install.yml
@ -19,6 +19,7 @@
  environment: "{{ deployment_environment_variables | default({}) }}"
  user: root
  vars_files:
+    - "defaults/repo_packages/openstack_services.yml"
    - "defaults/{{ install_method }}_install.yml"
  tags:
    - mistral
--- a/playbooks/os-octavia-install.yml
+++ b/playbooks/os-octavia-install.yml
@ -19,6 +19,7 @@
  user: root
  environment: "{{ deployment_environment_variables | default({}) }}"
  vars_files:
+    - "defaults/repo_packages/openstack_services.yml"
    - "defaults/{{ install_method }}_install.yml"
  tags:
    - octavia
--- a/playbooks/os-rally-install.yml
+++ b/playbooks/os-rally-install.yml
@ -19,6 +19,7 @@
  user: root
  environment: "{{ deployment_environment_variables | default({}) }}"
  vars_files:
+    - "defaults/repo_packages/openstack_services.yml"
    - "defaults/{{ install_method }}_install.yml"
  tags:
    - rally
--- a/playbooks/os-sahara-install.yml
+++ b/playbooks/os-sahara-install.yml
@ -17,6 +17,7 @@
  user: root
  environment: "{{ deployment_environment_variables | default({}) }}"
  vars_files:
+    - "defaults/repo_packages/openstack_services.yml"
    - "defaults/{{ install_method }}_install.yml"
  tags:
    - sahara
--- a/playbooks/os-swift-install.yml
+++ b/playbooks/os-swift-install.yml
@ -18,6 +18,7 @@
  gather_facts: "{{ osa_gather_facts | default(True) }}"
  user: root
  vars_files:
+    - "defaults/repo_packages/openstack_services.yml"
    - "defaults/{{ install_method }}_install.yml"
  pre_tasks:
    - include_tasks: "common-tasks/os-{{ container_tech | default('lxc') }}-container-setup.yml"
--- a/playbooks/os-swift-sync.yml
+++ b/playbooks/os-swift-sync.yml
@ -20,6 +20,7 @@
  gather_facts: "{{ osa_gather_facts | default(True) }}"
  user: root
  vars_files:
+    - "defaults/repo_packages/openstack_services.yml"
    - "defaults/{{ install_method }}_install.yml"
  roles:
    - role: "os_swift"
--- a/playbooks/os-tacker-install.yml
+++ b/playbooks/os-tacker-install.yml
@ -19,6 +19,7 @@
  user: root
  environment: "{{ deployment_environment_variables | default({}) }}"
  vars_files:
+    - "defaults/repo_packages/openstack_services.yml"
    - "defaults/{{ install_method }}_install.yml"
  tags:
    - tacker
--- a/playbooks/os-tempest-install.yml
+++ b/playbooks/os-tempest-install.yml
@ -18,6 +18,7 @@
  gather_facts: "{{ osa_gather_facts | default(True) }}"
  user: root
  vars_files:
+    - "defaults/repo_packages/openstack_testing.yml"
    - "defaults/{{ install_method }}_install.yml"
  pre_tasks:
    - name: End playbook
--- a/playbooks/os-trove-install.yml
+++ b/playbooks/os-trove-install.yml
@ -22,6 +22,7 @@
  user: root
  environment: "{{ deployment_environment_variables | default({}) }}"
  vars_files:
+    - "defaults/repo_packages/openstack_services.yml"
    - "defaults/{{ install_method }}_install.yml"
  tags:
    - trove