Integrate keystoneauth based monasca-agent

Following makes it possible to run monasca-agent (based
on keystoneauth) inside devstack environment.

Depends-On: Iec97e50089ed31ae7ad8244b37cec128817871a5
Change-Id: I579f6bcd5975a32af2a255be41c9b6c4043fa1dc

devstack/files/monasca-agent/monasca-reconfigure

@@ -2,14 +2,19 @@
 '/opt/monasca-agent/bin/monasca-setup' \
     -u 'monasca-agent' \
     -p 'password' \
-     -s 'monitoring'  \
-    --keystone_url 'http://127.0.0.1:35357/v3' \
+    -s '%MONASCA_SERVICE_TYPE%'  \
+    \
+    --keystone_url '%KEYSTONE_AUTH_URI%' \
     --project_name 'mini-mon' \
-     --monasca_url 'http://127.0.0.1:8070/v2.0'  \
-     \
-     --check_frequency '15'  \
-     \
-     --log_level 'WARN'  \
+    --project_domain_name '%SERVICE_DOMAIN_NAME%' \
+    --user_domain_name '%SERVICE_DOMAIN_NAME%' \
+    \
+    --service_type '%MONASCA_SERVICE_TYPE%' \
+    --endpoint_type 'public' \
+    --region_name '%REGION_NAME%' \
+    \
+    --check_frequency '15'  \
+    --log_level 'DEBUG'  \
     --overwrite \
     --system_only \
     --monasca_statsd_port %MONASCA_STATSD_PORT%

devstack/plugin.sh

@@ -93,6 +93,11 @@ MONASCA_API_URI_V2=${MONASCA_API_BASE_URI}/v2.0
 # Files inside this directory will be visible in gates log
 MON_API_GATE_CONFIGURATION_DIR=/etc/monasca-api
 
+# monasca_service_type, used in:
+# keystone endpoint creation
+# configuration files
+MONASCA_SERVICE_TYPE=monitoring
+
 function pre_install_monasca {
     echo_summary "Pre-Installing Monasca Components"
     find_nearest_apache_mirror
@@ -1503,7 +1508,7 @@ function create_metric_accounts {
     get_or_add_user_project_role "monasca-read-only-user" "monasca-read-only-user" "mini-mon"
 
     # crate service
-    get_or_create_service "monasca" "monitoring" "Monasca Monitoring Service"
+    get_or_create_service "monasca" "${MONASCA_SERVICE_TYPE}" "Monasca Monitoring Service"
 
     # create endpoint
     get_or_create_endpoint \
@@ -1517,8 +1522,8 @@ function create_metric_accounts {
 function install_keystone_client {
     PIP_VIRTUAL_ENV=/opt/monasca
 
-    pip_install_gr python-keystoneclient
-    pip_install_gr keystoneauth1
+    install_keystoneclient
+    install_keystoneauth
 
     unset PIP_VIRTUAL_ENV
 }
@@ -1572,13 +1577,12 @@ function install_monasca_agent {
 
     sudo chmod 0750 /usr/local/bin/monasca-reconfigure
 
-    if [[ ${SERVICE_HOST} ]]; then
-
-        sudo sed -i "s/--monasca_url 'http:\/\/127\.0\.0\.1:8070\/v2\.0'/--monasca_url 'http:\/\/${SERVICE_HOST}:8070\/v2\.0'/" /usr/local/bin/monasca-reconfigure
-        sudo sed -i "s/--keystone_url 'http:\/\/127\.0\.0\.1:35357\/v3'/--keystone_url 'http:\/\/${SERVICE_HOST}:35357\/v3'/" /usr/local/bin/monasca-reconfigure
-    fi
     sudo sed -e "
         s|%MONASCA_STATSD_PORT%|$MONASCA_STATSD_PORT|g;
+        s|%MONASCA_SERVICE_TYPE%|$MONASCA_SERVICE_TYPE|g;
+        s|%KEYSTONE_AUTH_URI%|$KEYSTONE_AUTH_URI|g;
+        s|%SERVICE_DOMAIN_NAME%|$SERVICE_DOMAIN_NAME|g;
+        s|%REGION_NAME%|$REGION_NAME|g;
     " -i /usr/local/bin/monasca-reconfigure
 }
 

devstack/settings

@@ -184,4 +184,4 @@ MONASCA_API_CONF=${MONASCA_API_CONF:-$MONASCA_API_CONF_DIR/api-config.conf}
 MONASCA_API_PASTE_INI=${MONASCA_API_PASTE_INI:-$MONASCA_API_CONF_DIR/api-config.ini}
 MONASCA_API_LOGGING_CONF=${MONASCA_API_LOGGING_CONF:-$MONASCA_API_CONF_DIR/api-logging.conf}
 MONASCA_API_CACHE_DIR=${MONASCA_API_CACHE_DIR:-/var/cache/monasca-api}
-MONASCA_API_LOG_DIR=${MONASCA_API_LOG_DIR:-/var/log/monasca/api}
+MONASCA_API_LOG_DIR=${MONASCA_API_LOG_DIR:-/var/log/monasca/api}