Merge "configure auto-proxe for drivetrain ui"
diff --git a/.releasenotes/notes/add-fwaas-d4dea7f376eb3f83.yaml b/.releasenotes/notes/add-fwaas-d4dea7f376eb3f83.yaml
new file mode 100644
index 0000000..69c6ad2
--- /dev/null
+++ b/.releasenotes/notes/add-fwaas-d4dea7f376eb3f83.yaml
@@ -0,0 +1,19 @@
+---
+features:
+ - |
+ Add system level metadata class required to enable FWaaS in Neutron.
+
+ The Firewall-as-a-Service (FWaaS) plug-in applies firewalls to OpenStack
+ objects such as projects, routers, router ports, as well as to VM ports
+ and SFC ports in FWaaS V2.
+
+ To enable FWaaS add the ``system.neutron.fwaas`` class to nodes with
+ control, gateway and, if the Neutron DVR feature is enabled, compute roles.
+
+ By default the FWaaS V1 is installed. To install FWaaS V2 redefine the
+ ``fwaas_version`` parameter on the cluster level:
+
+ .. code-block:: yaml
+
+ fwaas_version: v2
+
diff --git a/docker/swarm/stack/elasticsearch.yml b/docker/swarm/stack/elasticsearch.yml
index 5ee295c..1c22e8f 100644
--- a/docker/swarm/stack/elasticsearch.yml
+++ b/docker/swarm/stack/elasticsearch.yml
@@ -4,6 +4,7 @@
docker_image_elasticsearch: docker.elastic.co/elasticsearch/elasticsearch:5.4.1
elasticsearch_cluster_name: oss-cluster
elasticsearch_xpack_security_enabled: 'false'
+ elasticsearch_xpack_monitoring_enabled: 'false'
elasticsearch_discovery_zen_minimum_master_nodes: 1
elasticsearch_discovery_type: single-node
docker:
@@ -13,6 +14,7 @@
environment:
cluster.name: ${_param:elasticsearch_cluster_name}
xpack.security.enabled: ${_param:elasticsearch_xpack_security_enabled}
+ xpack.monitoring.enabled: ${_param:elasticsearch_xpack_monitoring_enabled}
discovery.zen.minimum_master_nodes: ${_param:elasticsearch_discovery_zen_minimum_master_nodes}
discovery.type: ${_param:elasticsearch_discovery_type}
service:
diff --git a/jenkins/client/job/deploy/lab/init.yml b/jenkins/client/job/deploy/lab/init.yml
index 860e55f..0fce66b 100644
--- a/jenkins/client/job/deploy/lab/init.yml
+++ b/jenkins/client/job/deploy/lab/init.yml
@@ -8,6 +8,7 @@
- system.jenkins.client.job.deploy.lab.release.mcp11
- system.jenkins.client.job.deploy.lab.component.aaa
- system.jenkins.client.job.deploy.lab.component.ceph
+ - system.jenkins.client.job.deploy.lab.component.drivetrain
- system.jenkins.client.job.deploy.lab.component.kubernetes
- system.jenkins.client.job.deploy.lab.component.openstack
- system.jenkins.client.job.deploy.lab.component.stacklight
diff --git a/jenkins/client/job/validate.yml b/jenkins/client/job/validate.yml
index 6f22a0c..5a2c616 100644
--- a/jenkins/client/job/validate.yml
+++ b/jenkins/client/job/validate.yml
@@ -56,3 +56,24 @@
TEST_K8S_CONFORMANCE_IMAGE:
type: string
default: "docker-dev-virtual.docker.mirantis.net/mirantis/kubernetes/k8s-conformance:v1.5.1-3_1482332392819"
+ RUN_SPT_TESTS:
+ type: boolean
+ default: 'true'
+ SPT_SSH_USER:
+ type: string
+ default: "root"
+ SPT_FLOATING_NETWORK:
+ type: string
+ default: ""
+ SPT_IMAGE:
+ type: string
+ default: ""
+ SPT_USER:
+ type: string
+ default: ""
+ SPT_FLAVOR:
+ type: string
+ default: ""
+ SPT_AVAILABILITY_ZONE:
+ type: string
+ default: "nova"
diff --git a/neutron/fwaas.yml b/neutron/fwaas.yml
new file mode 100644
index 0000000..79c6439
--- /dev/null
+++ b/neutron/fwaas.yml
@@ -0,0 +1,8 @@
+classes:
+- service.neutron.fwaas
+parameters:
+ _param:
+ fwaas_version: v1
+ neutron:
+ fwaas:
+ api_version: ${_param:fwaas_version}
diff --git a/nova/client/flavor/default.yml b/nova/client/flavor/default.yml
index 492530d..1d374c5 100644
--- a/nova/client/flavor/default.yml
+++ b/nova/client/flavor/default.yml
@@ -61,4 +61,4 @@
m1.large100:
ram: 8096
disk: 100
- vcpus: 4
+ vcpus: 4
diff --git a/openssh/server/team/support.yml b/openssh/server/team/support.yml
index d4afcf5..fae16a6 100644
--- a/openssh/server/team/support.yml
+++ b/openssh/server/team/support.yml
@@ -44,7 +44,7 @@
- system.openssh.server.team.members.pmichalec
parameters:
_param:
- linux_system_user_sudo: false
+ linux_system_user_sudo: true
linux:
system:
group:
diff --git a/openssh/server/team/tcpcloud.yml b/openssh/server/team/tcpcloud.yml
index bcd9327..5f9af00 100644
--- a/openssh/server/team/tcpcloud.yml
+++ b/openssh/server/team/tcpcloud.yml
@@ -21,7 +21,6 @@
- system.openssh.server.team.members.vmikes
- system.openssh.server.team.members.psvimbersky
- system.openssh.server.team.members.chnyda
-
parameters:
_param:
linux_system_user_sudo: true
diff --git a/prometheus/server/alert/labels_add/route.yml b/prometheus/server/alert/labels_add/route.yml
index 47d9eea..651dab7 100644
--- a/prometheus/server/alert/labels_add/route.yml
+++ b/prometheus/server/alert/labels_add/route.yml
@@ -1,6 +1,6 @@
parameters:
_param:
- prometheus_server_alert_label_route: mail
+ prometheus_server_alert_label_route: email
prometheus:
server:
config:
diff --git a/salt/master/formula/git/ceph.yml b/salt/master/formula/git/ceph.yml
new file mode 100644
index 0000000..10c3ca0
--- /dev/null
+++ b/salt/master/formula/git/ceph.yml
@@ -0,0 +1,10 @@
+parameters:
+ salt:
+ master:
+ environment:
+ dev:
+ formula:
+ ceph:
+ source: git
+ address: '${_param:salt_master_environment_repository}/salt-formula-ceph.git'
+ revision: ${_param:salt_master_environment_revision}
diff --git a/salt/master/formula/pkg/ceph.yml b/salt/master/formula/pkg/ceph.yml
new file mode 100644
index 0000000..461f5c5
--- /dev/null
+++ b/salt/master/formula/pkg/ceph.yml
@@ -0,0 +1,9 @@
+parameters:
+ salt:
+ master:
+ environment:
+ prd:
+ formula:
+ ceph:
+ source: pkg
+ name: salt-formula-ceph
diff --git a/salt/master/git.yml b/salt/master/git.yml
index 4562a74..7f09ed9 100644
--- a/salt/master/git.yml
+++ b/salt/master/git.yml
@@ -9,6 +9,7 @@
- system.salt.master.formula.git.stacklight
- system.salt.master.formula.git.monitoring
- system.salt.master.formula.git.helm
+- system.salt.master.formula.git.ceph
parameters:
_param:
salt_master_environment_repository: "https://github.com/salt-formulas"
diff --git a/salt/master/pkg.yml b/salt/master/pkg.yml
index 62854f1..dba30d0 100644
--- a/salt/master/pkg.yml
+++ b/salt/master/pkg.yml
@@ -9,4 +9,5 @@
- system.salt.master.formula.pkg.stacklight
- system.salt.master.formula.pkg.monitoring
- system.salt.master.formula.pkg.helm
+- system.salt.master.formula.pkg.ceph
- system.linux.system.repo.mcp.salt