onboard Openstack service
Change-Id: I0b2b755725433e58a4b191234574b70ef6abeabe
diff --git a/common/Makefile.prereqs b/common/Makefile.prereqs
index 381a1e7..cbe047b 100644
--- a/common/Makefile.prereqs
+++ b/common/Makefile.prereqs
@@ -52,4 +52,5 @@
sudo cp docker_build/bundles/latest/binary-daemon/docker-containerd-shim /usr/bin/
sudo cp docker_build/bundles/latest/binary-daemon/docker-containerd-ctr /usr/bin/
sudo cp docker_build/bundles/latest/binary-daemon/docker-runc /usr/bin/
+ sudo cp docker_build/bundles/latest/binary-daemon/docker-proxy /usr/bin/
sudo service docker start
diff --git a/devel/Makefile b/devel/Makefile
index 2bf5f50..0a2a6ef 100644
--- a/devel/Makefile
+++ b/devel/Makefile
@@ -46,6 +46,11 @@
echo "[ONBOARDING]"
# on-board any services here
bash ../common/wait_for_onboarding_ready.sh $(XOS_BOOTSTRAP_PORT) xos
+ $(RUN_TOSCA_BOOTSTRAP) ../common/disable-onboarding.yaml
+ $(RUN_TOSCA_BOOTSTRAP) $(SERVICE_DIR)/openstack/xos/openstack-onboard.yaml
+ $(RUN_TOSCA_BOOTSTRAP) ../common/enable-onboarding.yaml
+ bash ../common/wait_for_onboarding_ready.sh $(XOS_BOOTSTRAP_PORT) services/openstack
+ bash ../common/wait_for_onboarding_ready.sh $(XOS_BOOTSTRAP_PORT) xos
bash ../common/wait_for_xos_port.sh $(XOS_UI_PORT)
develconfig:
@@ -80,3 +85,7 @@
upgrade_pkgs:
sudo pip install httpie --upgrade
+
+rebuild:
+ bash ../common/rebuild.sh $(XOS_BOOTSTRAP_PORT)
+ bash ../common/wait_for_onboarding_ready.sh $(XOS_BOOTSTRAP_PORT) xos
diff --git a/devel/docker-compose-bootstrap.yml b/devel/docker-compose-bootstrap.yml
index f0123da..548f2e8 100644
--- a/devel/docker-compose-bootstrap.yml
+++ b/devel/docker-compose-bootstrap.yml
@@ -36,21 +36,21 @@
max-size: "100k"
max-file: "5"
-xos_synchronizer_openstack:
- command: bash -c "sleep 120; python /opt/xos/synchronizers/openstack/xos-synchronizer.py"
- image: xosproject/xos-synchronizer-openstack
- labels:
- org.xosproject.kind: synchronizer
- org.xosproject.target: openstack
- links:
- - xos_db
- extra_hosts:
- - ctl:${MYIP}
- volumes:
- - ../common/xos_common_config:/opt/xos/xos_configuration/xos_common_config:ro
- - ../setup:/root/setup:ro
- - ./images:/opt/xos/images:ro
- log_driver: "json-file"
- log_opt:
- max-size: "100k"
- max-file: "5"
+#xos_synchronizer_openstack:
+# command: bash -c "sleep 120; python /opt/xos/synchronizers/openstack/xos-synchronizer.py"
+# image: xosproject/xos-synchronizer-openstack
+# labels:
+# org.xosproject.kind: synchronizer
+# org.xosproject.target: openstack
+# links:
+# - xos_db
+# extra_hosts:
+# - ctl:${MYIP}
+# volumes:
+# - ../common/xos_common_config:/opt/xos/xos_configuration/xos_common_config:ro
+# - ../setup:/root/setup:ro
+# - ./images:/opt/xos/images:ro
+# log_driver: "json-file"
+# log_opt:
+# max-size: "100k"
+# max-file: "5"
diff --git a/devel/xos.yaml b/devel/xos.yaml
index bffb9ce..20852d1 100644
--- a/devel/xos.yaml
+++ b/devel/xos.yaml
@@ -14,7 +14,6 @@
bootstrap_ui_port: 9998
docker_project_name: devel
db_container_name: develbs_xos_db_1
- frontend_only: true
/opt/xos/xos_configuration/xos_common_config:
type: tosca.nodes.XOSVolume
@@ -34,4 +33,14 @@
requirements:
- xos:
node: xos
+ relationship: tosca.relationships.UsedByXOS
+
+ /opt/xos/images:
+ type: tosca.nodes.XOSVolume
+ properties:
+ host_path: { path_join: [ SELF, CONFIG_DIR, images, ENV_VAR ] }
+ read_only: true
+ requirements:
+ - xos:
+ node: xos
relationship: tosca.relationships.UsedByXOS
\ No newline at end of file