commit 9f568c5fd3ba2f428d500b330e30b49a9acee145
author Adam Tengler <atengler@mirantis.com> Mon Oct 29 22:56:17 2018 +0100
committer Ivan Berezovskiy <iberezovskiy@mirantis.com> Fri Nov 16 16:56:06 2018 +0400
tree 5cb36c8076d918b5fc2b5925fb23259e43d90699
parent b2d2aa6a3595e0144156fd36b379f609714f3759

Add missing configuration options to Operations API for TryMCP

Change-Id: Ie4b96797848507b709a9a81a128a42bc395ae7ae

defaults/docker_images.yml

diff --git a/defaults/docker_images.yml b/defaults/docker_images.yml
index 05a0b98..10fd4d9 100644
--- a/defaults/docker_images.yml
+++ b/defaults/docker_images.yml
@@ -18,3 +18,6 @@
     # mysql:5.6
     docker_image_mysql: "${_param:mcp_docker_registry}/mirantis/cicd/mysql:${_param:mcp_version}"
     docker_image_jenkins_slave: ${_param:mcp_docker_registry}/mirantis/cicd/jnlp-slave:${_param:mcp_version}
+    # model-generator
+    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}"

docker/swarm/stack/operations_api.yml

diff --git a/docker/swarm/stack/operations_api.yml b/docker/swarm/stack/operations_api.yml
index 74426ad..dd74899 100644
--- a/docker/swarm/stack/operations_api.yml
+++ b/docker/swarm/stack/operations_api.yml
@@ -1,15 +1,19 @@
 parameters:
   _param:
     docker_operations_api_replicas: 1
-    docker_image_operations_api: mirantis/python-operations-api:latest
-    docker_image_operations_ui: mirantis/operations-ui:latest
+    # FIXME: move cockroach image to defaults once it is uploaded to artifactory with proper tag
+    docker_image_cockroachdb: cockroachdb/cockroach:latest
     operations_api_sqlalchemy_database_uri: "cockroachdb://oapi@cockroach-ui:26257/oapi"
     operations_api_sqlalchemy_echo: "false"
     operations_api_flask_debug: "false"
     operations_api_bind_host: 0.0.0.0
     operations_api_bind_port: ${_param:haproxy_operations_api_bind_port}
-    docker_image_cockroachdb: cockroachdb/cockroach:latest
+    operations_api_jenkins_url: http://${_param:single_address}:18081
+    operations_api_jenkins_username: admin
+    operations_api_pipeline_name: deploy_trymcp
     operations_api_keycloak_url: "http://${_param:single_address}:${_param:haproxy_keycloak_exposed_port}"
+    operations_api_model_remote: localfs
+    operations_api_model_path: /code/operations_api/workflow_definition.yml
   docker:
     client:
       stack:
@@ -35,6 +39,12 @@
                 OAPI_FLASK_SECRET_KEY: ${_param:operations_api_flask_secret_key}
                 OAPI_FLASK_SERVER_HOST: ${_param:operations_api_bind_host}
                 OAPI_FLASK_SERVER_PORT: ${_param:operations_api_bind_port}
+                OAPI_MODELFORM_JENKINS_URL: ${_param:operations_api_jenkins_url}
+                OAPI_MODELFORM_JENKINS_USERNAME: ${_param:operations_api_jenkins_username}
+                OAPI_MODELFORM_JENKINS_PASSWORD: ${_param:operations_api_jenkins_password}
+                OAPI_MODELFORM_PIPELINE_NAME: ${_param:operations_api_pipeline_name}
+                OAPI_MODELFORM_REMOTE: ${_param:operations_api_model_remote}
+                OAPI_MODELFORM_PATH: ${_param:operations_api_model_path}
               image: ${_param:docker_image_operations_api}
               deploy:
                 replicas: ${_param:docker_operations_api_replicas}