summaryrefslogtreecommitdiffstats
path: root/playbooks/openstack/openshift-cluster/tasks
diff options
context:
space:
mode:
authorLénaïc Huard <lhuard@amadeus.com>2015-08-17 10:43:49 +0200
committerLénaïc Huard <lhuard@amadeus.com>2015-08-17 10:44:24 +0200
commitb9606a11fe875d9151a0238bc45f149e1cbe819c (patch)
tree98eaf8f37d3e4d9613bfc2f9ee90e18291bb3cb0 /playbooks/openstack/openshift-cluster/tasks
parent30d653aa5b776afbf35c98b1b5e7436f8cb7123c (diff)
downloadopenshift-b9606a11fe875d9151a0238bc45f149e1cbe819c.tar.gz
openshift-b9606a11fe875d9151a0238bc45f149e1cbe819c.tar.bz2
openshift-b9606a11fe875d9151a0238bc45f149e1cbe819c.tar.xz
openshift-b9606a11fe875d9151a0238bc45f149e1cbe819c.zip
Properly pass the "external network" option to the HEAT template
Fixes #471
Diffstat (limited to 'playbooks/openstack/openshift-cluster/tasks')
-rw-r--r--playbooks/openstack/openshift-cluster/tasks/configure_openstack.yml27
1 files changed, 0 insertions, 27 deletions
diff --git a/playbooks/openstack/openshift-cluster/tasks/configure_openstack.yml b/playbooks/openstack/openshift-cluster/tasks/configure_openstack.yml
deleted file mode 100644
index 2cbdb4805..000000000
--- a/playbooks/openstack/openshift-cluster/tasks/configure_openstack.yml
+++ /dev/null
@@ -1,27 +0,0 @@
----
-- name: Check infra
- command: 'heat stack-show {{ openstack_network_prefix }}-stack'
- register: stack_show_result
- changed_when: false
- failed_when: stack_show_result.rc != 0 and 'Stack not found' not in stack_show_result.stderr
-
-- name: Create infra
- command: 'heat stack-create -f {{ openstack_infra_heat_stack }} -P cluster-id={{ cluster_id }} -P network-prefix={{ openstack_network_prefix }} -P dns-nameservers={{ openstack_network_dns | join(",") }} -P cidr={{ openstack_network_cidr }} -P ssh-incoming={{ openstack_ssh_access_from }} {{ openstack_network_prefix }}-stack'
- when: stack_show_result.rc == 1
-
-- name: Update infra
- command: 'heat stack-update -f {{ openstack_infra_heat_stack }} -P cluster-id={{ cluster_id }} -P network-prefix={{ openstack_network_prefix }} -P dns-nameservers={{ openstack_network_dns | join(",") }} -P cidr={{ openstack_network_cidr }} -P ssh-incoming={{ openstack_ssh_access_from }} {{ openstack_network_prefix }}-stack'
- when: stack_show_result.rc == 0
-
-- name: Wait for infra readiness
- shell: 'heat stack-show {{ openstack_network_prefix }}-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: 30
- delay: 1
- failed_when: stack_show_status_result.stdout not in ['CREATE_COMPLETE', 'UPDATE_COMPLETE']
-
-- name: Create ssh keypair
- nova_keypair:
- name: "{{ openstack_ssh_keypair }}"
- public_key: "{{ openstack_ssh_public_key }}"