Merge "Update name of pipeline"
diff --git a/model_manager/server/delivery.yml b/model_manager/server/delivery.yml
new file mode 100644
index 0000000..c7c5dce
--- /dev/null
+++ b/model_manager/server/delivery.yml
@@ -0,0 +1,6 @@
+classes:
+- service.model_manager.server.delivery
+- service.redis.server.local
+- system.nginx.server.single
+- system.nginx.server.site.model_manager
+
diff --git a/model_manager/server/integration.yml b/model_manager/server/integration.yml
new file mode 100644
index 0000000..0d723a8
--- /dev/null
+++ b/model_manager/server/integration.yml
@@ -0,0 +1,6 @@
+classes:
+- service.model_manager.server.integration
+- service.redis.server.local
+- system.nginx.server.single
+- system.nginx.server.site.model_manager
+
diff --git a/model_manager/server/single.yml b/model_manager/server/single.yml
new file mode 100644
index 0000000..2bc7f0d
--- /dev/null
+++ b/model_manager/server/single.yml
@@ -0,0 +1,4 @@
+classes:
+- system.model_manager.server.integration
+- system.model_manager.server.delivery
+
diff --git a/nginx/server/proxy/model_manager_web.yml b/nginx/server/proxy/model_manager_web.yml
new file mode 100644
index 0000000..a71fe41
--- /dev/null
+++ b/nginx/server/proxy/model_manager_web.yml
@@ -0,0 +1,37 @@
+parameters:
+ _param:
+ nginx_proxy_model_manager_web_host: ${_param:cluster_public_host}
+ nginx_proxy_model_manager_web_proxy_host: ${_param:cluster_vip_address}
+ nginx_proxy_model_manager_web_buffer_size:
+ number: 4
+ size: 256
+ nginx:
+ server:
+ enabled: true
+ site:
+ nginx_proxy_model_manager_web:
+ enabled: true
+ type: nginx_proxy
+ name: model_manager_web
+ proxy:
+ host: ${_param:nginx_proxy_model_manager_web_proxy_host}
+ port: 80
+ size: 10000m
+ timeout: 43200
+ protocol: http
+ websocket: true
+ request_buffer: false
+ buffer:
+ ${_param:nginx_proxy_model_manager_web_buffer_size}
+ host:
+ name: ${_param:nginx_proxy_model_manager_web_host}
+ port: 443
+ protocol: https
+ ssl: ${_param:nginx_proxy_ssl}
+ nginx_ssl_redirect_model_manager_web:
+ enabled: true
+ type: nginx_redirect
+ name: model_manager_web_redirect
+ host:
+ name: ${_param:nginx_proxy_model_manager_web_host}
+ port: 80
diff --git a/nginx/server/site/model_manager.yml b/nginx/server/site/model_manager.yml
new file mode 100644
index 0000000..150d785
--- /dev/null
+++ b/nginx/server/site/model_manager.yml
@@ -0,0 +1,13 @@
+parameters:
+ nginx:
+ server:
+ enabled: true
+ site:
+ model_manager_dashboard:
+ enabled: true
+ type: model_manager
+ name: dashboard
+ host:
+ name: ${_param:single_address}
+ port: 80
+
diff --git a/salt/minion/cert/octavia_amp_client.yml b/salt/minion/cert/octavia_amp_client.yml
index 7a8425a..5219450 100644
--- a/salt/minion/cert/octavia_amp_client.yml
+++ b/salt/minion/cert/octavia_amp_client.yml
@@ -1,13 +1,14 @@
parameters:
_param:
- salt_minion_ca_host: ${_param:openstack_gateway_node01_hostname}.${_param:cluster_domain}
- salt_minion_ca_authority: octavia_ca
+ octavia_ca_hostname: ${linux:system:name}
+ octavia_ca_host: ${_param:octavia_ca_hostname}.${_param:cluster_domain}
+ octavia_ca_authority: octavia_ca
salt:
minion:
cert:
octavia_amp_client:
- host: ${_param:salt_minion_ca_host}
- authority: ${_param:salt_minion_ca_authority}
+ host: ${_param:octavia_ca_host}
+ authority: ${_param:octavia_ca_authority}
common_name: octavia_amp_client
signing_policy: cert_open
key_usage: "digitalSignature,nonRepudiation,keyEncipherment"