Merge "Upgrade Elasticsearch Puppet module to 0.10.1"
This commit is contained in:
commit
4514444e36
|
@ -21,6 +21,6 @@
|
||||||
"dependencies": [
|
"dependencies": [
|
||||||
{"name": "puppetlabs/stdlib", "version_requirement": "4.x"},
|
{"name": "puppetlabs/stdlib", "version_requirement": "4.x"},
|
||||||
{"name": "jfryman/nginx", "version_requirement": ">= 0.2.2"},
|
{"name": "jfryman/nginx", "version_requirement": ">= 0.2.2"},
|
||||||
{"name": "elasticsearch/elasticsearch", "version_requirement": ">= 0.9.0"}
|
{"name": "elasticsearch/elasticsearch", "version_requirement": ">= 0.10.x"}
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
|
|
|
@ -7,7 +7,9 @@ set -eux
|
||||||
CONCAT_TARBALL_URL="https://forgeapi.puppetlabs.com/v3/files/puppetlabs-concat-1.2.4.tar.gz"
|
CONCAT_TARBALL_URL="https://forgeapi.puppetlabs.com/v3/files/puppetlabs-concat-1.2.4.tar.gz"
|
||||||
STDLIB_TARBALL_URL="https://forgeapi.puppetlabs.com/v3/files/puppetlabs-stdlib-4.7.0.tar.gz"
|
STDLIB_TARBALL_URL="https://forgeapi.puppetlabs.com/v3/files/puppetlabs-stdlib-4.7.0.tar.gz"
|
||||||
NGINX_TARBALL_URL="https://forgeapi.puppetlabs.com/v3/files/jfryman-nginx-0.2.2.tar.gz"
|
NGINX_TARBALL_URL="https://forgeapi.puppetlabs.com/v3/files/jfryman-nginx-0.2.2.tar.gz"
|
||||||
ELASTICSEARCH_TARBALL_URL="https://forgeapi.puppetlabs.com/v3/files/elasticsearch-elasticsearch-0.9.1.tar.gz"
|
ELASTICSEARCH_TARBALL_URL="https://forgeapi.puppetlabs.com/v3/files/elasticsearch-elasticsearch-0.10.1.tar.gz"
|
||||||
|
# Dependency for Elasticsearch 0.10.x
|
||||||
|
DATACAT_TARBALL_URL="https://forgeapi.puppetlabs.com/v3/files/richardc-datacat-0.6.2.tar.gz"
|
||||||
FIREWALL_TARBALL_URL="https://forgeapi.puppetlabs.com/v3/files/puppetlabs-firewall-1.7.2.tar.gz"
|
FIREWALL_TARBALL_URL="https://forgeapi.puppetlabs.com/v3/files/puppetlabs-firewall-1.7.2.tar.gz"
|
||||||
FUEL_LIB_COMMIT="stable/8.0"
|
FUEL_LIB_COMMIT="stable/8.0"
|
||||||
FUEL_LIB_TARBALL_URL="https://github.com/openstack/fuel-library/archive/${FUEL_LIB_COMMIT}.tar.gz"
|
FUEL_LIB_TARBALL_URL="https://github.com/openstack/fuel-library/archive/${FUEL_LIB_COMMIT}.tar.gz"
|
||||||
|
@ -38,6 +40,7 @@ download_puppet_module "stdlib" "$STDLIB_TARBALL_URL"
|
||||||
download_puppet_module "nginx" "$NGINX_TARBALL_URL"
|
download_puppet_module "nginx" "$NGINX_TARBALL_URL"
|
||||||
download_puppet_module "elasticsearch" "$ELASTICSEARCH_TARBALL_URL"
|
download_puppet_module "elasticsearch" "$ELASTICSEARCH_TARBALL_URL"
|
||||||
download_puppet_module "firewall" "$FIREWALL_TARBALL_URL"
|
download_puppet_module "firewall" "$FIREWALL_TARBALL_URL"
|
||||||
|
download_puppet_module "datacat" "$DATACAT_TARBALL_URL"
|
||||||
|
|
||||||
# Untar kibana
|
# Untar kibana
|
||||||
KIBANA_FOLDER="${MODULES_DIR}/lma_logging_analytics/files/kibana/src"
|
KIBANA_FOLDER="${MODULES_DIR}/lma_logging_analytics/files/kibana/src"
|
||||||
|
|
Loading…
Reference in New Issue