Merge "Add murano service broker in devstack installation"

contrib/devstack/extras.d/70-murano.sh

@@ -28,6 +28,9 @@ if is_service_enabled murano; then
         if is_service_enabled horizon; then
             configure_murano_dashboard
         fi
+        if is_service_enabled murano-cfapi; then
+            configure_service_broker
+        fi
     elif [[ "$1" == "stack" && "$2" == "extra" ]]; then
         echo_summary "Initializing Murano"
         init_murano
@@ -35,10 +38,16 @@ if is_service_enabled murano; then
             init_murano_dashboard
         fi
         start_murano
+        if is_service_enabled murano-cfapi; then
+            start_service_broker
+        fi
     fi
 
     if [[ "$1" == "unstack" ]]; then
         stop_murano
+        if is_service_enabled murano-cfapi; then
+            stop_service_broker
+        fi
         cleanup_murano
         if is_service_enabled horizon; then
             cleanup_murano_dashboard

contrib/devstack/lib/murano

@@ -171,6 +171,15 @@ function configure_murano {
         iniset $MURANO_CONF_FILE engine enable_model_policy_enforcer $MURANO_ENABLE_MODEL_POLICY_ENFORCEMENT
     fi
 
+# configure_service_broker() - set service broker specific options to config
+function configure_service_broker {
+    #Add needed options to murano.conf
+    iniset $MURANO_CONF_FILE cfapi tenant "admin"
+    iniset $MURANO_CONF_FILE cfapi bind_host $HOST_IP
+    iniset $MURANO_CONF_FILE cfapi bind_port "8083"
+    iniset $MURANO_CONF_FILE cfapi auth_url "http://${KEYSTONE_AUTH_HOST}:5000/v2.0"
+}
+
     # Murano Api Configuration
     #-------------------------
 
@@ -248,6 +257,20 @@ function stop_murano() {
     screen -S $SCREEN_NAME -p murano-engine -X kill
 }
 
+
+# start_service_broker() - start murano CF service broker
+function start_service_broker() {
+    screen_it murano-cfapi "cd $MURANO_DIR && $MURANO_BIN_DIR/murano-cfapi --config-file $MURANO_CONF_DIR/murano.conf"
+}
+
+
+# stop_service_broker() - stop murano CF service broker
+function stop_service_broker() {
+    # Kill the Murano screen windows
+    screen -S $SCREEN_NAME -p murano-cfapi -X kill
+}
+
+
 function cleanup_murano() {
 
     # Cleanup keystone signing dir