commit ba979c435d77a637880841e2175c5fb93b84da21
author Vasyl Saienko <vsaienko@mirantis.com> Thu Feb 07 17:32:07 2019 +0200
committer Vasyl Saienko <vsaienko@mirantis.com> Thu Feb 07 17:32:07 2019 +0200
tree f6fd73dce54f938eb4ae05d49573f49ba115f515
parent c71ddd52acd9281cbd837aea35163ccaa789ff92

Update ironic metadata to handle https on API

This patch updates ironic metadata to work with TLS on ironic API
side.

Change-Id: I07ad586639d24d3166f4e0581e23a5dad75e274c
Related-Prod: PROD-24466

ironic/api/cluster.yml

diff --git a/ironic/api/cluster.yml b/ironic/api/cluster.yml
index aa45ec2..7119872 100644
--- a/ironic/api/cluster.yml
+++ b/ironic/api/cluster.yml
@@ -40,3 +40,4 @@
           secret_key: ${_param:ironic_memcache_secret_key}
       identity:
         region: ${_param:openstack_region}
+        protocol: ${_param:cluster_internal_protocol}

ironic/api/single.yml

diff --git a/ironic/api/single.yml b/ironic/api/single.yml
index 5eb290b..47b64de 100644
--- a/ironic/api/single.yml
+++ b/ironic/api/single.yml
@@ -38,3 +38,4 @@
           secret_key: ${_param:ironic_memcache_secret_key}
       identity:
         region: ${_param:openstack_region}
+        protocol: ${_param:cluster_internal_protocol}

ironic/conductor/cluster.yml

diff --git a/ironic/conductor/cluster.yml b/ironic/conductor/cluster.yml
index 2394a29..917b8d0 100644
--- a/ironic/conductor/cluster.yml
+++ b/ironic/conductor/cluster.yml
@@ -3,6 +3,8 @@
 - system.salt.minion.cert.rabbitmq.clients.openstack.ironic
 - service.ironic.conductor.cluster
 parameters:
+  _param:
+    ironic_conductor_api_url_protocol: 'http'
   linux:
     system:
       package:
@@ -11,7 +13,7 @@
           version: latest
   ironic:
     conductor:
-      api_url: 'http://${_param:cluster_baremetal_vip_address}:6385'
+      api_url: '${_param:ironic_conductor_api_url_protocol}://${_param:cluster_baremetal_vip_address}:6385'
       database:
         x509:
           enabled: ${_param:openstack_mysql_x509_enabled}
@@ -36,6 +38,7 @@
           secret_key: ${_param:ironic_memcache_secret_key}
       identity:
         region: ${_param:openstack_region}
+        protocol: ${_param:cluster_internal_protocol}
       automated_clean: true
       erase_devices_priority: 0
       erase_devices_metadata_priority: 1
@@ -45,3 +48,4 @@
         - ipmitool-shellinabox
         - ipmitool-socat
         - no-console
+      pxe_append_params: 'nofb nomodeset vga=normal ipa-insecure=1'

ironic/conductor/single.yml

diff --git a/ironic/conductor/single.yml b/ironic/conductor/single.yml
index e5005da..9cd2e06 100644
--- a/ironic/conductor/single.yml
+++ b/ironic/conductor/single.yml
@@ -37,6 +37,7 @@
           secret_key: ${_param:ironic_memcache_secret_key}
       identity:
         region: ${_param:openstack_region}
+        protocol: ${_param:cluster_internal_protocol}
       automated_clean: true
       erase_devices_priority: 0
       erase_devices_metadata_priority: 1
@@ -46,3 +47,4 @@
         - ipmitool-shellinabox
         - ipmitool-socat
         - no-console
+      pxe_append_params: 'nofb nomodeset vga=normal ipa-insecure=1'