diff options
author | Vishal Patil <vishpat@gmail.com> | 2016-01-04 16:42:25 -0500 |
---|---|---|
committer | Vishal Patil <vishpat@gmail.com> | 2016-01-25 13:19:13 -0500 |
commit | 93eb9ba8fc5d6d14b8ffff1b946c528233cbb1d5 (patch) | |
tree | a4a06f52e08aebe8c55c21002f3f2956cd178e0a /roles/openshift_facts | |
parent | 530aaf841d38c036a2d08df075f85d63b8a52840 (diff) | |
download | openshift-93eb9ba8fc5d6d14b8ffff1b946c528233cbb1d5.tar.gz openshift-93eb9ba8fc5d6d14b8ffff1b946c528233cbb1d5.tar.bz2 openshift-93eb9ba8fc5d6d14b8ffff1b946c528233cbb1d5.tar.xz openshift-93eb9ba8fc5d6d14b8ffff1b946c528233cbb1d5.zip |
Add Nuage support to openshift ansible
Added variables
Made changes for node configuration
Add service restart logic to node
Fixed ansible syntax errors
Add cert and key info for nodes
Added active and standby controller ip configuration information
Uncommented the nuage sdn check
Changed ca_crt -> ca_cert
Added restarting of atomic openshift master
Removed service account dependencies
Fixes
Fixed the api server url
Removed redundant restart of atomic openshift master
Configure nuagekubemon on all of the master nodes
Restart master api and controllers as well on nuagekubemon installation
Converted plugin config into template
Add template for nuagekubemon
Removed uplink interface from vars
Able to copy cert keys
Uninstall default ovs
Add the kubemon template
Do not install rdo sdn rpms in case of nuage
Addressed latest review comments
Set the networkPluginName for nuage
Diffstat (limited to 'roles/openshift_facts')
-rwxr-xr-x | roles/openshift_facts/library/openshift_facts.py | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/roles/openshift_facts/library/openshift_facts.py b/roles/openshift_facts/library/openshift_facts.py index 8b3402729..3f8f6b5af 100755 --- a/roles/openshift_facts/library/openshift_facts.py +++ b/roles/openshift_facts/library/openshift_facts.py @@ -341,6 +341,23 @@ def set_flannel_facts_if_unset(facts): facts['common']['use_flannel'] = use_flannel return facts +def set_nuage_facts_if_unset(facts): + """ Set nuage facts if not already present in facts dict + dict: the facts dict updated with the nuage facts if + missing + Args: + facts (dict): existing facts + Returns: + dict: the facts dict updated with the nuage + facts if they were not already present + + """ + if 'common' in facts: + if 'use_nuage' not in facts['common']: + use_nuage = False + facts['common']['use_nuage'] = use_nuage + return facts + def set_node_schedulability(facts): """ Set schedulable facts if not already present in facts dict Args: @@ -1022,6 +1039,7 @@ class OpenShiftFacts(object): facts = set_project_cfg_facts_if_unset(facts) facts = set_fluentd_facts_if_unset(facts) facts = set_flannel_facts_if_unset(facts) + facts = set_nuage_facts_if_unset(facts) facts = set_node_schedulability(facts) facts = set_master_selectors(facts) facts = set_metrics_facts_if_unset(facts) |