From dad3208384845cf365ec4eaaf249d9776d5831fb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Harald=20Jens=C3=A5s?= Date: Tue, 26 May 2020 12:06:40 +0200 Subject: [PATCH] Add undercloud public IP to quintupleo output Add the public IP of the undercloud to the stack output so that it's easily available to configure the public interface on the undercloud with the correct IP statically. Change-Id: I90ad37cc683f1640464eb7b2ccfb3ba5d107f259 Related-Bug: #1874418 --- templates/quintupleo.yaml | 4 ++++ templates/undercloud-ports.yaml | 5 +++++ templates/undercloud.yaml | 3 +++ 3 files changed, 12 insertions(+) diff --git a/templates/quintupleo.yaml b/templates/quintupleo.yaml index 01d869f..803e26a 100644 --- a/templates/quintupleo.yaml +++ b/templates/quintupleo.yaml @@ -196,6 +196,10 @@ outputs: description: "ip of the undercloud instance on the private network" value: get_attr: [undercloud_env, undercloud_host_private_ip] + undercloud_host_public_ip: + description: "ip of the undercloud instance on the public network" + value: + get_attr: [undercloud_env, undercloud_host_public_ip] network_environment_data: description: "Network environment data, router addresses etc." value: diff --git a/templates/undercloud-ports.yaml b/templates/undercloud-ports.yaml index 1cac893..3207d0e 100644 --- a/templates/undercloud-ports.yaml +++ b/templates/undercloud-ports.yaml @@ -70,3 +70,8 @@ outputs: - {port: {get_resource: private_undercloud_port}} - {port: {get_resource: provision_undercloud_port}} - {port: {get_resource: public_undercloud_port}} + addresses: + value: + private_undercloud: {get_attr: [private_undercloud_port, fixed_ips, 0, ip_address]} + provision_undercloud: {get_attr: [provision_undercloud_port, fixed_ips, 0, ip_address]} + public_undercloud: {get_attr: [public_undercloud_port, fixed_ips, 0, ip_address]} diff --git a/templates/undercloud.yaml b/templates/undercloud.yaml index 3b08d6a..6394d8c 100644 --- a/templates/undercloud.yaml +++ b/templates/undercloud.yaml @@ -65,3 +65,6 @@ outputs: - {get_param: private_net} - 0 - addr + undercloud_host_public_ip: + description: "ip of the undercloud instance on the public network" + value: {get_attr: [undercloud_ports, addresses, public_undercloud]}