summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChengcheng Mu <chengcheng.mu@amadeus.com>2015-10-06 17:00:01 +0200
committerChengcheng Mu <chengcheng.mu@amadeus.com>2015-10-06 17:00:01 +0200
commit6b511f103d605e5150488154e0cd5e2e65f64100 (patch)
tree56819026b1878dcffed92da4b8eb614a8c82ffe4
parenta3ba0278879075e14373a6872acc5f0c3cc3d9a2 (diff)
parent6e80868ad12cde826fbd919a365335935fb75c84 (diff)
downloadopenshift-6b511f103d605e5150488154e0cd5e2e65f64100.tar.gz
openshift-6b511f103d605e5150488154e0cd5e2e65f64100.tar.bz2
openshift-6b511f103d605e5150488154e0cd5e2e65f64100.tar.xz
openshift-6b511f103d605e5150488154e0cd5e2e65f64100.zip
Merge branch 'gce-support' of https://github.com/menren/openshift-ansible into gce-support
-rw-r--r--playbooks/openstack/openshift-cluster/launch.yml35
1 files changed, 5 insertions, 30 deletions
diff --git a/playbooks/openstack/openshift-cluster/launch.yml b/playbooks/openstack/openshift-cluster/launch.yml
index 5f1780476..651aef40b 100644
--- a/playbooks/openstack/openshift-cluster/launch.yml
+++ b/playbooks/openstack/openshift-cluster/launch.yml
@@ -19,32 +19,15 @@
changed_when: false
failed_when: stack_show_result.rc != 0 and 'Stack not found' not in stack_show_result.stderr
- - name: Create OpenStack Stack
- command: 'heat stack-create -f {{ openstack_infra_heat_stack }}
- -P key_pair={{ openstack_ssh_keypair }}
- -P cluster_id={{ cluster_id }}
- -P dns_nameservers={{ openstack_network_dns | join(",") }}
- -P cidr={{ openstack_network_cidr }}
- -P ssh_incoming={{ openstack_ssh_access_from }}
- -P num_masters={{ num_masters }}
- -P num_nodes={{ num_nodes }}
- -P num_infra={{ num_infra }}
- -P master_image={{ deployment_vars[deployment_type].image }}
- -P node_image={{ deployment_vars[deployment_type].image }}
- -P infra_image={{ deployment_vars[deployment_type].image }}
- -P master_flavor={{ openstack_flavor["master"] }}
- -P node_flavor={{ openstack_flavor["node"] }}
- -P infra_flavor={{ openstack_flavor["infra"] }}
- -P ssh_public_key="{{ openstack_ssh_public_key }}"
- openshift-ansible-{{ cluster_id }}-stack'
+ - set_fact:
+ heat_stack_action: 'stack-create'
when: stack_show_result.rc == 1
- set_fact:
heat_stack_action: 'stack-update'
when: stack_show_result.rc == 0
- - name: Update OpenStack Stack
- command: 'heat stack-update -f {{ openstack_infra_heat_stack }}
- -P key_pair={{ openstack_ssh_keypair }}
+ - name: Create or Update OpenStack Stack
+ command: 'heat {{ heat_stack_action }} -f {{ openstack_infra_heat_stack }}
-P cluster_id={{ cluster_id }}
-P cidr={{ openstack_network_cidr }}
-P dns_nameservers={{ openstack_network_dns | join(",") }}
@@ -67,7 +50,7 @@
shell: 'heat stack-show openshift-ansible-{{ cluster_id }}-stack | awk ''$2 == "stack_status" {print $4}'''
register: stack_show_status_result
until: stack_show_status_result.stdout not in ['CREATE_IN_PROGRESS', 'UPDATE_IN_PROGRESS']
- retries: 300
+ retries: 30
delay: 1
failed_when: stack_show_status_result.stdout not in ['CREATE_COMPLETE', 'UPDATE_COMPLETE']
@@ -136,12 +119,4 @@
- include: update.yml
-# Fix icmp reject iptables rules
-# It should be solved in openshift-sdn but unfortunately it's not the case
-# Mysterious
-- name: Configuring Nodes for RBox
- hosts: oo_nodes_to_config
- roles:
- - rbox-node
-
- include: list.yml