From 5cc7566447924b96f9d895c0801a30e12641f76b Mon Sep 17 00:00:00 2001 From: Mohammed Naser Date: Tue, 26 Mar 2019 12:57:01 -0400 Subject: [PATCH] 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 --- playbooks/common-playbooks/cinder.yml | 1 + playbooks/common-playbooks/neutron.yml | 1 + playbooks/common-playbooks/nova.yml | 3 ++- playbooks/os-aodh-install.yml | 1 + playbooks/os-barbican-install.yml | 1 + playbooks/os-blazar-install.yml | 1 + playbooks/os-ceilometer-install.yml | 1 + playbooks/os-congress-install.yml | 1 + playbooks/os-designate-install.yml | 1 + playbooks/os-gnocchi-install.yml | 1 + playbooks/os-horizon-install.yml | 1 + playbooks/os-ironic-install.yml | 1 + playbooks/os-keystone-install.yml | 1 + playbooks/os-magnum-install.yml | 1 + playbooks/os-mistral-install.yml | 1 + playbooks/os-octavia-install.yml | 1 + playbooks/os-rally-install.yml | 1 + playbooks/os-sahara-install.yml | 1 + playbooks/os-swift-install.yml | 1 + playbooks/os-swift-sync.yml | 1 + playbooks/os-tacker-install.yml | 1 + playbooks/os-tempest-install.yml | 1 + playbooks/os-trove-install.yml | 1 + 23 files changed, 24 insertions(+), 1 deletion(-) diff --git a/playbooks/common-playbooks/cinder.yml b/playbooks/common-playbooks/cinder.yml index f21cd5681a..30dfa4001b 100644 --- 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 diff --git a/playbooks/common-playbooks/neutron.yml b/playbooks/common-playbooks/neutron.yml index d253612676..4d90002ad0 100644 --- 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 diff --git a/playbooks/common-playbooks/nova.yml b/playbooks/common-playbooks/nova.yml index 0e7d88c3f0..966af88b04 100644 --- 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 diff --git a/playbooks/os-aodh-install.yml b/playbooks/os-aodh-install.yml index 9c8b46240f..f3e33a4d36 100644 --- 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 diff --git a/playbooks/os-barbican-install.yml b/playbooks/os-barbican-install.yml index efdfc643a1..69dc0ff52a 100644 --- 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 diff --git a/playbooks/os-blazar-install.yml b/playbooks/os-blazar-install.yml index 9d73c38192..0beab419df 100644 --- 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 diff --git a/playbooks/os-ceilometer-install.yml b/playbooks/os-ceilometer-install.yml index 86c5bc51e6..3cf5a58e63 100644 --- 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" diff --git a/playbooks/os-congress-install.yml b/playbooks/os-congress-install.yml index f7603184f7..8d18abe123 100644 --- 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 diff --git a/playbooks/os-designate-install.yml b/playbooks/os-designate-install.yml index 13e34517a9..efcfd82c1e 100644 --- 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 diff --git a/playbooks/os-gnocchi-install.yml b/playbooks/os-gnocchi-install.yml index 608f594fbe..da712a0258 100644 --- 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 diff --git a/playbooks/os-horizon-install.yml b/playbooks/os-horizon-install.yml index 0baf360274..648a6c96b8 100644 --- 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 diff --git a/playbooks/os-ironic-install.yml b/playbooks/os-ironic-install.yml index a1810298bf..ed01b829c3 100644 --- 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 diff --git a/playbooks/os-keystone-install.yml b/playbooks/os-keystone-install.yml index 486c106ac5..29610aa8db 100644 --- 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 diff --git a/playbooks/os-magnum-install.yml b/playbooks/os-magnum-install.yml index 86141ee48c..25b44a9617 100644 --- 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 diff --git a/playbooks/os-mistral-install.yml b/playbooks/os-mistral-install.yml index 6607751811..1cc4314bf2 100644 --- 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 diff --git a/playbooks/os-octavia-install.yml b/playbooks/os-octavia-install.yml index 2935df9c65..a8049030ea 100644 --- 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 diff --git a/playbooks/os-rally-install.yml b/playbooks/os-rally-install.yml index 86092a9b9a..1319b6f6a4 100644 --- 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 diff --git a/playbooks/os-sahara-install.yml b/playbooks/os-sahara-install.yml index 602be7ce92..b78dd6c3a8 100644 --- 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 diff --git a/playbooks/os-swift-install.yml b/playbooks/os-swift-install.yml index c96b5a3380..b1ef33f34f 100644 --- 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" diff --git a/playbooks/os-swift-sync.yml b/playbooks/os-swift-sync.yml index fe8bd06952..9164867929 100644 --- 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" diff --git a/playbooks/os-tacker-install.yml b/playbooks/os-tacker-install.yml index b41399a884..9937f3f41e 100644 --- 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 diff --git a/playbooks/os-tempest-install.yml b/playbooks/os-tempest-install.yml index 9a1f0e7be0..fa88e7ca1d 100644 --- 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 diff --git a/playbooks/os-trove-install.yml b/playbooks/os-trove-install.yml index 92de6b48d3..9866e2891b 100644 --- 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