Merge "Add metadata_settings to Octavia and Glance APIs"

2018-10-13 17:50:58 +00:00 · 2018-10-13 17:50:58 +00:00 · c6a3b8805c
commit c6a3b8805c
parent 5663baa05d 66f9c304db
4 changed files with 12 additions and 0 deletions
--- a/docker/services/octavia-api.yaml
+++ b/docker/services/octavia-api.yaml
@ -242,3 +242,5 @@ outputs:
                - octavia_api_httpd_enabled|bool
                - httpd_running|bool
              service: name=httpd state=stopped
+      metadata_settings:
+        get_attr: [OctaviaApiPuppetBase, role_data, metadata_settings]
--- a/puppet/services/glance-api.yaml
+++ b/puppet/services/glance-api.yaml
@ -413,3 +413,5 @@ outputs:
            - step|int == 1
            - glance_registry_enabled.rc == 0
          service: name=openstack-glance-registry state=stopped enabled=no
+      metadata_settings:
+        get_attr: [TLSProxyBase, role_data, metadata_settings]
--- a/puppet/services/octavia-api.yaml
+++ b/puppet/services/octavia-api.yaml
@ -175,3 +175,5 @@ outputs:
          octavia::db::mysql::allowed_hosts:
            - '%'
            - "%{hiera('mysql_bind_host')}"
+      metadata_settings:
+        get_attr: [TLSProxyBase, role_data, metadata_settings]
--- a/releasenotes/notes/add-metadata-settings-to-octavia-and-glance-tls-internal-5d8e46650b174626.yaml
+++ b/releasenotes/notes/add-metadata-settings-to-octavia-and-glance-tls-internal-5d8e46650b174626.yaml
@ -0,0 +1,6 @@
+---
+fixes:
+  - |
+    Fixed an issue where if Octavia API or Glance API were deployed away from
+    the controller node with internal TLS, the service principals wouldn't be
+    created.