Commit 98a058f6 authored by Pedro Eduardo Trujillo's avatar Pedro Eduardo Trujillo
Browse files

Merge branch 'dev' into 'master' 

Usa vols NFS en dev, revisa vols en pro

See merge request redmic-project/etl/nifi!25
parents bc9eabd7 30ad578c

.gitlab-ci.yml

+1 −5
Original line number Diff line number Diff line
@@ -6,13 +6,9 @@ include: 
stages:

  - deploy



variables:

  PROJECT_PARENT_NAME: etl



.deploy:

  variables:

    STACK: ${PROJECT_PARENT_NAME}

    SERVICES_TO_CHECK: ${PROJECT_PARENT_NAME}_${CI_PROJECT_NAME}

    STACK: etl

    STATUS_CHECK_DELAY: 300

  environment:

    url: https://nifi.${PUBLIC_HOSTNAME}

deploy/.env

+5 −1
Original line number Diff line number Diff line
@@ -25,5 +25,9 @@ DATABASE_VOL_NAME=nifi-database-vol 
FLOWFILE_VOL_NAME=nifi-flowfile-vol

CONTENT_VOL_NAME=nifi-content-vol

PROVENANCE_VOL_NAME=nifi-provenance-vol

INGEST_VOL_NAME=ingest-data-vol

STATE_VOL_NAME=nifi-state-vol

SECURITY_VOL_NAME=nifi-security-vol



VOL_TYPE=nfs4

VOL_ADDR=127.0.0.1

VOL_OPTIONS=rw,nolock,noatime,tcp,rsize=8192,wsize=8192,timeo=14

deploy/docker-compose.dev.yml

+38 −10
Original line number Diff line number Diff line 
version: '3.5'



services:

  nifi:

    deploy:

      placement:

        constraints:

          - node.hostname == ${PLACEMENT_CONSTRAINTS_NODE_HOSTNAME:-hostname}



volumes:

  conf-vol:

    name: ${CONF_VOL_NAME}

    driver: local

    driver_opts:

      type: ${VOL_TYPE}

      o: addr=${VOL_ADDR},${VOL_OPTIONS}

      device: ${CONF_VOL_DEVICE:-:/nifi-conf-vol/}



  database-vol:

    name: ${DATABASE_VOL_NAME}

    driver: local

    driver_opts:

      type: ${VOL_TYPE}

      o: addr=${VOL_ADDR},${VOL_OPTIONS}

      device: ${DATABASE_VOL_DEVICE:-:/nifi-database-vol/}



  flowfile-vol:

    name: ${FLOWFILE_VOL_NAME}

    driver: local

    driver_opts:

      type: ${VOL_TYPE}

      o: addr=${VOL_ADDR},${VOL_OPTIONS}

      device: ${FLOWFILE_VOL_DEVICE:-:/nifi-flowfile-vol/}



  content-vol:

    name: ${CONTENT_VOL_NAME}

    driver: local

    driver_opts:

      type: ${VOL_TYPE}

      o: addr=${VOL_ADDR},${VOL_OPTIONS}

      device: ${CONTENT_VOL_DEVICE:-:/nifi-content-vol/}



  provenance-vol:

    name: ${PROVENANCE_VOL_NAME}



  ingest-vol:

    name: ${INGEST_VOL_NAME}

    driver: local

    driver_opts:

      type: ${VOL_TYPE}

      o: addr=${VOL_ADDR},${VOL_OPTIONS}

      device: ${PROVENANCE_VOL_DEVICE:-:/nifi-provenance-vol/}



  state-vol:

    name: ${STATE_VOL_NAME}

    driver: local

    driver_opts:

      type: ${VOL_TYPE}

      o: addr=${VOL_ADDR},${VOL_OPTIONS}

      device: ${STATE_VOL_DEVICE:-:/nifi-state-vol/}



  security-vol:

    name: ${SECURITY_VOL_NAME}

    driver: local

    driver_opts:

      type: ${VOL_TYPE}

      o: addr=${VOL_ADDR},${VOL_OPTIONS}

      device: ${SECURITY_VOL_DEVICE:-:/nifi-security-vol/}

deploy/docker-compose.prod.yml

+9 −7
Original line number Diff line number Diff line
@@ -24,26 +24,28 @@ volumes: 
    name: ${FLOWFILE_VOL_NAME}

    driver: 'cloudstor:aws'

    driver_opts:

      backing: shared

      backing: relocatable

      size: ${FLOWFILE_VOL_SIZE:-1}

      ebstype: gp3



  content-vol:

    name: ${CONTENT_VOL_NAME}

    driver: 'cloudstor:aws'

    driver_opts:

      backing: relocatable

      size: ${CONTENT_VOL_SIZE:-1}

      ebstype: gp2

      size: ${CONTENT_VOL_SIZE:-5}

      ebstype: gp3



  provenance-vol:

    name: ${PROVENANCE_VOL_NAME}

    driver: 'cloudstor:aws'

    driver_opts:

      backing: relocatable

      size: ${PROVENANCE_VOL_SIZE:-2}

      ebstype: gp2

      size: ${PROVENANCE_VOL_SIZE:-1}

      ebstype: gp3



  ingest-vol:

    name: ${INGEST_VOL_NAME}

  state-vol:

    name: ${STATE_VOL_NAME}

    driver: 'cloudstor:aws'

    driver_opts:

      backing: shared

deploy/docker-compose.tmpl.yml

+0 −4
Original line number Diff line number Diff line
@@ -42,7 +42,6 @@ services: 
      - provenance-vol:${NIFI_HOME}/provenance_repository

      - state-vol:${NIFI_HOME}/state

      - security-vol:${NIFI_HOME}/security

      - ingest-vol:${NIFI_HOME}/data

    configs:

      - source: logback-xml

        target: ${NIFI_HOME}/conf/logback.xml
@@ -106,9 +105,6 @@ volumes: 
  log-vol:

    name: ${LOG_VOL_NAME:-nifi-log-vol}



  state-vol:

    name: ${STATE_VOL_NAME:-nifi-state-vol}



configs:

  logback-xml:

    name: ${LOGBACK_XML_NAME:-nifi-logback-xml}