Skip to content

Commit 1710d28

Browse files
committed
Remove references to kolla_install_type
1 parent 10167cd commit 1710d28

File tree

2 files changed

+2
-6
lines changed

2 files changed

+2
-6
lines changed

etc/kayobe/kolla.yml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,6 @@ kolla_source_version: "{{ stackhpc_kolla_source_version }}"
2626
###############################################################################
2727
# Kolla-ansible installation.
2828

29-
# Type of Kolla-ansible control installation. One of 'binary' or 'source'.
30-
# Default is 'source'.
31-
#kolla_ansible_ctl_install_type:
32-
3329
# Path to directory for kolla-ansible source code checkout.
3430
# Default is $KOLLA_SOURCE_PATH, or $PWD/src/kolla-ansible if
3531
# $KOLLA_SOURCE_PATH is not set.

etc/kayobe/pulp.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1172,7 +1172,7 @@ stackhpc_pulp_repository_container_repos_kolla: >-
11721172
{%- set repos = [] -%}
11731173
{%- for image in stackhpc_pulp_images_kolla_filtered -%}
11741174
{%- if image not in stackhpc_kolla_unbuildable_images[kolla_base_distro]-%}
1175-
{%- set image_repo = kolla_docker_namespace ~ "/" ~ kolla_base_distro ~ "-" ~ kolla_install_type ~ "-" ~ image -%}
1175+
{%- set image_repo = kolla_docker_namespace ~ "/" ~ kolla_base_distro ~ "-" ~ image -%}
11761176
{%- set repo = {"name": image_repo} -%}
11771177
{%- set _ = repos.append(stackhpc_pulp_repository_container_repos_kolla_common | combine(repo)) -%}
11781178
{%- endif -%}
@@ -1189,7 +1189,7 @@ stackhpc_pulp_distribution_container_kolla: >-
11891189
{%- set distributions = [] -%}
11901190
{%- for image in stackhpc_pulp_images_kolla_filtered -%}
11911191
{%- if image not in stackhpc_kolla_unbuildable_images[kolla_base_distro]-%}
1192-
{%- set image_repo = kolla_docker_namespace ~ "/" ~ kolla_base_distro ~ "-" ~ kolla_install_type ~ "-" ~ image -%}
1192+
{%- set image_repo = kolla_docker_namespace ~ "/" ~ kolla_base_distro ~ "-" ~ image -%}
11931193
{%- set distribution = {"name": image_repo, "repository": image_repo, "base_path": image_repo} -%}
11941194
{%- set _ = distributions.append(stackhpc_pulp_distribution_container_kolla_common | combine(distribution)) -%}
11951195
{%- endif -%}

0 commit comments

Comments
 (0)