diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2017-05-23 14:31:09 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2017-05-23 14:31:09 +0000 |
| commit | ecc231438850a057e3dca8bc9673c9e22d54213d (patch) | |
| tree | 3f303ae86ea37842c76296df45e4991f28e04111 | |
| parent | 9c93a1aff67eff1b32aa0a7d04d6f86afe8ae071 (diff) | |
| parent | a4146b33205f814014e60e5e1dac65f065da0ac5 (diff) | |
Merge "docker/TLS-everywhere: Add metadata_settings output to templates"
| -rw-r--r-- | docker/services/glance-api.yaml | 2 | ||||
| -rw-r--r-- | docker/services/heat-api-cfn.yaml | 2 | ||||
| -rw-r--r-- | docker/services/heat-api.yaml | 2 | ||||
| -rw-r--r-- | docker/services/neutron-api.yaml | 2 | ||||
| -rw-r--r-- | docker/services/swift-proxy.yaml | 2 |
5 files changed, 10 insertions, 0 deletions
diff --git a/docker/services/glance-api.yaml b/docker/services/glance-api.yaml index ef1e00ed..07710c7a 100644 --- a/docker/services/glance-api.yaml +++ b/docker/services/glance-api.yaml @@ -149,3 +149,5 @@ outputs: - name: Stop and disable glance_api service tags: step2 service: name=openstack-glance-api state=stopped enabled=no + metadata_settings: + get_attr: [GlanceApiPuppetBase, role_data, metadata_settings] diff --git a/docker/services/heat-api-cfn.yaml b/docker/services/heat-api-cfn.yaml index 2631928f..37fa4c81 100644 --- a/docker/services/heat-api-cfn.yaml +++ b/docker/services/heat-api-cfn.yaml @@ -132,3 +132,5 @@ outputs: - name: Stop and disable heat_api_cfn service tags: step2 service: name=httpd state=stopped enabled=no + metadata_settings: + get_attr: [HeatBase, role_data, metadata_settings] diff --git a/docker/services/heat-api.yaml b/docker/services/heat-api.yaml index b2f4eb64..5043aed8 100644 --- a/docker/services/heat-api.yaml +++ b/docker/services/heat-api.yaml @@ -132,3 +132,5 @@ outputs: - name: Stop and disable heat_api service tags: step2 service: name=httpd state=stopped enabled=no + metadata_settings: + get_attr: [HeatBase, role_data, metadata_settings] diff --git a/docker/services/neutron-api.yaml b/docker/services/neutron-api.yaml index 748371d5..9517e4b1 100644 --- a/docker/services/neutron-api.yaml +++ b/docker/services/neutron-api.yaml @@ -164,3 +164,5 @@ outputs: - name: Stop and disable neutron_api service tags: step2 service: name=neutron-server state=stopped enabled=no + metadata_settings: + get_attr: [NeutronBase, role_data, metadata_settings] diff --git a/docker/services/swift-proxy.yaml b/docker/services/swift-proxy.yaml index 60972f91..04c4ba1e 100644 --- a/docker/services/swift-proxy.yaml +++ b/docker/services/swift-proxy.yaml @@ -135,3 +135,5 @@ outputs: - name: Stop and disable swift_proxy service tags: step2 service: name=openstack-swift-proxy state=stopped enabled=no + metadata_settings: + get_attr: [SwiftProxyBase, role_data, metadata_settings] |