summaryrefslogtreecommitdiffstats
path: root/roles/openstack-stack
diff options
context:
space:
mode:
authorØystein Bedin <oybed@users.noreply.github.com>2017-06-13 15:35:22 -0400
committerEric Sauer <etsauer@gmail.com>2017-06-13 14:35:22 -0500
commit22e88c9ce8f81cb13c3d050455d332161a1acd83 (patch)
tree5947dff709c231bee754aea91731c4b1c1386eae /roles/openstack-stack
parentf26abd53a9e2763091962421775fad102f0b05be (diff)
downloadopenshift-22e88c9ce8f81cb13c3d050455d332161a1acd83.tar.gz
openshift-22e88c9ce8f81cb13c3d050455d332161a1acd83.tar.bz2
openshift-22e88c9ce8f81cb13c3d050455d332161a1acd83.tar.xz
openshift-22e88c9ce8f81cb13c3d050455d332161a1acd83.zip
Update CASL to use nsupdate for DNS records (#48)
* Updated to use nsupdate for DNS records * Updated formatting of dict * Updating descriptive text * Support for external DNS config * Upgrading jinja2 to work correctly with latest templates * Latest update for nsupdate * Updated to use nsupdate for DNS records * Updated formatting of dict * Updating descriptive text * Support for external DNS config * Latest update for nsupdate * Updated to support external public/private DNS server(s) * Updated DNS server handling * Updated DNS server handling * Updated DNS server handling * Eliminated the from the sample inventories * Updated sample inventory to point to 2 separate DNS servers for private/public * Playbook clean-up * Adding 'python-dns' * splitting subscription manager calls to allow for a clean pre-install playbook
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 }}"