diff options
| author | Jason DeTiberus <jdetiber@redhat.com> | 2016-05-05 21:38:08 -0400 |
|---|---|---|
| committer | Jason DeTiberus <jdetiber@redhat.com> | 2016-05-05 21:38:08 -0400 |
| commit | 4f4c4f038f4df910a33c0c1ab3bc8b2179f4a764 (patch) | |
| tree | 9d789e434646435dc92667626fe8d184793c931f | |
| parent | 31be08a7e02c64c3ac59c6a6b0fc26e714f3e6ab (diff) | |
| download | openshift-4f4c4f038f4df910a33c0c1ab3bc8b2179f4a764.tar.gz openshift-4f4c4f038f4df910a33c0c1ab3bc8b2179f4a764.tar.bz2 openshift-4f4c4f038f4df910a33c0c1ab3bc8b2179f4a764.tar.xz openshift-4f4c4f038f4df910a33c0c1ab3bc8b2179f4a764.zip | |
allow for overriding dns_flavor for openstack provider
| -rw-r--r-- | playbooks/openstack/openshift-cluster/launch.yml | 2 | ||||
| -rw-r--r-- | playbooks/openstack/openshift-cluster/vars.yml | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/playbooks/openstack/openshift-cluster/launch.yml b/playbooks/openstack/openshift-cluster/launch.yml index 3d4fe42d0..6429a6755 100644 --- a/playbooks/openstack/openshift-cluster/launch.yml +++ b/playbooks/openstack/openshift-cluster/launch.yml @@ -46,7 +46,7 @@ -P master_flavor={{ openstack_flavor["master"] }} -P node_flavor={{ openstack_flavor["node"] }} -P infra_flavor={{ openstack_flavor["infra"] }} - -P dns_flavor=m1.small + -P dns_flavor={{ openshift_flavor["dns"] }} openshift-ansible-{{ cluster_id }}-stack' - name: Wait for OpenStack Stack readiness diff --git a/playbooks/openstack/openshift-cluster/vars.yml b/playbooks/openstack/openshift-cluster/vars.yml index 84cba0506..bc53a51b0 100644 --- a/playbooks/openstack/openshift-cluster/vars.yml +++ b/playbooks/openstack/openshift-cluster/vars.yml @@ -13,6 +13,7 @@ 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: + dns: "{{ lookup('oo_option', 'dns_flavor' ) | default('m1.small', True) }}" etcd: "{{ lookup('oo_option', 'etcd_flavor' ) | default('m1.small', True) }}" master: "{{ lookup('oo_option', 'master_flavor' ) | default('m1.small', True) }}" infra: "{{ lookup('oo_option', 'infra_flavor' ) | default('m1.small', True) }}" |