diff options
author | Chengcheng Mu <chengcheng.mu@amadeus.com> | 2015-08-18 10:46:23 +0200 |
---|---|---|
committer | Chengcheng Mu <chengcheng.mu@amadeus.com> | 2015-10-01 13:30:03 +0200 |
commit | d0b167bd075eda5ffa104229103dfad772e9f403 (patch) | |
tree | 71d353ec2e001ae9b854d230099f0815fbeeb05a /playbooks/common/openshift-cluster | |
parent | 318ac6b9b65f42f032382114f35d3c9fa7f5610b (diff) | |
download | openshift-d0b167bd075eda5ffa104229103dfad772e9f403.tar.gz openshift-d0b167bd075eda5ffa104229103dfad772e9f403.tar.bz2 openshift-d0b167bd075eda5ffa104229103dfad772e9f403.tar.xz openshift-d0b167bd075eda5ffa104229103dfad772e9f403.zip |
fixed some issues to boot VM on GCE
corrected openshift master config, commented infra
correct list and terminate, it was bugged in case where no instance were terminated
Using openshift-sdn for gce
new join_node playbook for gce
openstack/hosts/nova.py is now taking the nova/ini of its directory and not the directory of execution of bin/cluster
add fix of ICMP reject rules
Avoid a recursive loop
Jenkins image was renamed
Default masters to t2.medium instead of t2.small
Fix a minor bug involving AWS ENV Keys
* If a user forgot to set their AWS keys, we'd get a non descriptive error about a variable not being set
* This patch uses the correct variable so the error message is more informative
delete some fix that are needed anymore (selinux, iptables rules for sdn)
GCE : all variables needed are in gce.ini, it will be used by bin/cluster (now check better the presence of gce.init in the default place or use GCE_INI_PATH to locate it ), also by gce.ini
openshift_node_labels : get from oo_option
fix syntax error in bin/cluster
fix lookup for openshift_node_labels
Adding desc, multiplier, and units to zabbix item
Adding capability to have descriptions on triggers
updated triggers and items to have better descriptions and multipliers
Move openshift_data_dir to a fact based on deployment_type
Previously this was being set to /var/lib/origin regardless of deployment_type
which isn't correct given that existing 'enterprise' and 'online' deployments
would have been deployed with /var/lib/openshift
Verify again that ansible version is different than 1.9.0 and 1.9.0.1
bin/cluste does not take -a and -s anymore
fix master_public_api_url : using by default a correct url
Really fixed master public api url this time
Really fixed master public api url this time
uncommented infra deployment like before
fixed again masterpublicurl in a template
README_GCE.md : use GCE_INI_PATH in order to locate gce.ini, update description of gce.ini
Diffstat (limited to 'playbooks/common/openshift-cluster')
-rw-r--r-- | playbooks/common/openshift-cluster/set_infra_launch_facts_tasks.yml | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/playbooks/common/openshift-cluster/set_infra_launch_facts_tasks.yml b/playbooks/common/openshift-cluster/set_infra_launch_facts_tasks.yml new file mode 100644 index 000000000..0fd53eb7d --- /dev/null +++ b/playbooks/common/openshift-cluster/set_infra_launch_facts_tasks.yml @@ -0,0 +1,15 @@ +--- +- set_fact: k8s_type=infra +- set_fact: sub_host_type="{{ type }}" +- set_fact: number_infra="{{ count }}" + +- name: Generate infra instance names(s) + set_fact: + scratch_name: "{{ cluster_id }}-{{ k8s_type }}-{{ sub_host_type }}-{{ '%05x' | format(1048576 | random) }}" + register: infra_names_output + with_sequence: count={{ number_infra }} + +- set_fact: + infra_names: "{{ infra_names_output.results | default([]) + | oo_collect('ansible_facts') + | oo_collect('scratch_name') }}" |