Merge "fixing params in keycloak drivetrain realm"
diff --git a/defaults/openstack/init.yml b/defaults/openstack/init.yml
index f8949e9..ba3c682 100644
--- a/defaults/openstack/init.yml
+++ b/defaults/openstack/init.yml
@@ -12,3 +12,6 @@
# Cinder
cinder_memcache_security_enabled: ${_param:openstack_memcache_security_enabled}
cinder_memcache_secret_key: ''
+ # Nova
+ nova_memcache_security_enabled: ${_param:openstack_memcache_security_enabled}
+ nova_memcache_secret_key: ''
diff --git a/docker/swarm/stack/operations_api.yml b/docker/swarm/stack/operations_api.yml
index 8d7aef7..74426ad 100644
--- a/docker/swarm/stack/operations_api.yml
+++ b/docker/swarm/stack/operations_api.yml
@@ -2,6 +2,7 @@
_param:
docker_operations_api_replicas: 1
docker_image_operations_api: mirantis/python-operations-api:latest
+ docker_image_operations_ui: mirantis/operations-ui:latest
operations_api_sqlalchemy_database_uri: "cockroachdb://oapi@cockroach-ui:26257/oapi"
operations_api_sqlalchemy_echo: "false"
operations_api_flask_debug: "false"
@@ -55,6 +56,15 @@
- cockroach-ui
volumes:
- /srv/volumes/cockroachdb/cockroach-db-1:/cockroach/cockroach-data
+ operations-ui:
+ environment:
+ REACT_APP_OPERATIONS_API_URL: 'http://${_param:cluster_public_host}:${_param:haproxy_operations_api_bind_port}'
+ REACT_APP_KEYCLOAK_AUTH_URL: 'http://${_param:cluster_public_host}:${_param:haproxy_keycloak_proxy_exposed_port}/auth'
+ REACT_APP_KEYCLOAK_REALM: 'drivetrain-realm'
+ REACT_APP_KEYCLOAK_CLIENT_ID: 'operations-ui'
+ image: ${_param:docker_image_operations_ui}
+ ports:
+ - ${_param:haproxy_operations_ui_exposed_port}:${_param:haproxy_operations_ui_bind_port}
cockroach-init:
environment:
COCKROACH_HOST: cockroach-ui
diff --git a/nova/compute/cluster.yml b/nova/compute/cluster.yml
index 92871c0..3053335 100644
--- a/nova/compute/cluster.yml
+++ b/nova/compute/cluster.yml
@@ -37,8 +37,6 @@
SG9MrLHCd5l60aCUQg0UA5ed7Hd6SA314k+HwxJno9/wJ+voBeacMg==
-----END RSA PRIVATE KEY-----
cluster_internal_protocol: 'http'
- nova_memcache_security_enabled: ${_param:openstack_memcache_security_enabled}
- nova_memcache_secret_key: ''
openssh:
client:
enabled: True
diff --git a/nova/compute/single.yml b/nova/compute/single.yml
index 90a2fa7..7ba6775 100644
--- a/nova/compute/single.yml
+++ b/nova/compute/single.yml
@@ -37,8 +37,6 @@
SG9MrLHCd5l60aCUQg0UA5ed7Hd6SA314k+HwxJno9/wJ+voBeacMg==
-----END RSA PRIVATE KEY-----
cluster_internal_protocol: 'http'
- nova_memcache_security_enabled: ${_param:openstack_memcache_security_enabled}
- nova_memcache_secret_key: ''
openssh:
client:
enabled: True
diff --git a/nova/control/cluster.yml b/nova/control/cluster.yml
index 3a2e293..330a233 100644
--- a/nova/control/cluster.yml
+++ b/nova/control/cluster.yml
@@ -14,8 +14,6 @@
nova_disk_allocation_ratio: 1.0
metadata_password: metadataPass
cluster_internal_protocol: 'http'
- nova_memcache_security_enabled: ${_param:openstack_memcache_security_enabled}
- nova_memcache_secret_key: ''
linux:
system:
package:
diff --git a/nova/control/single.yml b/nova/control/single.yml
index 51e856f..5b61f20 100644
--- a/nova/control/single.yml
+++ b/nova/control/single.yml
@@ -5,8 +5,6 @@
parameters:
_param:
cluster_internal_protocol: 'http'
- nova_memcache_security_enabled: ${_param:openstack_memcache_security_enabled}
- nova_memcache_secret_key: ''
linux:
system:
package: