Merge "Add data for state to pull docker images"
diff --git a/defaults/docker_images.yml b/defaults/docker_images.yml
index a52fbc6..2dede15 100644
--- a/defaults/docker_images.yml
+++ b/defaults/docker_images.yml
@@ -1,13 +1,13 @@
parameters:
_param:
# CI\CD
- docker_image_compose: "${_param:mcp_docker_registry}/mirantis/external/compose:${_param:mcp_version}"
+ docker_image_compose: "${_param:mcp_docker_registry}/mirantis/external/docker/compose:1.17.1"
+ # 2.6.2 version, from 12/18/2108, differ from latest 2.6.2 upstream - update next cycle
docker_image_registry: "${_param:mcp_docker_registry}/mirantis/external/registry:${_param:mcp_version}"
docker_image_visualizer: "${_param:mcp_docker_registry}/mirantis/external/visualizer:${_param:mcp_version}"
- # openldap:1.1.8
- docker_image_openldap: "${_param:mcp_docker_registry}/mirantis/external/openldap:${_param:mcp_version}"
+ docker_image_openldap: "${_param:mcp_docker_registry}/mirantis/external/osixia/openldap:1.1.8"
docker_image_postgresql: "${_param:mcp_docker_registry}/mirantis/external/library/postgres:9.6.10"
- # library/mongo:3.4 #G
+ # 3.4.13, from Feb 15, differ from 3.4.13 upstream verison, from March 14 - update next cycle
docker_image_mongodb: "${_param:mcp_docker_registry}/mirantis/external/library/mongo:${_param:mcp_version}"
###
# phpldapadmin:0.6.12
@@ -23,6 +23,7 @@
docker_image_operations_api: "${_param:mcp_docker_registry}/mirantis/model-generator/operations-api:${_param:mcp_version}"
docker_image_operations_ui: "${_param:mcp_docker_registry}/mirantis/model-generator/operations-ui:${_param:mcp_version}"
# stacklight
+ # 6.5.0 version, from 11/29/2018, differ from latest upstream 6.5.0 - update next cycle
docker_image_alerta: "${_param:mcp_docker_registry}/mirantis/external/alerta-web:${_param:mcp_version}"
docker_image_alertmanager: "${_param:mcp_docker_registry}/openstack-docker/alertmanager:${_param:mcp_version}"
docker_image_grafana: "${_param:mcp_docker_registry}/openstack-docker/grafana:${_param:mcp_version}"
diff --git a/keystone/client/service/contrail.yml b/keystone/client/service/contrail.yml
index 4486766..ad2f6e2 100644
--- a/keystone/client/service/contrail.yml
+++ b/keystone/client/service/contrail.yml
@@ -7,6 +7,13 @@
client:
server:
identity:
+ project:
+ admin:
+ user:
+ contrail:
+ is_admin: true
+ password: ${_param:opencontrail_admin_password}
+ email: ${_param:admin_email}
service:
opencontrail:
type: contrail