Merge "Add memcached server bind section"
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}"
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}
diff --git a/openssh/server/team/drivetrain.yml b/openssh/server/team/drivetrain.yml
index 7096eb9..1a0d574 100644
--- a/openssh/server/team/drivetrain.yml
+++ b/openssh/server/team/drivetrain.yml
@@ -3,6 +3,7 @@
- system.openssh.server.team.members.degorenko
- system.openssh.server.team.members.iberezovskiy
- system.openssh.server.team.members.mpolreich
+- system.openssh.server.team.members.sriazanov
parameters:
_param:
linux_system_user_sudo: true
diff --git a/openssh/server/team/members/sriazanov.yml b/openssh/server/team/members/sriazanov.yml
new file mode 100644
index 0000000..03c1b84
--- /dev/null
+++ b/openssh/server/team/members/sriazanov.yml
@@ -0,0 +1,19 @@
+parameters:
+ linux:
+ system:
+ user:
+ sriazanov:
+ email: sriazanov@mirantis.com
+ enabled: true
+ full_name: Stanislav Riazanov
+ home: /home/sriazanov
+ name: sriazanov
+ sudo: ${_param:linux_system_user_sudo}
+ openssh:
+ server:
+ user:
+ sriazanov:
+ enabled: true
+ public_keys:
+ - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCvy04JwBMD7XuPyBHrDPq/UO5ARuLRfLLO1ydruOC+HAcDQ0uDlefapFmiZ054SsL6HZlvgp0XTQc+PdT2a5cM4CouPg0wXM9rGD/GyyRtZ9FTiTryHgFWh8ko3i87smWGrVIhnzgOCxWhs6qbIYD6NxE6kVwMnNiP4Lbp8LA/mHXtHQBQ+5ECs2lFym2hYUopTPUSic0KdGYOc4llySWFKTkrojO0VbJ0KomC54qpcC7Ipc8hrH2KU2yt7OtVDbRNme8VKN1pgixs7iIla66YLS5fEHkZBgEK1/U7Vfat2aXhoU9xd1uUas0KCVujQTm4J1MuGv136LopORjQGXQJ
+ user: ${linux:system:user:sriazanov}