summaryrefslogtreecommitdiffstats
path: root/playbooks/openstack
diff options
context:
space:
mode:
Diffstat (limited to 'playbooks/openstack')
-rw-r--r--playbooks/openstack/openshift-cluster/files/heat_stack.yaml20
-rw-r--r--playbooks/openstack/openshift-cluster/launch.yml35
2 files changed, 47 insertions, 8 deletions
diff --git a/playbooks/openstack/openshift-cluster/files/heat_stack.yaml b/playbooks/openstack/openshift-cluster/files/heat_stack.yaml
index 40e4ab22c..e3e2b6872 100644
--- a/playbooks/openstack/openshift-cluster/files/heat_stack.yaml
+++ b/playbooks/openstack/openshift-cluster/files/heat_stack.yaml
@@ -88,6 +88,12 @@ parameters:
label: Infra flavor
description: Flavor of the infra node servers
+ key_pair:
+ type: string
+ label: Key name
+ description: Name of the key
+
+
outputs:
master_names:
@@ -250,6 +256,14 @@ resources:
port_range_max: 10250
remote_mode: remote_group_id
remote_group_id: { get_resource: master-secgrp }
+ - direction: ingress
+ protocol: tcp
+ port_range_min: 30001
+ port_range_max: 30001
+ - direction: ingress
+ protocol: tcp
+ port_range_min: 30850
+ port_range_max: 30850
infra-secgrp:
type: OS::Neutron::SecurityGroup
@@ -291,7 +305,7 @@ resources:
type: master
image: { get_param: master_image }
flavor: { get_param: master_flavor }
- key_name: { get_resource: keypair }
+ key_name: { get_param: key_pair }
net: { get_resource: net }
subnet: { get_resource: subnet }
secgrp:
@@ -323,7 +337,7 @@ resources:
subtype: compute
image: { get_param: node_image }
flavor: { get_param: node_flavor }
- key_name: { get_resource: keypair }
+ key_name: { get_param: key_pair }
net: { get_resource: net }
subnet: { get_resource: subnet }
secgrp:
@@ -355,7 +369,7 @@ resources:
subtype: infra
image: { get_param: infra_image }
flavor: { get_param: infra_flavor }
- key_name: { get_resource: keypair }
+ key_name: { get_param: key_pair }
net: { get_resource: net }
subnet: { get_resource: subnet }
secgrp:
diff --git a/playbooks/openstack/openshift-cluster/launch.yml b/playbooks/openstack/openshift-cluster/launch.yml
index 651aef40b..5f1780476 100644
--- a/playbooks/openstack/openshift-cluster/launch.yml
+++ b/playbooks/openstack/openshift-cluster/launch.yml
@@ -19,15 +19,32 @@
changed_when: false
failed_when: stack_show_result.rc != 0 and 'Stack not found' not in stack_show_result.stderr
- - set_fact:
- heat_stack_action: 'stack-create'
+ - 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'
when: stack_show_result.rc == 1
- set_fact:
heat_stack_action: 'stack-update'
when: stack_show_result.rc == 0
- - name: Create or Update OpenStack Stack
- command: 'heat {{ heat_stack_action }} -f {{ openstack_infra_heat_stack }}
+ - name: Update OpenStack Stack
+ command: 'heat stack-update -f {{ openstack_infra_heat_stack }}
+ -P key_pair={{ openstack_ssh_keypair }}
-P cluster_id={{ cluster_id }}
-P cidr={{ openstack_network_cidr }}
-P dns_nameservers={{ openstack_network_dns | join(",") }}
@@ -50,7 +67,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: 30
+ retries: 300
delay: 1
failed_when: stack_show_status_result.stdout not in ['CREATE_COMPLETE', 'UPDATE_COMPLETE']
@@ -119,4 +136,12 @@
- 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