Commit fb0dbc7a authored by Pedro Eduardo Trujillo's avatar Pedro Eduardo Trujillo
Browse files

Merge branch 'dev' into 'master' 

Actualiza labels para ubicar servicios en pro

See merge request redmic-project/confluent/confluent-platform!15
parents d4a4a6ed db92d8a9

.gitlab-ci.yml

+2 −2
Original line number Diff line number Diff line
@@ -109,7 +109,7 @@ deploy-zookeeper-pro: 
    - docker:dind

  script:

    - create-nets.sh kafka-net

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

    - deploy.sh IMAGE_TAG=${IMAGE_TAG} COMPOSE_FILE=${COMPOSE_FILE} AWS_REGION=${AWS_REGION}

  environment:

    name: pro/zookeeper

  only:
@@ -157,7 +157,7 @@ deploy-kafka-pro: 
  services:

    - docker:dind

  script:

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

    - deploy.sh IMAGE_TAG=${IMAGE_TAG} COMPOSE_FILE=${COMPOSE_FILE} AWS_REGION=${AWS_REGION}

  environment:

    name: pro/kafka

  only:

kafka/docker-compose.prod.yml

+3 −3
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ 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
@@ -26,7 +26,7 @@ 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
@@ -41,7 +41,7 @@ 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

zookeeper/docker-compose.prod.yml

+3 −3
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ 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
@@ -24,7 +24,7 @@ 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
@@ -38,7 +38,7 @@ 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