fix M-CORD services profile for the cord-in-a-box.
Change-Id: Ide64c78544b7e4eae10c3852c604f2603d1e6c1b
diff --git a/mcord/Makefile b/mcord/Makefile
index 9160029..f51d99f 100644
--- a/mcord/Makefile
+++ b/mcord/Makefile
@@ -8,6 +8,8 @@
DOCKER_PROJECT ?= mcord
BOOTSTRAP_PROJECT ?= mcordbs
+XOS_UI_PORT :=8888
+
include $(COMMON_DIR)/Makefile
xos: prereqs config_dirs xos_download cord_services cord_libraries bootstrap onboarding podconfig
diff --git a/mcord/docker-compose-bootstrap.yml b/mcord/docker-compose-bootstrap.yml
index 2852b4d..4ce8359 100644
--- a/mcord/docker-compose-bootstrap.yml
+++ b/mcord/docker-compose-bootstrap.yml
@@ -13,6 +13,16 @@
expose:
- "5432"
+ xos_redis:
+ image: redis
+ networks:
+ - xos
+ logging:
+ driver: "json-file"
+ options:
+ max-size: "1000k"
+ max-file: "5"
+
xos_synchronizer_onboarding:
image: xosproject/xos
networks:
@@ -71,6 +81,7 @@
- ./xos_cord_config:/opt/xos/xos_configuration/xos_cord_config:ro
- ./files/xos_vtn_config:/opt/xos/xos_configuration/xos_vtn_config:ro
- ../../xos_services:/opt/xos_services
+ - ./admin-openrc.sh:/root/setup/admin-openrc.sh
- ../common/tosca/fixtures.yaml:/opt/xos/bootstrap_tosca/fixtures.yaml
- ./deployment.yaml:/opt/xos/bootstrap_tosca/deployment.yaml
logging:
diff --git a/mcord/files/monitoring_synchronizer_config b/mcord/files/monitoring_synchronizer_config
index 1ee96f0..cfd73a0 100644
--- a/mcord/files/monitoring_synchronizer_config
+++ b/mcord/files/monitoring_synchronizer_config
@@ -7,7 +7,7 @@
name=xos
user=postgres
password=password
-host=localhost
+host=xos_db
port=5432
[api]
diff --git a/mcord/files/openstack_synchronizer_config b/mcord/files/openstack_synchronizer_config
index 20f12d3..82c2f79 100644
--- a/mcord/files/openstack_synchronizer_config
+++ b/mcord/files/openstack_synchronizer_config
@@ -2,7 +2,7 @@
name=xos
user=postgres
password=password
-host=localhost
+host=xos_db
port=5432
[api]
diff --git a/mcord/xos.yaml b/mcord/xos.yaml
index c128a2a..270ad3d 100644
--- a/mcord/xos.yaml
+++ b/mcord/xos.yaml
@@ -10,10 +10,11 @@
xos:
type: tosca.nodes.XOS
properties:
- ui_port: 80
+ ui_port: 8888
bootstrap_ui_port: 81
docker_project_name: mcord
db_container_name: mcordbs_xos_db_1
+ redis_container_name: mcordbs_xos_redis_1
extra_hosts: controller:10.128.13.3, onos-cord:10.102.81.101, computeBBU1:10.102.81.6, computeBBU2:10.102.81.7, compute9:10.102.81.9
/opt/xos/xos_configuration/xos_common_config: