diff options
| author | dougbtv <douglaskippsmith@gmail.com> | 2016-11-05 12:12:28 -0400 | 
|---|---|---|
| committer | dougbtv <douglaskippsmith@gmail.com> | 2016-11-05 12:12:28 -0400 | 
| commit | 47f60945df5179efc61031854476ffc9b27e6a19 (patch) | |
| tree | c881d57f5ef5286a1822ca2b263e4947fd023208 /playbooks/openstack | |
| parent | 4698b0c696b9d9cf2b8dbff5eaa4fcaa545093cd (diff) | |
| download | openshift-47f60945df5179efc61031854476ffc9b27e6a19.tar.gz openshift-47f60945df5179efc61031854476ffc9b27e6a19.tar.bz2 openshift-47f60945df5179efc61031854476ffc9b27e6a19.tar.xz openshift-47f60945df5179efc61031854476ffc9b27e6a19.zip  | |
[openstack] allows timeout option for heat create stack
Diffstat (limited to 'playbooks/openstack')
| -rw-r--r-- | playbooks/openstack/openshift-cluster/launch.yml | 2 | ||||
| -rw-r--r-- | playbooks/openstack/openshift-cluster/vars.yml | 2 | 
2 files changed, 3 insertions, 1 deletions
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) }}"  | 
