Support configuration of Kolla build sources

Adding a single non-default source for bifrost-base

ansible/group_vars/all/kolla

@@ -40,6 +40,23 @@ kolla_docker_namespace: "kolla"
 # Kolla OpenStack release version. This should be a Docker image tag.
 kolla_openstack_release: "3.0.2"
 
+# Dict mapping names of sources to their definitions for
+# kolla_install_type=source. See kolla.common.config for details.
+# Example:
+# kolla_sources:
+#   ironic_base:
+#     type: git
+#     location: https://github.com/openstack/ironic
+#     reference: master
+kolla_sources:
+  bifrost-base:
+    type: "git"
+    location: "https://github.com/stackhpc/bifrost"
+    reference: "stackhpc-3.0.0"
+
+###############################################################################
+# Kolla-ansible configuration.
+
 # Whether TLS is enabled for the external API endpoints.
 kolla_enable_tls_external: "no"
 

ansible/roles/kolla-build/defaults/main.yml

@@ -13,3 +13,13 @@ kolla_docker_namespace:
 
 # Valid option is Docker repository tag
 kolla_openstack_release:
+
+# Dict mapping names of sources to their definitions for
+# kolla_install_type=source. See kolla.common.config for details.
+# Example:
+# kolla_sources:
+#   ironic_base:
+#     type: git
+#     location: https://github.com/openstack/ironic
+#     reference: master
+kolla_sources: {}

ansible/roles/kolla-build/templates/kolla-build.conf.j2

@@ -16,3 +16,20 @@ tag={{ kolla_openstack_release }}
 
 # Path to a file containing template overrides.
 template_override={{ kolla_config_path }}/template-override.j2
+
+{% for source_name, source_def in kolla_sources.items() %}
+[{{ source_name }}]
+{% if source_def.type is defined %}
+# Type of source for {{ source_name }}.
+type = {{ source_def.type }}
+{% endif %}
+{% if source_def.location is defined %}
+# Location of source for {{ source_name }}.
+location = {{ source_def.location }}
+{% endif %}
+{% if source_def.reference is defined %}
+# Reference of source for {{ source_name }}.
+reference = {{ source_def.reference }}
+{% endif %}
+
+{% endfor %}

ansible/roles/kolla/tasks/main.yml

@@ -21,6 +21,12 @@
   with_items:
     - { name: pip }
 
+- name: Ensure source code checkout path exists
+  file:
+    path: "{{ source_checkout_path }}"
+    state: directory
+    recurse: True
+
 - name: Ensure Kolla source code checkout exists
   git:
     repo: "{{ kolla_source_url }}"

ansible/kolla-build.yml → ansible/seed-kolla-build.yml

 ---
-- name: Ensure Kolla is configured
+- name: Ensure Kolla is configured on seed
   hosts: seed
   roles:
     - role: kolla

etc/kayobe/kolla.yml

@@ -39,6 +39,19 @@
 # Kolla OpenStack release version. This should be a Docker image tag.
 #kolla_openstack_release:
 
+# Dict mapping names of sources to their definitions for
+# kolla_install_type=source. See kolla.common.config for details.
+# Example:
+# kolla_sources:
+#   ironic_base:
+#     type: git
+#     location: https://github.com/openstack/ironic
+#     reference: master
+#kolla_sources:
+
+###############################################################################
+# Kolla-ansible configuration.
+
 # Whether TLS is enabled for the external API endpoints.
 #kolla_enable_tls_external: