summaryrefslogtreecommitdiffstats
path: root/roles/openstack-stack
diff options
context:
space:
mode:
Diffstat (limited to 'roles/openstack-stack')
-rw-r--r--roles/openstack-stack/templates/heat_stack.yaml.j212
-rw-r--r--roles/openstack-stack/test/stack-create-test.yml4
2 files changed, 8 insertions, 8 deletions
diff --git a/roles/openstack-stack/templates/heat_stack.yaml.j2 b/roles/openstack-stack/templates/heat_stack.yaml.j2
index c367aabe7..09b62cba7 100644
--- a/roles/openstack-stack/templates/heat_stack.yaml.j2
+++ b/roles/openstack-stack/templates/heat_stack.yaml.j2
@@ -381,7 +381,7 @@ resources:
params:
cluster_id: {{ stack_name }}
k8s_type: etcd
- cluster_env: {{ dns_domain }}
+ cluster_env: {{ public_dns_domain }}
cluster_id: {{ stack_name }}
group:
str_replace:
@@ -421,7 +421,7 @@ resources:
params:
cluster_id: {{ stack_name }}
k8s_type: lb
- cluster_env: {{ dns_domain }}
+ cluster_env: {{ public_dns_domain }}
cluster_id: {{ stack_name }}
group:
str_replace:
@@ -461,7 +461,7 @@ resources:
params:
cluster_id: {{ stack_name }}
k8s_type: master
- cluster_env: {{ dns_domain }}
+ cluster_env: {{ public_dns_domain }}
cluster_id: {{ stack_name }}
group:
str_replace:
@@ -505,7 +505,7 @@ resources:
cluster_id: {{ stack_name }}
k8s_type: node
subtype: app
- cluster_env: {{ dns_domain }}
+ cluster_env: {{ public_dns_domain }}
cluster_id: {{ stack_name }}
group:
str_replace:
@@ -548,7 +548,7 @@ resources:
cluster_id: {{ stack_name }}
k8s_type: node
subtype: infra
- cluster_env: {{ dns_domain }}
+ cluster_env: {{ public_dns_domain }}
cluster_id: {{ stack_name }}
group:
str_replace:
@@ -591,7 +591,7 @@ resources:
params:
cluster_id: {{ stack_name }}
k8s_type: dns
- cluster_env: {{ dns_domain }}
+ cluster_env: {{ public_dns_domain }}
cluster_id: {{ stack_name }}
group:
str_replace:
diff --git a/roles/openstack-stack/test/stack-create-test.yml b/roles/openstack-stack/test/stack-create-test.yml
index 94e312ee3..6cbd7ff30 100644
--- a/roles/openstack-stack/test/stack-create-test.yml
+++ b/roles/openstack-stack/test/stack-create-test.yml
@@ -3,8 +3,8 @@
roles:
- role: openstack-stack
stack_name: test-stack
- dns_domain: "{{ openstack_dns_domain }}"
- dns_nameservers: "{{ openstack_nameservers }}"
+ dns_domain: "{{ public_dns_domain }}"
+ dns_nameservers: "{{ public_dns_nameservers }}"
subnet_prefix: "{{ openstack_subnet_prefix }}"
ssh_public_key: "{{ openstack_ssh_public_key }}"
openstack_image: "{{ openstack_default_image_name }}"