diff options
| author | Thomas Wiest <twiest@users.noreply.github.com> | 2015-07-16 14:00:52 -0400 |
|---|---|---|
| committer | Thomas Wiest <twiest@users.noreply.github.com> | 2015-07-16 14:00:52 -0400 |
| commit | e0211ca67ce18fc9f74d0a9c82cf14a28f395e4d (patch) | |
| tree | 1f349f91d3c20baab4b29b7b3207ca29e0801816 /playbooks/openstack/openshift-cluster/vars.yml | |
| parent | adce78d68470b341b761372a70d06b5aec88de06 (diff) | |
| parent | 4b439253e7b4486947d201714d4f52a4a7e0fc01 (diff) | |
| download | openshift-e0211ca67ce18fc9f74d0a9c82cf14a28f395e4d.tar.gz openshift-e0211ca67ce18fc9f74d0a9c82cf14a28f395e4d.tar.bz2 openshift-e0211ca67ce18fc9f74d0a9c82cf14a28f395e4d.tar.xz openshift-e0211ca67ce18fc9f74d0a9c82cf14a28f395e4d.zip | |
Merge pull request #315 from lhuard1A/all_os_in_heat
Make all the OpenStack resources be managed by a Heat Stack
Diffstat (limited to 'playbooks/openstack/openshift-cluster/vars.yml')
| -rw-r--r-- | playbooks/openstack/openshift-cluster/vars.yml | 22 |
1 files changed, 5 insertions, 17 deletions
diff --git a/playbooks/openstack/openshift-cluster/vars.yml b/playbooks/openstack/openshift-cluster/vars.yml index 1ae7c17d2..d077a6ced 100644 --- a/playbooks/openstack/openshift-cluster/vars.yml +++ b/playbooks/openstack/openshift-cluster/vars.yml @@ -1,6 +1,6 @@ --- openstack_infra_heat_stack: "{{ lookup('oo_option', 'infra_heat_stack' ) | - default('files/heat_stack.yml', True) }}" + 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' ) | @@ -18,31 +18,19 @@ openstack_ssh_public_key: "{{ lookup('file', lookup('oo_option', 'public_k openstack_ssh_access_from: "{{ lookup('oo_option', 'ssh_from') | default('0.0.0.0/0', True) }}" openstack_flavor: - master: - ram: "{{ lookup('oo_option', 'master_flavor_ram' ) | default(2048, True) }}" - id: "{{ lookup('oo_option', 'master_flavor_id' ) | default(True) }}" - include: "{{ lookup('oo_option', 'master_flavor_include') | default(True) }}" - node: - ram: "{{ lookup('oo_option', 'node_flavor_ram' ) | default(4096, True) }}" - id: "{{ lookup('oo_option', 'node_flavor_id' ) | default(True) }}" - include: "{{ lookup('oo_option', 'node_flavor_include' ) | default(True) }}" + master: "{{ lookup('oo_option', 'master_flavor' ) | default('m1.small', True) }}" + node: "{{ lookup('oo_option', 'node_flavor' ) | default('m1.medium', True) }}" deployment_vars: origin: - image: - name: "{{ lookup('oo_option', 'image_name') | default('centos-70-raw', True) }}" - id: + image: "{{ lookup('oo_option', 'image_name') | default('centos-70-raw', True) }}" ssh_user: openshift sudo: yes online: image: - name: - id: ssh_user: root sudo: no enterprise: - image: - name: "{{ lookup('oo_option', 'image_name') | default('rhel-guest-image-7.1-20150224.0.x86_64', True) }}" - id: + image: "{{ lookup('oo_option', 'image_name') | default('rhel-guest-image-7.1-20150224.0.x86_64', True) }}" ssh_user: openshift sudo: yes |