From fe03b47251ceccf4eb2a47cc328d23d5703d5f24 Mon Sep 17 00:00:00 2001 From: Alex Schultz Date: Wed, 21 Oct 2020 14:21:36 -0600 Subject: [PATCH] Add ability to specify heat container image Added --heat-container-image support to tripleo deploy. Change-Id: I43b7453fd81791502b98931a53acc4e8859dadbe Blueprint: switch-to-heat-all-container --- roles/tripleo_deploy/README.md | 1 + roles/tripleo_deploy/defaults/main.yml | 1 + .../molecule/default/converge.yml | 17 +++++++++++++++++ roles/tripleo_deploy/tasks/main.yml | 2 ++ 4 files changed, 21 insertions(+) diff --git a/roles/tripleo_deploy/README.md b/roles/tripleo_deploy/README.md index 7728dfc..4981901 100644 --- a/roles/tripleo_deploy/README.md +++ b/roles/tripleo_deploy/README.md @@ -24,6 +24,7 @@ Role Variables * `tripleo_deploy_force_stack_create`: (Boolean) Flag to force stack create. Default: false * `tripleo_deploy_force_stack_update`: (Boolean) Flag to force stack update. Default: false * `tripleo_deploy_heat_api_port`: (Number) Heat API port to use for the installer. +* `tripleo_deploy_heat_container_image`: (String) Full container image location for the openstack-heat-all container. * `tripleo_deploy_heat_user`: (String) User to execute the non-privileged heat-all process. * `tripleo_deploy_hieradata_override`: (String) Path to hiera data override file. * `tripleo_deploy_home_dir`: (String) Path to the directory to execute the command in. Default: "{{ ansible_env.HOME }}" diff --git a/roles/tripleo_deploy/defaults/main.yml b/roles/tripleo_deploy/defaults/main.yml index 1cf5290..54b922b 100644 --- a/roles/tripleo_deploy/defaults/main.yml +++ b/roles/tripleo_deploy/defaults/main.yml @@ -14,6 +14,7 @@ tripleo_deploy_force_stack_update: false tripleo_deploy_generate_scripts: "{{ tripleo_generate_scripts | default(False) }}" tripleo_deploy_generate_scripts_only: "{{ tripleo_generate_scripts_only | default(False) }}" tripleo_deploy_heat_api_port: +tripleo_deploy_heat_container_image: tripleo_deploy_heat_user: tripleo_deploy_hieradata_override: tripleo_deploy_home_dir: "{{ ansible_env.HOME }}" diff --git a/roles/tripleo_deploy/molecule/default/converge.yml b/roles/tripleo_deploy/molecule/default/converge.yml index 517bb44..c735a47 100644 --- a/roles/tripleo_deploy/molecule/default/converge.yml +++ b/roles/tripleo_deploy/molecule/default/converge.yml @@ -189,6 +189,23 @@ that: - tripleo_deploy_output == "tripleo deploy --heat-api-port 1111 --local-ip 192.168.24.2/24" + - name: Check parameter "tripleo_deploy_heat_container_image" + include_role: + name: "tripleo_deploy" + vars: + tripleo_deploy_templates: + tripleo_deploy_stack: + tripleo_deploy_standalone: false + tripleo_deploy_standalone_role: + tripleo_deploy_timeout_arg: + tripleo_deploy_heat_container_image: quay.io/tripleomaster/openstack-heat-all:foo + + - name: Assert "tripleo_deploy_heat_api_port" + assert: + that: + - tripleo_deploy_output == "tripleo deploy --heat-container-image quay.io/tripleomaster/openstack-heat-all:foo --local-ip 192.168.24.2/24" + + - name: Check parameter "tripleo_deploy_heat_user" include_role: name: "tripleo_deploy" diff --git a/roles/tripleo_deploy/tasks/main.yml b/roles/tripleo_deploy/tasks/main.yml index f9bb784..8497b6f 100644 --- a/roles/tripleo_deploy/tasks/main.yml +++ b/roles/tripleo_deploy/tasks/main.yml @@ -24,6 +24,7 @@ {{ tripleo_deploy_networks_file | ternary('-n $DEPLOY_NETWORKS_FILE', '') }} {{ tripleo_deploy_plan_environment_file | ternary('-p $DEPLOY_PLAN_ENV_FILE', '') }} {{ tripleo_deploy_heat_api_port | ternary('--heat-api-port $DEPLOY_HEAT_API_PORT', '') }} + {{ tripleo_deploy_heat_container_image | ternary('--heat-container-image $DEPLOY_HEAT_CONTAINER_IMAGE', '') }} {{ tripleo_deploy_heat_user | ternary('--heat-user $DEPLOY_HEAT_USER', '') }} {{ tripleo_deploy_deployment_user | ternary('--deployment-user $DEPLOY_DEPLOYMENT_USER', '') }} {{ tripleo_deploy_deployment_python_interpreter | ternary('--deployment-python-interpreter $DEPLOY_PYTHON_INTERPRETER', '') }} @@ -43,6 +44,7 @@ DEPLOY_CONTROL_VIP: "{{ tripleo_deploy_control_virtual_ip }}" DEPLOY_DEPLOYMENT_USER: "{{ tripleo_deploy_deployment_user }}" DEPLOY_HEAT_API_PORT: "{{ tripleo_deploy_heat_api_port }}" + DEPLOY_HEAT_CONTAINER_IMAGE: "{{ tripleo_deploy_heat_container_image }}" DEPLOY_HEAT_USER: "{{ tripleo_deploy_heat_user }}" DEPLOY_HIERADATA_OVERRIDE: "{{ tripleo_deploy_hieradata_override }}" DEPLOY_LOCAL_DOMAIN: "{{ tripleo_deploy_local_domain }}"