Merge "Migrate nova accounts"

devstack/lib/nova

@@ -67,12 +67,20 @@ function create_nova_conf {
 	# only on nodes which runs controller services
 	iniset $NOVA_CONF cache enabled $NOVA_ENABLE_CACHE
 	iniset $NOVA_CONF cache backend $CACHE_BACKEND
-	iniset $NOVA_CONF cache memcache_servers mcrouter-memcached-nova.openstack.svc.cluster.local
+	iniset $NOVA_CONF cache memcache_servers mcrouter-memcached-nova.openstack.svc.cluster.local:11211
 
 	NOVA_ENABLED_APIS=$(echo $NOVA_ENABLED_APIS | sed "s/,metadata//")
 	iniset $NOVA_CONF DEFAULT enabled_apis "$NOVA_ENABLED_APIS"
 
-	configure_keystone_authtoken_middleware $NOVA_CONF nova
+	# Adop v3applicationcredential instead of password type
+    kubernetes_ensure_resource secret/nova-application-credential
+    NOVA_APPLICATION_CREDENTIAL_SECRET=$(get_data_from_secret nova-application-credential openstack secret)
+    NOVA_APPLICATION_CREDENTIAL_ID=$(get_data_from_secret nova-application-credential openstack id)
+    iniset $NOVA_CONF keystone_authtoken auth_url $KEYSTONE_AUTH_URI_V3
+    iniset $NOVA_CONF keystone_authtoken auth_type v3applicationcredential
+    iniset $NOVA_CONF keystone_authtoken application_credential_id $NOVA_APPLICATION_CREDENTIAL_ID
+    iniset $NOVA_CONF keystone_authtoken application_credential_secret $NOVA_APPLICATION_CREDENTIAL_SECRET
+	iniset $NOVA_CONF keystone_authtoken memcached_servers mcrouter-memcached-nova.openstack.svc.cluster.local:11211
 
 	if is_service_enabled cinder; then
 		configure_cinder_access
@@ -352,4 +360,22 @@ function start_nova {
     start_nova_console_proxies
     start_nova_conductor
     start_nova_compute
-}
+}
+
+function create_nova_accounts {
+	# NOTE(Alex): Ignore ResellerAdmin
+	echo noop
+}
+
+function init_nova_service_user_conf {
+
+    kubernetes_ensure_resource secret/nova-application-credential
+    NOVA_APPLICATION_CREDENTIAL_SECRET=$(get_data_from_secret nova-application-credential openstack secret)
+    NOVA_APPLICATION_CREDENTIAL_ID=$(get_data_from_secret nova-application-credential openstack id)
+    iniset $NOVA_CONF service_user auth_url $KEYSTONE_SERVICE_URI
+    iniset $NOVA_CONF service_user auth_type v3applicationcredential
+    iniset $NOVA_CONF service_user application_credential_id $NOVA_APPLICATION_CREDENTIAL_ID
+    iniset $NOVA_CONF service_user application_credential_secret $NOVA_APPLICATION_CREDENTIAL_SECRET
+    iniset $NOVA_CONF service_user send_service_user_token True
+    iniset $NOVA_CONF service_user auth_strategy keystone
+}

images/nova/nova-api-wsgi

@@ -17,12 +17,17 @@
 import pkg_resources
 
 import sentry_sdk
+from sentry_sdk.integrations.sqlalchemy import SqlalchemyIntegration
 
 from nova.api.openstack.compute.wsgi import init_application
 from sentry_sdk.integrations import wsgi
 
 VERSION = pkg_resources.get_distribution("nova").version
-sentry_sdk.init(release="nova@%s" % VERSION)
+
+sentry_sdk.init(
+    release="nova@%s" % VERSION,
+    integrations=[SqlalchemyIntegration()]
+)
 
 application = init_application()
 application = wsgi.SentryWsgiMiddleware(application)

images/nova/nova-compute

@@ -19,11 +19,16 @@ import re
 import sys
 
 import sentry_sdk
+from sentry_sdk.integrations.sqlalchemy import SqlalchemyIntegration
 
 from nova.cmd.compute import main
 
 VERSION = pkg_resources.get_distribution("nova").version
-sentry_sdk.init(release="nova@%s" % VERSION)
+
+sentry_sdk.init(
+    release="nova@%s" % VERSION,
+    integrations=[SqlalchemyIntegration()]
+)
 
 sys.argv[0] = re.sub(r'(-script\.pyw|\.exe)?$', '', sys.argv[0])
 sys.exit(main())

images/nova/nova-conductor

@@ -19,11 +19,16 @@ import re
 import sys
 
 import sentry_sdk
+from sentry_sdk.integrations.sqlalchemy import SqlalchemyIntegration
 
 from nova.cmd.conductor import main
 
 VERSION = pkg_resources.get_distribution("nova").version
-sentry_sdk.init(release="nova@%s" % VERSION)
+
+sentry_sdk.init(
+    release="nova@%s" % VERSION,
+    integrations=[SqlalchemyIntegration()]
+)
 
 sys.argv[0] = re.sub(r'(-script\.pyw|\.exe)?$', '', sys.argv[0])
 sys.exit(main())

images/nova/nova-metadata-wsgi

@@ -17,12 +17,17 @@
 import pkg_resources
 
 import sentry_sdk
+from sentry_sdk.integrations.sqlalchemy import SqlalchemyIntegration
 
 from nova.api.metadata.wsgi import init_application
 from sentry_sdk.integrations import wsgi
 
 VERSION = pkg_resources.get_distribution("nova").version
-sentry_sdk.init(release="nova@%s" % VERSION)
+
+sentry_sdk.init(
+    release="nova@%s" % VERSION,
+    integrations=[SqlalchemyIntegration()]
+)
 
 application = init_application()
 application = wsgi.SentryWsgiMiddleware(application)

images/nova/nova-novncproxy

@@ -19,11 +19,16 @@ import re
 import sys
 
 import sentry_sdk
+from sentry_sdk.integrations.sqlalchemy import SqlalchemyIntegration
 
 from nova.cmd.novncproxy import main
 
 VERSION = pkg_resources.get_distribution("nova").version
-sentry_sdk.init(release="nova@%s" % VERSION)
+
+sentry_sdk.init(
+    release="nova@%s" % VERSION,
+    integrations=[SqlalchemyIntegration()]
+)
 
 sys.argv[0] = re.sub(r'(-script\.pyw|\.exe)?$', '', sys.argv[0])
 sys.exit(main())

images/nova/nova-scheduler

@@ -19,11 +19,16 @@ import re
 import sys
 
 import sentry_sdk
+from sentry_sdk.integrations.sqlalchemy import SqlalchemyIntegration
 
 from nova.cmd.scheduler import main
 
 VERSION = pkg_resources.get_distribution("nova").version
-sentry_sdk.init(release="nova@%s" % VERSION)
+
+sentry_sdk.init(
+    release="nova@%s" % VERSION,
+    integrations=[SqlalchemyIntegration()]
+)
 
 sys.argv[0] = re.sub(r'(-script\.pyw|\.exe)?$', '', sys.argv[0])
 sys.exit(main())