diff options
| author | Jason DeTiberus <detiber@gmail.com> | 2016-11-16 14:27:41 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-11-16 14:27:41 -0500 |
| commit | 7762b55f399eda5dd1ea1ad74773ac48778cb30b (patch) | |
| tree | b208f424ad387643cc69c19e7a3295f56781b594 | |
| parent | 3b41756a818562207caa2fbef1186aafc5ca8511 (diff) | |
| parent | 47f60945df5179efc61031854476ffc9b27e6a19 (diff) | |
| download | openshift-7762b55f399eda5dd1ea1ad74773ac48778cb30b.tar.gz openshift-7762b55f399eda5dd1ea1ad74773ac48778cb30b.tar.bz2 openshift-7762b55f399eda5dd1ea1ad74773ac48778cb30b.tar.xz openshift-7762b55f399eda5dd1ea1ad74773ac48778cb30b.zip | |
Merge pull request #2734 from dougbtv/openstack_timeout_option
[openstack] allows timeout option for heat create stack
| -rw-r--r-- | README_openstack.md | 1 | ||||
| -rw-r--r-- | playbooks/openstack/openshift-cluster/launch.yml | 2 | ||||
| -rw-r--r-- | playbooks/openstack/openshift-cluster/vars.yml | 2 |
3 files changed, 4 insertions, 1 deletions
diff --git a/README_openstack.md b/README_openstack.md index d3d1f9052..2578488c7 100644 --- a/README_openstack.md +++ b/README_openstack.md @@ -50,6 +50,7 @@ The following options are used only by `heat_stack.yaml`. They are so used only * `floating_ip_pool` (default to `external`): comma separated list of floating IP pools * `ssh_from` (default to `0.0.0.0/0`): IPs authorized to connect to the VMs via ssh * `node_port_from` (default to `0.0.0.0/0`): IPs authorized to connect to the services exposed via nodePort +* `heat_timeout` (default to `3`): Timeout (in minutes) passed to heat for create or update stack. Creating a cluster diff --git a/playbooks/openstack/openshift-cluster/launch.yml b/playbooks/openstack/openshift-cluster/launch.yml index eb2c4269a..7e037f2af 100644 --- a/playbooks/openstack/openshift-cluster/launch.yml +++ b/playbooks/openstack/openshift-cluster/launch.yml @@ -25,7 +25,7 @@ - name: Create or Update OpenStack Stack command: 'heat {{ heat_stack_action }} -f {{ openstack_infra_heat_stack }} - --timeout 3 + --timeout {{ openstack_heat_timeout }} -P cluster_env={{ cluster_env }} -P cluster_id={{ cluster_id }} -P subnet_24_prefix={{ openstack_subnet_24_prefix }} diff --git a/playbooks/openstack/openshift-cluster/vars.yml b/playbooks/openstack/openshift-cluster/vars.yml index 62111dacf..79b336ce7 100644 --- a/playbooks/openstack/openshift-cluster/vars.yml +++ b/playbooks/openstack/openshift-cluster/vars.yml @@ -14,6 +14,8 @@ openstack_ssh_access_from: "{{ lookup('oo_option', 'ssh_from') | default('0.0.0.0/0', True) }}" openstack_node_port_access_from: "{{ lookup('oo_option', 'node_port_from') | default('0.0.0.0/0', True) }}" +openstack_heat_timeout: "{{ lookup('oo_option', 'heat_timeout') | + default('3', True) }}" openstack_flavor: etcd: "{{ lookup('oo_option', 'etcd_flavor' ) | default('m1.small', True) }}" master: "{{ lookup('oo_option', 'master_flavor' ) | default('m1.small', True) }}" |