summaryrefslogtreecommitdiffstats
path: root/playbooks/openstack/sample-inventory
diff options
context:
space:
mode:
authorTomas Sedovic <tomas@sedovic.cz>2017-11-01 16:43:13 +0100
committerTomas Sedovic <tomas@sedovic.cz>2017-11-07 14:35:47 +1100
commit79f29bc825286c4f69073827a5b6d71f71f47c91 (patch)
treedb91c04c153aef1419871a7843e8d415c49e0a60 /playbooks/openstack/sample-inventory
parent23674d565f2801d88060bd0443ec384fbdcdad59 (diff)
downloadopenshift-79f29bc825286c4f69073827a5b6d71f71f47c91.tar.gz
openshift-79f29bc825286c4f69073827a5b6d71f71f47c91.tar.bz2
openshift-79f29bc825286c4f69073827a5b6d71f71f47c91.tar.xz
openshift-79f29bc825286c4f69073827a5b6d71f71f47c91.zip
Add the DNS updates and rename the openstack vars
Most of the vars in `roles/openshift_openstack/defaults/main.yml` are now prefixed with `openstack_`.
Diffstat (limited to 'playbooks/openstack/sample-inventory')
-rw-r--r--playbooks/openstack/sample-inventory/group_vars/OSEv3.yml4
-rw-r--r--playbooks/openstack/sample-inventory/group_vars/all.yml4
2 files changed, 4 insertions, 4 deletions
diff --git a/playbooks/openstack/sample-inventory/group_vars/OSEv3.yml b/playbooks/openstack/sample-inventory/group_vars/OSEv3.yml
index 949a323a7..7d8dc157e 100644
--- a/playbooks/openstack/sample-inventory/group_vars/OSEv3.yml
+++ b/playbooks/openstack/sample-inventory/group_vars/OSEv3.yml
@@ -5,8 +5,8 @@ openshift_deployment_type: origin
openshift_master_default_subdomain: "apps.{{ env_id }}.{{ public_dns_domain }}"
openshift_master_cluster_method: native
-openshift_master_cluster_hostname: "{{ groups.lb.0|default(groups.masters.0) }}"
-openshift_master_cluster_public_hostname: "{{ groups.lb.0|default(groups.masters.0) }}"
+openshift_master_cluster_hostname: "console.{{ env_id }}.{{ public_dns_domain }}"
+openshift_master_cluster_public_hostname: "{{ openshift_master_cluster_hostname }}"
osm_default_node_selector: 'region=primary'
diff --git a/playbooks/openstack/sample-inventory/group_vars/all.yml b/playbooks/openstack/sample-inventory/group_vars/all.yml
index 8ea798c14..e0618d685 100644
--- a/playbooks/openstack/sample-inventory/group_vars/all.yml
+++ b/playbooks/openstack/sample-inventory/group_vars/all.yml
@@ -1,7 +1,7 @@
---
env_id: "openshift"
public_dns_domain: "example.com"
-public_dns_nameservers: []
+openstack_dns_nameservers: []
# # Used Hostnames
# # - set custom hostnames for roles by uncommenting corresponding lines
@@ -12,7 +12,7 @@ public_dns_nameservers: []
#openstack_etcd_hostname: "etcd"
#openstack_dns_hostname: "dns"
-openstack_ssh_public_key: "openshift"
+openstack_keypair_name: "openshift"
openstack_external_network_name: "public"
#openstack_private_network_name: "openshift-ansible-{{ stack_name }}-net"
# # A dedicated Neutron network name for containers data network