Monitoring service makefile cleanup for custom images
Change-Id: I1b9d585963f581cbee537cc2cf08766e01e4c263
diff --git a/cord-pod/Makefile b/cord-pod/Makefile
index 4567130..72a4824 100644
--- a/cord-pod/Makefile
+++ b/cord-pod/Makefile
@@ -100,11 +100,15 @@
bash $(COMMON_DIR)/wait_for_onboarding_ready.sh $(XOS_BOOTSTRAP_PORT) xos
bash $(COMMON_DIR)/wait_for_xos_port.sh $(XOS_UI_PORT)
-cord-monitoringservice: onboard-monitoringservice
+cord-monitoringservice: ceilometer_custom_images onboard-monitoringservice
$(RUN_TOSCA) monitoringservice.yaml
$(RUN_TOSCA) monitoringtenant.yaml
-onboard-monitoringservice: $(SERVICE_DIR)/monitoring
+rebuild-monitoringservice:
+ bash $(COMMON_DIR)/rebuild.sh $(XOS_BOOTSTRAP_PORT) monitoring
+ bash $(COMMON_DIR)/wait_for_onboarding_ready.sh $(XOS_BOOTSTRAP_PORT) xos
+
+onboard-monitoringservice: ceilometer_custom_images $(SERVICE_DIR)/monitoring
sudo cp id_rsa key_import/monitoringservice_rsa
sudo cp id_rsa.pub key_import/monitoringservice_rsa.pub
$(RUN_TOSCA_BOOTSTRAP) $(SERVICE_DIR)/monitoring/xos/monitoring-onboard.yaml
@@ -113,6 +117,8 @@
bash $(COMMON_DIR)/wait_for_onboarding_ready.sh $(XOS_BOOTSTRAP_PORT) xos
bash $(COMMON_DIR)/wait_for_xos_port.sh $(XOS_UI_PORT)
+ceilometer_custom_images: $(CONFIG_DIR)images/ceilometer-trusty-server-multi-nic.img $(CONFIG_DIR)images/ceilometer-service-trusty-server-multi-nic.img
+
virtualbng_json:
export SETUPDIR=$(CONFIG_DIR); bash ./make-virtualbng-json.sh