From d37116a602d65a21d490a51ce047cc909944a1ae Mon Sep 17 00:00:00 2001 From: Mohammed Naser Date: Thu, 28 Mar 2019 20:59:46 -0400 Subject: [PATCH] developer_mode: drop vars The developer mode no longer exists, therefore, we should remove all references and we're already installing the distro devel packages inside python_venv_build. We were also referencing the wrong constraint variable, so this fixes that as well. Change-Id: Iaf2e848b80923718741c148f2a76d5a3efca53b1 --- defaults/main.yml | 2 +- tests/os_manila-overrides.yml | 1 - vars/distro_install.yml | 3 --- vars/source_install.yml | 3 --- 4 files changed, 1 insertion(+), 8 deletions(-) diff --git a/defaults/main.yml b/defaults/main.yml index 631609e..86bcd8b 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -31,7 +31,7 @@ manila_git_install_branch: master manila_upper_constraints_url: "{{ requirements_git_url | default('https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt?h=' ~ requirements_git_install_branch | default('master')) }}" manila_git_constraints: - "git+{{ manila_git_repo }}@{{ manila_git_install_branch }}#egg=manila" - - "--constraint {{ barbican_upper_constraints_url }}" + - "--constraint {{ manila_upper_constraints_url }}" manila_pip_install_args: "{{ pip_install_options | default('') }}" diff --git a/tests/os_manila-overrides.yml b/tests/os_manila-overrides.yml index 5fa5123..24e0d90 100644 --- a/tests/os_manila-overrides.yml +++ b/tests/os_manila-overrides.yml @@ -110,7 +110,6 @@ test_manila_share_group: "{{ ((groups['manila_share'] is defined) and (groups['m test_manila_api_host: "{{ hostvars[groups[test_manila_api_group][0]]['ansible_host'] }}" test_manila_share_host: "{{ hostvars[groups[test_manila_share_group][0]]['ansible_host'] }}" manila_container_mysql_password: "SuperSecrete" -manila_developer_mode: true manila_git_install_branch: "{{ test_branch }}" manila_profiler_hmac_key: "secrete" manila_oslomsg_rpc_password: "secrete" diff --git a/vars/distro_install.yml b/vars/distro_install.yml index 1f0e31a..1ac07db 100644 --- a/vars/distro_install.yml +++ b/vars/distro_install.yml @@ -32,9 +32,6 @@ manila_package_list: |- {% if manila_services['manila_scheduler']['group'] in group_names %} {% set _ = packages.extend(manila_scheduler_distro_packages) %} {% endif %} - {% if manila_developer_mode | bool %} - {% set _ = packages.extend(manila_devel_distro_packages) %} - {% endif %} {% if manila_oslomsg_amqp1_enabled | bool %} {% set _ = packages.extend(manila_oslomsg_amqp1_distro_packages) %} {% endif %} diff --git a/vars/source_install.yml b/vars/source_install.yml index b5c903a..0a95ca6 100644 --- a/vars/source_install.yml +++ b/vars/source_install.yml @@ -26,9 +26,6 @@ manila_package_list: |- {% set _ = packages.extend(manila_lvm_share_distro_packages) %} {% endif %} {% endif %} - {% if manila_developer_mode | bool %} - {% set _ = packages.extend(manila_devel_distro_packages) %} - {% endif %} {% if manila_oslomsg_amqp1_enabled | bool %} {% set _ = packages.extend(manila_oslomsg_amqp1_distro_packages) %} {% endif %}