Onboarding ng-xos-lib
Change-Id: I445a6119f60030a48ff12900f37fa4207e9dd04c
diff --git a/globalxos/Makefile b/globalxos/Makefile
index 9f06064..8f14c38 100644
--- a/globalxos/Makefile
+++ b/globalxos/Makefile
@@ -14,7 +14,7 @@
# Include common functions
include $(COMMON_DIR)/Makefile
-opencloud: prereqs config_dirs xos_download bootstrap onboarding opencloudconfig globalxos
+opencloud: prereqs config_dirs xos_download cord_libraries bootstrap onboarding opencloudconfig globalxos
onboarding:
@echo "[ONBOARDING]"
@@ -29,6 +29,8 @@
globalxos: $(SERVICE_DIR) $(SERVICE_DIR)/globalxos
$(RUN_TOSCA_BOOTSTRAP) $(SERVICE_DIR)/globalxos/xos/globalxos-onboard.yaml
- bash ../common/wait_for_onboarding_ready.sh $(XOS_BOOTSTRAP_PORT) services/globalxos
- bash ../common/wait_for_onboarding_ready.sh $(XOS_BOOTSTRAP_PORT) xos
- bash ../common/wait_for_xos_port.sh $(XOS_UI_PORT)
+ $(RUN_TOSCA_BOOTSTRAP) $(LIBRARY_DIR)/ng-xos-lib/ng-xos-lib-onboard.yaml
+ bash $(COMMON_DIR)/wait_for_onboarding_ready.sh $(XOS_BOOTSTRAP_PORT) services/ng-xos-lib
+ bash $(COMMON_DIR)/wait_for_onboarding_ready.sh $(XOS_BOOTSTRAP_PORT) services/globalxos
+ bash $(COMMON_DIR)/wait_for_onboarding_ready.sh $(XOS_BOOTSTRAP_PORT) xos
+ bash $(COMMON_DIR)/wait_for_xos_port.sh $(XOS_UI_PORT)
diff --git a/globalxos/Vagrantfile b/globalxos/Vagrantfile
index 45df252..ee7593c 100644
--- a/globalxos/Vagrantfile
+++ b/globalxos/Vagrantfile
@@ -8,6 +8,7 @@
config.vm.synced_folder "../", "/home/vagrant/service-profile"
config.vm.synced_folder "../../xos", "/home/vagrant/xos", create: true
config.vm.synced_folder "../../xos_services", "/home/vagrant/xos_services", create: true
+ config.vm.synced_folder "../../xos_libraries", "/home/vagrant/xos_libraries", create: true
config.vm.synced_folder ".", "/vagrant", disabled: true
config.vm.define "arizona" do |d|
diff --git a/globalxos/apt-prereqs b/globalxos/apt-prereqs
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/globalxos/apt-prereqs
diff --git a/globalxos/docker-compose-bootstrap.yml b/globalxos/docker-compose-bootstrap.yml
index 57e5355..000a796 100644
--- a/globalxos/docker-compose-bootstrap.yml
+++ b/globalxos/docker-compose-bootstrap.yml
@@ -43,6 +43,7 @@
- ./key_import:/opt/xos/key_import:ro
- ./onboarding-docker-compose:/opt/xos/synchronizers/onboarding/docker-compose
- ../../xos_services:/opt/xos_services
+ - ../../xos_libraries:/opt/xos_libraries
log_driver: "json-file"
log_opt:
max-size: "100k"