Browse Source

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
Mohammed Naser 3 weeks ago
parent
commit
d37116a602
4 changed files with 1 additions and 8 deletions
  1. 1
    1
      defaults/main.yml
  2. 0
    1
      tests/os_manila-overrides.yml
  3. 0
    3
      vars/distro_install.yml
  4. 0
    3
      vars/source_install.yml

+ 1
- 1
defaults/main.yml View File

@@ -31,7 +31,7 @@ manila_git_install_branch: master
31 31
 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')) }}"
32 32
 manila_git_constraints:
33 33
   - "git+{{ manila_git_repo }}@{{ manila_git_install_branch }}#egg=manila"
34
-  - "--constraint {{ barbican_upper_constraints_url }}"
34
+  - "--constraint {{ manila_upper_constraints_url }}"
35 35
 
36 36
 manila_pip_install_args: "{{ pip_install_options | default('') }}"
37 37
 

+ 0
- 1
tests/os_manila-overrides.yml View File

@@ -110,7 +110,6 @@ test_manila_share_group: "{{ ((groups['manila_share'] is defined) and (groups['m
110 110
 test_manila_api_host: "{{ hostvars[groups[test_manila_api_group][0]]['ansible_host'] }}"
111 111
 test_manila_share_host: "{{ hostvars[groups[test_manila_share_group][0]]['ansible_host'] }}"
112 112
 manila_container_mysql_password: "SuperSecrete"
113
-manila_developer_mode: true
114 113
 manila_git_install_branch: "{{ test_branch }}"
115 114
 manila_profiler_hmac_key: "secrete"
116 115
 manila_oslomsg_rpc_password: "secrete"

+ 0
- 3
vars/distro_install.yml View File

@@ -32,9 +32,6 @@ manila_package_list: |-
32 32
   {% if manila_services['manila_scheduler']['group'] in group_names %}
33 33
   {%   set _ = packages.extend(manila_scheduler_distro_packages) %}
34 34
   {% endif %}
35
-  {% if manila_developer_mode | bool %}
36
-  {%   set _ = packages.extend(manila_devel_distro_packages) %}
37
-  {% endif %}
38 35
   {% if manila_oslomsg_amqp1_enabled | bool %}
39 36
   {%   set _ = packages.extend(manila_oslomsg_amqp1_distro_packages) %}
40 37
   {% endif %}

+ 0
- 3
vars/source_install.yml View File

@@ -26,9 +26,6 @@ manila_package_list: |-
26 26
   {%     set _ = packages.extend(manila_lvm_share_distro_packages) %}
27 27
   {%   endif %}
28 28
   {% endif %}
29
-  {% if manila_developer_mode | bool %}
30
-  {%   set _ = packages.extend(manila_devel_distro_packages) %}
31
-  {% endif %}
32 29
   {% if manila_oslomsg_amqp1_enabled | bool %}
33 30
   {%   set _ = packages.extend(manila_oslomsg_amqp1_distro_packages) %}
34 31
   {% endif %}

Loading…
Cancel
Save