Update role for new source build process

The variables ironic_developer_mode and ironic_venv_download
no longer carry any meaning. This review changes ironic to
do the equivalent of what developer_mode was all the time,
meaning that it always builds the venv and never requires
the repo server, but it will use a repo server when available.

As part of this, we move the source build out of its own file
because it's now a single task to include the venv build role.
This is just to make it easier to follow the code.

Change-Id: Id58a2bcc215abe4595b594c08be60ca2a1490205

defaults/main.yml

@@ -32,25 +32,14 @@ ironic_glance_api_servers: "{{ (glance_service_internalurl | default('http://loc
 ironic_package_state: "latest"
 ironic_pip_package_state: "latest"
 
-# These variables are used in 'developer mode' in order to allow the role
-# to build an environment directly from a git source without the presence
-# of an OpenStack-Ansible repo_server.
 ironic_git_repo: https://git.openstack.org/openstack/ironic
 ironic_git_install_branch: master
-ironic_developer_mode: false
-ironic_developer_constraints:
+ironic_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')) }}"
+ironic_git_constraints:
   - "git+{{ ironic_git_repo }}@{{ ironic_git_install_branch }}#egg=ironic"
+  - "--constraint {{ ironic_upper_constraints_url }}"
 
-# TODO(odyssey4me):
-# This can be simplified once all the roles are using
-# python_venv_build. We can then switch to using a
-# set of constraints in pip.conf inside the venv,
-# perhaps prepared by giving a giving a list of
-# constraints to the role.
-ironic_pip_install_args: >-
-  {{ ironic_developer_mode | ternary(pip_install_developer_constraints | default('--constraint /opt/developer-pip-constraints.txt'), '') }}
-  {{ (pip_install_upper_constraints is defined) | ternary('--constraint ' + pip_install_upper_constraints | default(''), '') }}
-  {{ pip_install_options | default('') }}
+ironic_pip_install_args: "{{ pip_install_options | default('') }}"
 
 # Name of the virtual env to deploy into
 ironic_venv_tag: "{{ venv_tag | default('untagged') }}"
@@ -185,11 +174,6 @@ ironic_node_name: ironic
 # regenerated each run.
 ironic_recreate_keys: False
 
-# venv_download, even when true, will use the fallback method of building the
-# venv from scratch if the venv download fails.
-ironic_venv_download: "{{ not ironic_developer_mode | bool }}"
-ironic_venv_download_url: http://127.0.0.1/venvs/untagged/ubuntu/ironic.tgz
-
 ironic_tftp_server_address: "{{ ansible_host }}"
 
 ironic_pip_packages:

tasks/ironic_install.yml

@@ -1,50 +0,0 @@
----
-# Copyright 2014, Rackspace US, Inc.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-# TODO(odyssey4me):
-# This can be simplified once all the roles are using
-# python_venv_build. We can then switch to using a
-# set of constraints in pip.conf inside the venv,
-# perhaps prepared by giving a giving a list of
-# constraints to the role.
-- name: Create developer mode constraint file
-  copy:
-    dest: "/opt/developer-pip-constraints.txt"
-    content: |
-      {% for item in ironic_developer_constraints %}
-      {{ item }}
-      {% endfor %}
-  when: ironic_developer_mode | bool
-
-- name: Ensure remote wheel building is disabled in developer mode
-  set_fact:
-    venv_build_host: "{{ ansible_hostname }}"
-  when:
-    - ironic_developer_mode | bool
-
-- name: Install the python venv
-  include_role:
-    name: "python_venv_build"
-    private: yes
-  vars:
-    venv_build_distro_package_list: "{{ ironic_devel_distro_packages }}"
-    venv_install_destination_path: "{{ ironic_bin | dirname }}"
-    venv_install_distro_package_list: "{{ ironic_packages_list }}"
-    venv_pip_install_args: "{{ ironic_pip_install_args }}"
-    venv_pip_packages: "{{ (ironic_oslomsg_amqp1_enabled | bool) | ternary(ironic_pip_packages + ironic_optional_oslomsg_amqp1_pip_packages, ironic_pip_packages) }}"
-    venv_facts_when_changed:
-      - section: "ironic"
-        option: "venv_tag"
-        value: "{{ ironic_venv_tag }}"

tasks/main.yml

@@ -28,7 +28,20 @@
   tags:
     - ironic-install
 
-- include_tasks: ironic_install.yml
+- name: Install the python venv
+  import_role:
+    name: "python_venv_build"
+  vars:
+    venv_build_constraints: "{{ ironic_git_constraints }}"
+    venv_build_distro_package_list: "{{ ironic_devel_distro_packages }}"
+    venv_install_destination_path: "{{ ironic_bin | dirname }}"
+    venv_install_distro_package_list: "{{ ironic_packages_list }}"
+    venv_pip_install_args: "{{ ironic_pip_install_args }}"
+    venv_pip_packages: "{{ (ironic_oslomsg_amqp1_enabled | bool) | ternary(ironic_pip_packages + ironic_optional_oslomsg_amqp1_pip_packages, ironic_pip_packages) }}"
+    venv_facts_when_changed:
+      - section: "ironic"
+        option: "venv_tag"
+        value: "{{ ironic_venv_tag }}"
   tags:
     - ironic-install
 

vars/main.yml

@@ -139,9 +139,6 @@ ironic_driver_types:
 
 ironic_packages_list: >
   {%- set package_list = [] %}
-  {%- if ironic_developer_mode | bool %}
-  {%-   set package_list = package_list + ironic_devel_distro_packages %}
-  {%- endif %}
   {%- if ironic_services['ironic-api']['group'] in group_names %}
   {%-   set package_list = package_list + ironic_api_distro_packages %}
   {%- endif %}