diff options
| author | Wesley Hearn <wesley.s.hearn@gmail.com> | 2015-08-26 11:55:10 -0400 |
|---|---|---|
| committer | Wesley Hearn <wesley.s.hearn@gmail.com> | 2015-08-26 11:55:10 -0400 |
| commit | 16ee4457862a79f77b43997a646b4e27391c34fb (patch) | |
| tree | ee27d4399c156c90d065b7fd05b2d4615024f632 /playbooks/openstack/openshift-cluster/vars.yml | |
| parent | fa3411adb3458cf225ab60314c6e8c99678d0da1 (diff) | |
| parent | b9606a11fe875d9151a0238bc45f149e1cbe819c (diff) | |
| download | openshift-16ee4457862a79f77b43997a646b4e27391c34fb.tar.gz openshift-16ee4457862a79f77b43997a646b4e27391c34fb.tar.bz2 openshift-16ee4457862a79f77b43997a646b4e27391c34fb.tar.xz openshift-16ee4457862a79f77b43997a646b4e27391c34fb.zip | |
Merge pull request #483 from lhuard1A/issue_471
Properly pass the "external network" option to the HEAT template
Diffstat (limited to 'playbooks/openstack/openshift-cluster/vars.yml')
| -rw-r--r-- | playbooks/openstack/openshift-cluster/vars.yml | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/playbooks/openstack/openshift-cluster/vars.yml b/playbooks/openstack/openshift-cluster/vars.yml index 43e25f2e6..262d3f4ed 100644 --- a/playbooks/openstack/openshift-cluster/vars.yml +++ b/playbooks/openstack/openshift-cluster/vars.yml @@ -1,18 +1,14 @@ --- openstack_infra_heat_stack: "{{ lookup('oo_option', 'infra_heat_stack' ) | default('files/heat_stack.yaml', True) }}" -openstack_network_prefix: "{{ lookup('oo_option', 'network_prefix' ) | - default('openshift-ansible-'+cluster_id, True) }}" openstack_network_cidr: "{{ lookup('oo_option', 'net_cidr' ) | default('192.168.' + ( ( 1048576 | random % 256 ) | string() ) + '.0/24', True) }}" openstack_network_external_net: "{{ lookup('oo_option', 'external_net' ) | default('external', True) }}" -openstack_floating_ip_pools: "{{ lookup('oo_option', 'floating_ip_pools') | - default('external', True) | oo_split() }}" +openstack_floating_ip_pool: "{{ lookup('oo_option', 'floating_ip_pool' ) | + default('external', True) }}" openstack_network_dns: "{{ lookup('oo_option', 'dns' ) | default('8.8.8.8,8.8.4.4', True) | oo_split() }}" -openstack_ssh_keypair: "{{ lookup('oo_option', 'keypair' ) | - default(lookup('env', 'LOGNAME')+'_key', True) }}" openstack_ssh_public_key: "{{ lookup('file', lookup('oo_option', 'public_key') | default('~/.ssh/id_rsa.pub', True)) }}" openstack_ssh_access_from: "{{ lookup('oo_option', 'ssh_from') | |