Merge "Adding an charm generator"
diff --git a/docker/MON/Dockerfile b/docker/MON/Dockerfile
index 6fb35cc..c1ab2fa 100644
--- a/docker/MON/Dockerfile
+++ b/docker/MON/Dockerfile
@@ -50,17 +50,24 @@
COPY scripts/ scripts/
-ENV BROKER_URI kafka:9092
-ENV MONGO_URI mongodb://mongo:27017
-ENV DATABASE sqlite:///mon_sqlite.db
-ENV OS_NOTIFIER_URI localhost:8662
-ENV OS_DEFAULT_GRANULARITY 300
-ENV REQUEST_TIMEOUT 10
-ENV OSMMON_LOG_LEVEL INFO
-ENV OSMMON_KAFKA_LOG_LEVEL INFO
+ENV OSMMON_MESSAGE_DRIVER kafka
+ENV OSMMON_MESSAGE_HOST kafka
+ENV OSMMON_MESSAGE_PORT 9092
+
+ENV OSMMON_DATABASE_DRIVER mongo
+ENV OSMMON_DATABASE_URI mongodb://mongo:27017
+
+ENV OSMMON_SQL_DATABASE_URI sqlite:///mon_sqlite.db
+ENV OSMMON_OPENSTACK_DEFAULT_GRANULARITY 300
+ENV OSMMON_GLOBAL_REQUEST_TIMEOUT 10
+ENV OSMMON_GLOBAL_LOGLEVEL INFO
ENV OSMMON_VCA_HOST localhost
ENV OSMMON_VCA_SECRET secret
ENV OSMMON_VCA_USER admin
+ENV OSMMON_DATABASE_COMMONKEY changeme
+ENV OSMMON_COLLECTOR_INTERVAL 30
+ENV OSMMON_EVALUATOR_INTERVAL 30
+ENV OSMMON_PROMETHEUS_URL http://prometheus:9090
EXPOSE 8000
diff --git a/docker/POL/Dockerfile b/docker/POL/Dockerfile
index 1eb8634..8a39a85 100644
--- a/docker/POL/Dockerfile
+++ b/docker/POL/Dockerfile
@@ -56,6 +56,6 @@
ENV OSMPOL_SQL_DATABASE_URI sqlite:///mon_sqlite.db
-ENV OSMPOL_LOG_LEVEL INFO
+ENV OSMPOL_GLOBAL_LOG_LEVEL INFO
CMD osm-policy-agent
diff --git a/docker/RO/Dockerfile b/docker/RO/Dockerfile
index 86b532c..e5c29d1 100644
--- a/docker/RO/Dockerfile
+++ b/docker/RO/Dockerfile
@@ -49,6 +49,6 @@
ENV RO_DB_NAME=mano_db
ENV RO_DB_OVIM_NAME=mano_vim_db
-HEALTHCHECK --start-period=30s --interval=10s --timeout=5s --retries=12 \
+HEALTHCHECK --start-period=130s --interval=10s --timeout=5s --retries=12 \
CMD curl --silent --fail localhost:9090/openmano/tenants || exit 1
CMD /bin/RO/start.sh
diff --git a/installers/docker/docker-compose.yaml b/installers/docker/docker-compose.yaml
index b37e381..7ac827b 100644
--- a/installers/docker/docker-compose.yaml
+++ b/installers/docker/docker-compose.yaml
@@ -6,7 +6,6 @@
mon_db:
pol_db:
osm_packages:
- keystone_db:
prom_db:
networks:
netOSM:
@@ -59,22 +58,12 @@
- prom_db:/prometheus
networks:
- netOSM
- keystone-db:
- image: mariadb:10
- networks:
- - netOSM
- volumes:
- - keystone_db:/var/lib/mysql
- env_file:
- - ./keystone-db.env
-# ports:
-# - "3306:3306"
keystone:
image: ${DOCKER_USER:-opensourcemano}/keystone:${TAG:-latest}
networks:
- netOSM
environment:
- DB_HOST: keystone-db
+ DB_HOST: mysql
env_file:
- ./keystone.env
ports:
@@ -111,10 +100,12 @@
# - kafka
# - mongo
# - ro
- ro-db:
+ mysql:
image: mysql:5
networks:
- - netOSM
+ netOSM:
+ aliases:
+ - ro-db
volumes:
- ro_db:/var/lib/mysql
env_file:
@@ -126,11 +117,11 @@
networks:
- netOSM
environment:
- RO_DB_HOST: ro-db
+ RO_DB_HOST: mysql
env_file:
- ./ro.env
#depends_on:
- # - ro-db
+ # - mysql
volumes:
- ro:/var/log/osm
ports:
@@ -142,8 +133,9 @@
volumes:
- mon_db:/app/database
environment:
- BROKER_URI: kafka:9092
- DATABASE: sqlite:///app/database/mon_sqlite.db
+ OSMMON_MESSAGE_HOST: kafka
+ OSMMON_MESSAGE_PORT: 9092
+ OSMMON_SQL_DATABASE_URI: sqlite:///app/database/mon_sqlite.db
env_file:
- ./mon.env
ports:
@@ -158,7 +150,8 @@
- pol_db:/app/database
environment:
OSMPOL_SQL_DATABASE_URI: sqlite:///app/database/policy_module.db
- BROKER_URI: kafka:9092
+ OSMPOL_MESSAGE_HOST: kafka
+ OSMPOL_MESSAGE_PORT: 9092
#depends_on:
# - kafka
# - mon
diff --git a/installers/full_install_osm.sh b/installers/full_install_osm.sh
index c636326..79dc117 100755
--- a/installers/full_install_osm.sh
+++ b/installers/full_install_osm.sh
@@ -781,7 +781,6 @@
fi
# Keystone
- MYSQL_ROOT_PASSWORD=$(generate_secret)
KEYSTONE_DB_PASSWORD=$(generate_secret)
NBI_PASSWORD=$(generate_secret)
if [ ! -f $OSM_DOCKER_WORK_DIR/keystone-db.env ]; then
diff --git a/packer/ubuntu1604-ovf-osm.json b/packer/ubuntu1604-ovf-osm.json
index 5b22d2e..c2071a9 100644
--- a/packer/ubuntu1604-ovf-osm.json
+++ b/packer/ubuntu1604-ovf-osm.json
@@ -31,7 +31,7 @@
"ssh_password": "vagrant",
"ssh_port": 22,
"ssh_wait_timeout": "10000s",
- "shutdown_command": "echo 'vagrant'|sudo -S shutdown -P now",
+ "shutdown_command": "echo '/sbin/shutdown -h -P now' > /tmp/shutdown.sh; echo 'vagrant'|sudo -S sh '/tmp/shutdown.sh'",
"virtualbox_version_file": ".vbox_version",
"vm_name": "{{user `vm_name`}}",
"output_directory": "{{user `build_dir`}}",
diff --git a/tools/osm-report b/tools/osm-report
index 4e00b9a..f366685 100755
--- a/tools/osm-report
+++ b/tools/osm-report
@@ -42,7 +42,7 @@
which osm
#dockers deb packages
echo "dockers deb packages"
-for i in kafka keystone keystone-db lcm light-ui mon mongo nbi pol prometheus ro ro-db zookeeper; do
+for i in kafka keystone lcm light-ui mon mongo nbi pol prometheus ro mysql zookeeper; do
echo "docker osm_$i"
docker exec $(docker ps -q -f name=osm_$i -l) dpkg -l |grep osm
done