Commit 301d7443 authored by Pedro Eduardo Trujillo's avatar Pedro Eduardo Trujillo
Browse files

Merge branch 'dev' into 'master' 

Actualiza labels y reinicio para servicios en pro

See merge request redmic-project/elastic/elasticsearch!36
parents 929339b6 8a726842

.gitlab-ci.yml

+3 −2
Original line number Diff line number Diff line
@@ -165,8 +165,9 @@ deploy-pro: 
    - create-nets.sh elastic-net

    - >

      deploy.sh IMAGE_NAME=${IMAGE_NAME} IMAGE_TAG=${IMAGE_TAG} COMPOSE_FILE=${COMPOSE_FILE}

      OLD_ELASTIC_ADMIN_PASS=${OLD_ELASTIC_ADMIN_PASS} ELASTIC_ADMIN_PASS=${ELASTIC_ADMIN_PASS}

      ELASTIC_USER=${ELASTIC_USER} ELASTIC_USER_PASS=${ELASTIC_USER_PASS} ELASTIC_USER_ROLE=${ELASTIC_USER_ROLE}

      AWS_REGION=${AWS_REGION} OLD_ELASTIC_ADMIN_PASS=${OLD_ELASTIC_ADMIN_PASS}

      ELASTIC_ADMIN_PASS=${ELASTIC_ADMIN_PASS} ELASTIC_USER=${ELASTIC_USER}

      ELASTIC_USER_PASS=${ELASTIC_USER_PASS} ELASTIC_USER_ROLE=${ELASTIC_USER_ROLE}

  environment:

    name: pro

  only:

docker-compose.prod.yml

+9 −6
Original line number Diff line number Diff line
@@ -13,10 +13,11 @@ services: 
      placement:

        constraints:

          - node.role == worker

          - node.labels.workerid == 1

          - engine.labels.availability_zone == ${AWS_REGION}a

      restart_policy:

        condition: on-failure

        max_attempts: 3

        delay: 1m

        window: 3m



  elasticsearch-2:

    environment:
@@ -30,10 +31,11 @@ services: 
      placement:

        constraints:

          - node.role == worker

          - node.labels.workerid == 2

          - engine.labels.availability_zone == ${AWS_REGION}b

      restart_policy:

        condition: on-failure

        max_attempts: 3

        delay: 1m

        window: 3m



  elasticsearch-3:

    environment:
@@ -47,10 +49,11 @@ services: 
      placement:

        constraints:

          - node.role == worker

          - node.labels.workerid == 3

          - engine.labels.availability_zone == ${AWS_REGION}c

      restart_policy:

        condition: on-failure

        max_attempts: 3

        delay: 1m

        window: 3m



volumes:

  elasticsearch-1-vol: