diff --git a/elements/overcloud-network-midonet/extra-data.d/60-create-midonet-repositories b/elements/overcloud-network-midonet/extra-data.d/60-create-midonet-repositories index 001cb260..f158d37b 100755 --- a/elements/overcloud-network-midonet/extra-data.d/60-create-midonet-repositories +++ b/elements/overcloud-network-midonet/extra-data.d/60-create-midonet-repositories @@ -21,6 +21,8 @@ LOGSTASH_REPOS_FILE=logstash LOGSTASH_TARGET_FILE_NAME=logstash.repo LLPD_REPOS_FILE=vbernat-llpd LLPD_TARGET_FILE_NAME=vbernat-llpd.repo +CURATOR_REPOS_FILE=curator +CURATOR_TARGET_FILE_NAME=curator.repo mkdir -p $MIDONET_REPOS_DIR @@ -32,11 +34,13 @@ mapfile -c 1 -C subst < $TMP_HOOKS_PATH/extra-data.d/$DATASTAX_REPOS_FILE > /tmp mapfile -c 1 -C subst < $TMP_HOOKS_PATH/extra-data.d/$ELASTICSEARCH_REPOS_FILE > /tmp/repo-elasticsearch mapfile -c 1 -C subst < $TMP_HOOKS_PATH/extra-data.d/$LOGSTASH_REPOS_FILE > /tmp/repo-logstash mapfile -c 1 -C subst < $TMP_HOOKS_PATH/extra-data.d/$LLPD_REPOS_FILE > /tmp/repo-llpd +mapfile -c 1 -C subst < $TMP_HOOKS_PATH/extra-data.d/$CURATOR_REPOS_FILE > /tmp/repo-curator sudo mv /tmp/repo-midonet $MIDONET_REPOS_DIR/$MIDONET_TARGET_FILE_NAME sudo mv /tmp/repo-cassandra $MIDONET_REPOS_DIR/$DATASTAX_TARGET_FILE_NAME sudo mv /tmp/repo-elasticsearch $MIDONET_REPOS_DIR/$ELASTICSEARCH_TARGET_FILE_NAME sudo mv /tmp/repo-logstash $MIDONET_REPOS_DIR/$LOGSTASH_TARGET_FILE_NAME sudo mv /tmp/repo-llpd $MIDONET_REPOS_DIR/$LLPD_TARGET_FILE_NAME +sudo mv /tmp/repo-curator $MIDONET_REPOS_DIR/$CURATOR_TARGET_FILE_NAME exit 0 diff --git a/elements/overcloud-network-midonet/extra-data.d/curator b/elements/overcloud-network-midonet/extra-data.d/curator new file mode 100644 index 00000000..32db36f9 --- /dev/null +++ b/elements/overcloud-network-midonet/extra-data.d/curator @@ -0,0 +1,6 @@ +[curator-3] +name=CentOS/RHEL 7 repository for Elasticsearch Curator 3.x packages +baseurl=https://packages.elastic.co/curator/3/centos/7 +gpgcheck=1 +gpgkey=https://packages.elastic.co/GPG-KEY-elasticsearch +enabled=1 diff --git a/elements/overcloud-network-midonet/install.d/72-pip b/elements/overcloud-network-midonet/install.d/72-pip deleted file mode 100755 index 45de9649..00000000 --- a/elements/overcloud-network-midonet/install.d/72-pip +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/bash - -set -e - -yum install -y python-pip && pip install -U elasticsearch-curator==3.5 - -exit 0 diff --git a/elements/overcloud-network-midonet/install.d/package-installs-overcloud-network-midonet b/elements/overcloud-network-midonet/install.d/package-installs-overcloud-network-midonet index 0952232e..d1a0ce08 100644 --- a/elements/overcloud-network-midonet/install.d/package-installs-overcloud-network-midonet +++ b/elements/overcloud-network-midonet/install.d/package-installs-overcloud-network-midonet @@ -2,6 +2,7 @@ augeas_package augeasdevel_package biosdevname cassandra_package +curator_package deltarpm_package midonet_cli_package midonet_cluster_package diff --git a/elements/overcloud-network-midonet/pkg-map b/elements/overcloud-network-midonet/pkg-map index 1d260f4b..179b316a 100644 --- a/elements/overcloud-network-midonet/pkg-map +++ b/elements/overcloud-network-midonet/pkg-map @@ -4,6 +4,7 @@ "augeasdevel_package": "augeas-devel", "biosdevname": "biosdevname", "cassandra_package": "cassandra22", + "curator_package": "python-elasticsearch-curator" "deltarpm_package": "deltarpm", "midonet_cli_package": "python-midonetclient", "midonet_cluster_package": "midonet-cluster",