summaryrefslogtreecommitdiffstats
path: root/roles/openshift_openstack
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2018-01-11 11:39:02 -0800
committerGitHub <noreply@github.com>2018-01-11 11:39:02 -0800
commitfdc5829d6ca252e1574278cd1dc50e932378d98d (patch)
tree0f80b64e32b59e7c4a2735066aed5f4e363e5a8a /roles/openshift_openstack
parente347c3ed3cc23cdf3af1077dd4becc572a7dfad9 (diff)
parent3d943161cedc2fc0d1690e03ece1e2504d4d6d74 (diff)
downloadopenshift-fdc5829d6ca252e1574278cd1dc50e932378d98d.tar.gz
openshift-fdc5829d6ca252e1574278cd1dc50e932378d98d.tar.bz2
openshift-fdc5829d6ca252e1574278cd1dc50e932378d98d.tar.xz
openshift-fdc5829d6ca252e1574278cd1dc50e932378d98d.zip
Merge pull request #6607 from tomassedovic/fix-cinder-pv
Automatic merge from submit-queue. Fix Cinder Persistent Volume support This documents how to use Cinder-backed persistent volumes with OpenStack. It needed a change to the dynamic inventory because the "openstack" cloudprovider plugin does actually require internal name resolution -- and the `openshift_hostname` value must match the name of the Nova server. In addition, we need to be able to specify the V2 of the Cinder API for now as described in: https://github.com/openshift/openshift-docs/issues/5730
Diffstat (limited to 'roles/openshift_openstack')
-rw-r--r--roles/openshift_openstack/templates/heat_stack_server.yaml.j23
1 files changed, 3 insertions, 0 deletions
diff --git a/roles/openshift_openstack/templates/heat_stack_server.yaml.j2 b/roles/openshift_openstack/templates/heat_stack_server.yaml.j2
index a829da34f..1e73c9e1c 100644
--- a/roles/openshift_openstack/templates/heat_stack_server.yaml.j2
+++ b/roles/openshift_openstack/templates/heat_stack_server.yaml.j2
@@ -212,6 +212,9 @@ resources:
host-type: { get_param: type }
sub-host-type: { get_param: subtype }
node_labels: { get_param: node_labels }
+{% if openshift_openstack_dns_nameservers %}
+ openshift_hostname: { get_param: name }
+{% endif %}
scheduler_hints: { get_param: scheduler_hints }
{% if use_trunk_ports|default(false)|bool %}