diff --git a/docs/ADVANCED.md b/docs/ADVANCED.md index 088d0e7a..fded6a31 100644 --- a/docs/ADVANCED.md +++ b/docs/ADVANCED.md @@ -37,6 +37,7 @@ Splunk-Ansible ships with an inventory script in `inventory/environ.py`. The scr | SPLUNK_HEAVY_FORWARDER_URL | Comma-separated list of all Splunk Enterprise heavy forwarder hosts (network alias) | no | no | no | | SPLUNK_DEPLOYER_URL | One Splunk Enterprise deployer host (network alias) | no | yes | no | | SPLUNK_CLUSTER_MASTER_URL | One Splunk Enterprise cluster master host (network alias) | no | no | yes | +| SPLUNK_SKIP_CLUSTER_BUNDLE_PUSH | When set to "true", skips the cluster bundle push that happens on the cluster master | no | no | no | | SPLUNK_SEARCH_HEAD_CAPTAIN_URL | One Splunk Enterprise search head host (network alias). Passing this ENV variable will enable search head clustering. | no | yes | no | | SPLUNK_LICENSE_MASTER_URL | One Splunk Enterprise license master host (network alias). Passing this ENV variable will enable license master setup. | no | no | no | | SPLUNK_DEPLOYMENT_SERVER | One Splunk host (network alias) that we use as a [deployment server](http://docs.splunk.com/Documentation/Splunk/latest/Updating/Configuredeploymentclients). | no | no | no | diff --git a/inventory/environ.py b/inventory/environ.py index e813bc0f..2979b251 100755 --- a/inventory/environ.py +++ b/inventory/environ.py @@ -125,6 +125,8 @@ def getDefaultVars(): getSplunkdSSL(defaultVars) getDistributedTopology(defaultVars) getLicenses(defaultVars) + # Determine if Skip CM Bundle Push Enabled + defaultVars["splunk"]["skip_cluster_bundle_push"] = os.environ.get('SPLUNK_SKIP_CLUSTER_BUNDLE_PUSH', '').lower() == 'true' # Determine DMC settings defaultVars["dmc_forwarder_monitoring"] = os.environ.get('DMC_FORWARDER_MONITORING', False) defaultVars["dmc_asset_interval"] = os.environ.get('DMC_ASSET_INTERVAL', '3,18,33,48 * * * *') diff --git a/roles/splunk_cluster_master/tasks/apply_cluster_bundle.yml b/roles/splunk_cluster_master/tasks/apply_cluster_bundle.yml index 9950d720..e6424ef9 100644 --- a/roles/splunk_cluster_master/tasks/apply_cluster_bundle.yml +++ b/roles/splunk_cluster_master/tasks/apply_cluster_bundle.yml @@ -57,4 +57,4 @@ - debug: msg: "WARNING: Indexer bundle push still in progress - proceeding anyways..." when: - - cluster_bundle_status.stdout.find("cluster_status=Rolling restart of the peers is in progress")!=-1 + - cluster_bundle_status.stdout.find("cluster_status=Rolling restart of the peers is in progress")!=-1 \ No newline at end of file diff --git a/roles/splunk_cluster_master/tasks/main.yml b/roles/splunk_cluster_master/tasks/main.yml index ec47878d..0aecb779 100644 --- a/roles/splunk_cluster_master/tasks/main.yml +++ b/roles/splunk_cluster_master/tasks/main.yml @@ -22,6 +22,8 @@ loop: "{{ splunk.app_paths_install.idxc }}" - include_tasks: apply_cluster_bundle.yml + when: + - not splunk.skip_cluster_bundle_push | bool # This installed_apps list gets mutated by ESS bundle generation, hence we # need to refresh this array of apps before disabling them all @@ -53,5 +55,4 @@ - splunk.multisite_search_factor_origin is defined - splunk.multisite_search_factor_total is defined -- include_tasks: ../../../roles/splunk_common/tasks/check_for_required_restarts.yml - +- include_tasks: ../../../roles/splunk_common/tasks/check_for_required_restarts.yml \ No newline at end of file