Merge "Adjust reclass definitions for k8s calico refactoring."
diff --git a/.releasenotes/notes/parametric-telemetry-hostnames-06e14467d9a9077d.yaml b/.releasenotes/notes/parametric-telemetry-hostnames-06e14467d9a9077d.yaml
new file mode 100644
index 0000000..e75d549
--- /dev/null
+++ b/.releasenotes/notes/parametric-telemetry-hostnames-06e14467d9a9077d.yaml
@@ -0,0 +1,15 @@
+---
+upgrades:
+ - mongodb.server.cluster no longer hardcodes the telemetry nodes' hostnames
+ in favor of using `openstack_telemetry_node{01,02,03}_hostname` params,
+ allowing custom hostnames to be used.
+
+ Configuration example:
+
+ .. code-block:: yaml
+
+ parameters:
+ _param:
+ openstack_telemetry_node01_hostname: mdb01
+ openstack_telemetry_node02_hostname: mdb02
+ openstack_telemetry_node03_hostname: mdb03
diff --git a/apache/server/proxy/openstack/cinder.yml b/apache/server/proxy/openstack/cinder.yml
new file mode 100644
index 0000000..8b3fb4f
--- /dev/null
+++ b/apache/server/proxy/openstack/cinder.yml
@@ -0,0 +1,24 @@
+parameters:
+ _param:
+ apache_proxy_ssl:
+ enabled: false
+ apache_proxy_openstack_api_host: ${_param:cluster_public_host}
+ apache_proxy_openstack_api_address: 0.0.0.0
+ apache_proxy_openstack_cinder_host: ${_param:cinder_service_host}
+ apache:
+ server:
+ site:
+ apache_proxy_openstack_api_cinder:
+ enabled: true
+ type: proxy
+ name: openstack_api_cinder
+ check: false
+ proxy:
+ host: ${_param:apache_proxy_openstack_cinder_host}
+ port: 8776
+ protocol: http
+ host:
+ name: ${_param:apache_proxy_openstack_api_host}
+ port: 8776
+ address: ${_param:apache_proxy_openstack_api_address}
+ ssl: ${_param:apache_proxy_ssl}
diff --git a/apache/server/proxy/openstack/designate.yml b/apache/server/proxy/openstack/designate.yml
new file mode 100644
index 0000000..b681cf7
--- /dev/null
+++ b/apache/server/proxy/openstack/designate.yml
@@ -0,0 +1,28 @@
+parameters:
+ _param:
+ apache_proxy_ssl:
+ enabled: false
+ apache_proxy_openstack_api_host: ${_param:cluster_public_host}
+ apache_proxy_openstack_api_address: 0.0.0.0
+ apache_proxy_openstack_designate_host: ${_param:designate_service_host}
+ apache:
+ server:
+ modules:
+ - proxy
+ - proxy_http
+ - headers
+ enabled: true
+ site:
+ apache_proxy_openstack_api_designate:
+ enabled: true
+ type: proxy
+ name: openstack_api_designate
+ proxy:
+ host: ${_param:apache_proxy_openstack_designate_host}
+ port: 9001
+ protocol: http
+ host:
+ name: ${_param:apache_proxy_openstack_api_host}
+ port: 9001
+ address: ${_param:apache_proxy_openstack_api_address}
+ ssl: ${_param:apache_proxy_ssl}
diff --git a/apache/server/proxy/openstack/glance.yml b/apache/server/proxy/openstack/glance.yml
new file mode 100644
index 0000000..91bedea
--- /dev/null
+++ b/apache/server/proxy/openstack/glance.yml
@@ -0,0 +1,24 @@
+parameters:
+ _param:
+ apache_proxy_ssl:
+ enabled: false
+ apache_proxy_openstack_api_host: ${_param:cluster_public_host}
+ apache_proxy_openstack_api_address: 0.0.0.0
+ apache_proxy_openstack_glance_host: ${_param:glance_service_host}
+ apache:
+ server:
+ enabled: true
+ site:
+ apache_proxy_openstack_api_glance:
+ enabled: true
+ type: proxy
+ name: openstack_api_glance
+ proxy:
+ host: ${_param:apache_proxy_openstack_glance_host}
+ port: 9292
+ protocol: http
+ host:
+ name: ${_param:apache_proxy_openstack_api_host}
+ port: 9292
+ address: ${_param:apache_proxy_openstack_api_address}
+ ssl: ${_param:apache_proxy_ssl}
diff --git a/apache/server/proxy/openstack/heat.yml b/apache/server/proxy/openstack/heat.yml
new file mode 100644
index 0000000..b844c45
--- /dev/null
+++ b/apache/server/proxy/openstack/heat.yml
@@ -0,0 +1,52 @@
+parameters:
+ _param:
+ apache_proxy_ssl:
+ enabled: false
+ apache_proxy_openstack_api_host: ${_param:cluster_public_host}
+ apache_proxy_openstack_api_address: 0.0.0.0
+ apache_proxy_openstack_heat_host: ${_param:heat_service_host}
+ apache:
+ server:
+ site:
+ apache_proxy_openstack_api_heat:
+ enabled: true
+ type: proxy
+ name: openstack_api_heat
+ check: false
+ proxy:
+ host: ${_param:apache_proxy_openstack_heat_host}
+ port: 8004
+ protocol: http
+ host:
+ name: ${_param:apache_proxy_openstack_api_host}
+ port: 8004
+ address: ${_param:apache_proxy_openstack_api_address}
+ ssl: ${_param:apache_proxy_ssl}
+ apache_proxy_openstack_api_heat_cfn:
+ enabled: true
+ type: proxy
+ name: openstack_api_heat_cfn
+ check: false
+ proxy:
+ host: ${_param:apache_proxy_openstack_heat_host}
+ port: 8000
+ protocol: http
+ host:
+ name: ${_param:apache_proxy_openstack_api_host}
+ port: 8000
+ address: ${_param:apache_proxy_openstack_api_address}
+ ssl: ${_param:apache_proxy_ssl}
+ apache_proxy_openstack_api_heat_cloudwatch:
+ enabled: true
+ type: proxy
+ name: openstack_api_heat_cloudwatch
+ check: false
+ proxy:
+ host: ${_param:apache_proxy_openstack_heat_host}
+ port: 8003
+ protocol: http
+ host:
+ name: ${_param:apache_proxy_openstack_api_host}
+ port: 8003
+ address: ${_param:apache_proxy_openstack_api_address}
+ ssl: ${_param:apache_proxy_ssl}
diff --git a/apache/server/proxy/openstack/neutron.yml b/apache/server/proxy/openstack/neutron.yml
new file mode 100644
index 0000000..dd18c40
--- /dev/null
+++ b/apache/server/proxy/openstack/neutron.yml
@@ -0,0 +1,24 @@
+parameters:
+ _param:
+ apache_proxy_ssl:
+ enabled: false
+ apache_proxy_openstack_api_host: ${_param:cluster_public_host}
+ apache_proxy_openstack_api_address: 0.0.0.0
+ apache_proxy_openstack_neutron_host: ${_param:neutron_service_host}
+ apache:
+ server:
+ site:
+ apache_proxy_openstack_api_neutron:
+ enabled: true
+ type: proxy
+ name: openstack_api_neutron
+ check: false
+ proxy:
+ host: ${_param:apache_proxy_openstack_neutron_host}
+ port: 9696
+ protocol: http
+ host:
+ name: ${_param:apache_proxy_openstack_api_host}
+ port: 9696
+ address: ${_param:apache_proxy_openstack_api_address}
+ ssl: ${_param:apache_proxy_ssl}
diff --git a/apache/server/proxy/openstack/nova.yml b/apache/server/proxy/openstack/nova.yml
new file mode 100644
index 0000000..66a0107
--- /dev/null
+++ b/apache/server/proxy/openstack/nova.yml
@@ -0,0 +1,24 @@
+parameters:
+ _param:
+ apache_proxy_ssl:
+ enabled: false
+ apache_proxy_openstack_api_host: ${_param:cluster_public_host}
+ apache_proxy_openstack_api_address: 0.0.0.0
+ apache_proxy_openstack_nova_host: ${_param:nova_service_host}
+ apache:
+ server:
+ site:
+ apache_proxy_openstack_api_nova:
+ enabled: true
+ type: proxy
+ name: openstack_api_nova
+ check: false
+ proxy:
+ host: ${_param:apache_proxy_openstack_nova_host}
+ port: 8774
+ protocol: http
+ host:
+ name: ${_param:apache_proxy_openstack_api_host}
+ port: 8774
+ address: ${_param:apache_proxy_openstack_api_address}
+ ssl: ${_param:apache_proxy_ssl}
diff --git a/apache/server/proxy/openstack/placement.yml b/apache/server/proxy/openstack/placement.yml
new file mode 100644
index 0000000..9e256b2
--- /dev/null
+++ b/apache/server/proxy/openstack/placement.yml
@@ -0,0 +1,25 @@
+parameters:
+ _param:
+ apache_proxy_ssl:
+ enabled: false
+ placement_service_host: ${_param:nova_service_host}
+ apache_proxy_openstack_api_host: ${_param:cluster_public_host}
+ apache_proxy_openstack_api_address: 0.0.0.0
+ apache_proxy_openstack_placement_host: ${_param:placement_service_host}
+ apache:
+ server:
+ site:
+ apache_proxy_openstack_api_placement:
+ enabled: true
+ type: proxy
+ name: openstack_api_placement
+ check: false
+ proxy:
+ host: ${_param:apache_proxy_openstack_placement_host}
+ port: 8778
+ protocol: http
+ host:
+ name: ${_param:apache_proxy_openstack_api_host}
+ port: 8778
+ address: ${_param:apache_proxy_openstack_api_address}
+ ssl: ${_param:apache_proxy_ssl}
diff --git a/apache/server/site/barbican.yml b/apache/server/site/barbican.yml
new file mode 100644
index 0000000..78c9f02
--- /dev/null
+++ b/apache/server/site/barbican.yml
@@ -0,0 +1,50 @@
+parameters:
+ _param:
+ apache_barbican_ssl:
+ enabled: false
+ apache_barbican_api_address: 0.0.0.0
+ apache_barbican_api_host: ${linux:network:fqdn}
+ apache:
+ server:
+ enabled: true
+ site:
+ barbican:
+ enabled: false
+ available: true
+ type: wsgi
+ name: barbican
+ ssl: ${_param:apache_barbican_ssl}
+ wsgi:
+ daemon_process: barbican-api
+ processes: 3
+ threads: 10
+ user: barbican
+ group: barbican
+ display_name: '%{GROUP}'
+ script_alias: '/ /usr/bin/barbican-wsgi-api'
+ application_group: '%{GLOBAL}'
+ authorization: 'On'
+ host:
+ address: ${_param:apache_barbican_api_address}
+ name: ${_param:apache_barbican_api_host}
+ port: 9311
+ log:
+ custom:
+ format: >-
+ %v:%p %{X-Forwarded-For}i %h %l %u %t \"%r\" %>s %D %O \"%{Referer}i\" \"%{User-Agent}i\"
+ error:
+ enabled: true
+ format: '%M'
+ barbican_admin:
+ enabled: false
+ available: true
+ type: wsgi
+ name: barbican_admin
+ ssl: ${_param:apache_barbican_ssl}
+ wsgi:
+ daemon_process: barbican-api-admin
+ processes: 3
+ threads: 10
+ user: barbican
+ group: barbican
+ display_name: '%{GROUP}'
diff --git a/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/ceph.yml b/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/ceph.yml
index dd6ba6a..d997485 100644
--- a/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/ceph.yml
+++ b/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/ceph.yml
@@ -1,11 +1,11 @@
parameters:
_param:
apt_mk_version: stable
- mirror_mirantis_openstack_xenial_ceph_source: http://mirror.mirantis.com/${_param:apt_mk_version}/ceph-luminous/
- mirror_mirantis_openstack_xenial_ceph_distribution: xenial
- mirror_mirantis_openstack_xenial_ceph_components: main
+ mirror_mirantis_openstack_xenial_ceph_source: http://apt.mirantis.com/xenial/
+ mirror_mirantis_openstack_xenial_ceph_distribution: ${_param:apt_mk_version}
+ mirror_mirantis_openstack_xenial_ceph_components: ceph-luminous
mirror_mirantis_openstack_xenial_ceph_gpgkeys:
- - 460F3994
+ - A76882D3
aptly:
server:
mirror:
diff --git a/ceilometer/agent/polling/default.yml b/ceilometer/agent/polling/default.yml
new file mode 100644
index 0000000..47b2d1d
--- /dev/null
+++ b/ceilometer/agent/polling/default.yml
@@ -0,0 +1,8 @@
+parameters:
+ ceilometer:
+ agent:
+ polling:
+ sources:
+ default_pollsters:
+ meters: ${_param:ceilometer_agent_default_polling_meters}
+ interval: ${_param:ceilometer_agent_default_polling_interval}
\ No newline at end of file
diff --git a/ceilometer/server/backend/default.yml b/ceilometer/server/backend/default.yml
new file mode 100644
index 0000000..8842e11
--- /dev/null
+++ b/ceilometer/server/backend/default.yml
@@ -0,0 +1,12 @@
+classes:
+- service.ceilometer.server.publisher.gnocchi
+- service.ceilometer.server.publisher.panko
+parameters:
+ # gnocchi and panko are default backends for Ceilometer since Pike
+ # they are incompatible with any legacy database publisher backends
+ ceilometer:
+ server:
+ database: ~
+ publisher:
+ default:
+ enabled: false
diff --git a/ceilometer/server/coordination/redis.yml b/ceilometer/server/coordination/redis.yml
index e013e0f..e8610f3 100644
--- a/ceilometer/server/coordination/redis.yml
+++ b/ceilometer/server/coordination/redis.yml
@@ -1,7 +1,7 @@
classes:
- service.redis.server.single
parameters:
- aodh:
+ ceilometer:
server:
coordination_backend:
url: redis://${_param:single_address}:6379/${_param:cluster_node01_address}
diff --git a/debmirror/mirror_mirantis_com/ubuntu/xenial.yml b/debmirror/mirror_mirantis_com/ubuntu/xenial.yml
index 73047b2..ba4e945 100644
--- a/debmirror/mirror_mirantis_com/ubuntu/xenial.yml
+++ b/debmirror/mirror_mirantis_com/ubuntu/xenial.yml
@@ -14,7 +14,7 @@
arch: [ 'amd64' ]
mirror_host: "mirror.mirantis.com"
mirror_root: ":mirror/${_param:apt_mk_version}/ubuntu/"
- target_dir: "/srv/aptly/public/ubuntu/"
+ target_dir: "/srv/volumes/aptly/public/ubuntu/"
log_file: "/var/log/debmirror/mirror_mirantis_com_ubuntu_xenial.log"
dist: [ xenial , xenial-security, xenial-updates ]
section: [ main , multiverse, restricted, universe ]
diff --git a/docker/swarm/stack/monitoring/alertmanager.yml b/docker/swarm/stack/monitoring/alertmanager.yml
new file mode 100644
index 0000000..662baf4
--- /dev/null
+++ b/docker/swarm/stack/monitoring/alertmanager.yml
@@ -0,0 +1,37 @@
+classes:
+- system.prometheus.alertmanager.container
+parameters:
+ docker:
+ client:
+ stack:
+ monitoring:
+ network:
+ monitoring:
+ driver: overlay
+ driver_opts:
+ encrypted: 1
+ service:
+ alertmanager:
+ networks:
+ - monitoring
+ deploy:
+ replicas: 2
+ labels:
+ com.mirantis.monitoring: "alertmanager"
+ restart_policy:
+ condition: any
+ labels:
+ com.mirantis.monitoring: "alertmanager"
+ image: ${_param:docker_image_alertmanager}
+ ports:
+ - 15011:${prometheus:alertmanager:bind:port}
+ volumes:
+ - ${prometheus:alertmanager:dir:config}:${_param:prometheus_alertmanager_config_directory}
+ - ${prometheus:alertmanager:dir:data}:${_param:prometheus_alertmanager_data_directory}
+ environment:
+ ALERTMANAGER_CONFIG_DIR: ${_param:prometheus_alertmanager_config_directory}
+ ALERTMANAGER_DATA_DIR: ${_param:prometheus_alertmanager_data_directory}
+ ALERTMANAGER_BIND_PORT: ${prometheus:alertmanager:bind:port}
+ ALERTMANAGER_BIND_ADDRESS: ${prometheus:alertmanager:bind:address}
+ ALERTMANAGER_DISCOVERY_DOMAIN: 'monitoring_alertmanager'
+ ALERTMANAGER_EXTERNAL_URL: "http://${_param:stacklight_monitor_address}:15011"
diff --git a/docker/swarm/stack/monitoring/init.yml b/docker/swarm/stack/monitoring/init.yml
index 57d7a5a..134efdc 100644
--- a/docker/swarm/stack/monitoring/init.yml
+++ b/docker/swarm/stack/monitoring/init.yml
@@ -1,131 +1,8 @@
classes:
-- system.prometheus.alertmanager.container
-- system.prometheus.pushgateway.container
-- system.prometheus.remote_storage_adapter.container
-- system.prometheus.server.container
+- system.docker.swarm.stack.monitoring.prometheus
+- system.docker.swarm.stack.monitoring.prometheus.replicated
+- system.docker.swarm.stack.monitoring.alertmanager
+- system.docker.swarm.stack.monitoring.prometheus_relay
+- system.docker.swarm.stack.monitoring.pushgateway
- system.docker.swarm.stack.monitoring.remote_agent
-parameters:
- _param:
- # Backward compatibility for Prometheus 1.7
- prometheus_storage_local_engine: "persisted"
- prometheus_storage_heap_size: 3221225472
- prometheus_storage_num_fingerprint_mutexes: 4096
-
- docker:
- client:
- stack:
- monitoring:
- network:
- monitoring:
- driver: overlay
- driver_opts:
- encrypted: 1
- service:
- relay:
- networks:
- - monitoring
- deploy:
- replicas: 2
- labels:
- com.mirantis.monitoring: "relay"
- restart_policy:
- condition: any
- labels:
- com.mirantis.monitoring: "relay"
- image: ${_param:docker_image_prometheus_relay}
- ports:
- - 15016:8080
- environment:
- PROMETHEUS_RELAY_DNS: 'tasks.monitoring_server'
- remote_storage_adapter:
- networks:
- - monitoring
- deploy:
- replicas: 1
- labels:
- com.mirantis.monitoring: "remote_storage_adapter"
- restart_policy:
- condition: any
- labels:
- com.mirantis.monitoring: "remote_storage_adapter"
- image: ${_param:docker_image_remote_storage_adapter}
- ports:
- - 15015:${prometheus:remote_storage_adapter:bind:port}
- environment:
- RSA_BIND_PORT: ${prometheus:remote_storage_adapter:bind:port}
- RSA_BIND_ADDRESS: ${prometheus:remote_storage_adapter:bind:address}
- RSA_INFLUXDB_RETENTION_POLICY: 'lma'
- RSA_INFLUXDB_URL: ${_param:prometheus_influxdb_url}
- RSA_INFLUXDB_DB: ${_param:prometheus_influxdb_db}
- RSA_INFLUXDB_USERNAME: ${_param:prometheus_influxdb_username}
- RSA_INFLUXDB_PASSWORD: ${_param:prometheus_influxdb_password}
- alertmanager:
- networks:
- - monitoring
- deploy:
- replicas: 2
- labels:
- com.mirantis.monitoring: "alertmanager"
- restart_policy:
- condition: any
- labels:
- com.mirantis.monitoring: "alertmanager"
- image: ${_param:docker_image_alertmanager}
- ports:
- - 15011:${prometheus:alertmanager:bind:port}
- volumes:
- - ${prometheus:alertmanager:dir:config}:${_param:prometheus_alertmanager_config_directory}
- - ${prometheus:alertmanager:dir:data}:${_param:prometheus_alertmanager_data_directory}
- environment:
- ALERTMANAGER_CONFIG_DIR: ${_param:prometheus_alertmanager_config_directory}
- ALERTMANAGER_DATA_DIR: ${_param:prometheus_alertmanager_data_directory}
- ALERTMANAGER_BIND_PORT: ${prometheus:alertmanager:bind:port}
- ALERTMANAGER_BIND_ADDRESS: ${prometheus:alertmanager:bind:address}
- ALERTMANAGER_DISCOVERY_DOMAIN: 'monitoring_alertmanager'
- ALERTMANAGER_EXTERNAL_URL: "http://${_param:stacklight_monitor_address}:15011"
- pushgateway:
- networks:
- - monitoring
- deploy:
- replicas: 2
- labels:
- com.mirantis.monitoring: "pushgateway"
- restart_policy:
- condition: any
- environment:
- PUSHGATEWAY_BIND_PORT: ${prometheus:pushgateway:bind:port}
- PUSHGATEWAY_BIND_ADDRESS: ${prometheus:pushgateway:bind:address}
- labels:
- com.mirantis.monitoring: "pushgateway"
- image: ${_param:docker_image_pushgateway}
- ports:
- - 15012:${prometheus:pushgateway:bind:port}
- server:
- networks:
- - monitoring
- deploy:
- replicas: 2
- labels:
- com.mirantis.monitoring: "prometheus"
- restart_policy:
- condition: any
- labels:
- com.mirantis.monitoring: "prometheus"
- image: ${_param:docker_image_prometheus}
- ports:
- - 15010:${prometheus:server:bind:port}
- volumes:
- - ${prometheus:server:dir:config}:${_param:prometheus_server_config_directory}
- - ${prometheus:server:dir:data}:${_param:prometheus_server_data_directory}
- environment:
- PROMETHEUS_CONFIG_DIR: ${_param:prometheus_server_config_directory}
- PROMETHEUS_DATA_DIR: ${_param:prometheus_server_data_directory}
- PROMETHEUS_BIND_PORT: ${prometheus:server:bind:port}
- PROMETHEUS_BIND_ADDRESS: ${prometheus:server:bind:address}
- PROMETHEUS_STORAGE_LOCAL_RETENTION: ${prometheus:server:storage:local:retention}
- PROMETHEUS_EXTERNAL_URL: "http://${_param:stacklight_monitor_address}:15010"
- # Backward compatibility for Prometheus 1.7
- PROMETHEUS_STORAGE_LOCAL_ENGINE: ${_param:prometheus_storage_local_engine}
- PROMETHEUS_STORAGE_LOCAL_TARGET_HEAP_SIZE: ${_param:prometheus_storage_heap_size}
- PROMETHEUS_STORAGE_LOCAL_NUM_FINGERPRINT_MUTEXES: ${_param:prometheus_storage_num_fingerprint_mutexes}
-
\ No newline at end of file
+- system.docker.swarm.stack.monitoring.remote_storage_adapter
diff --git a/docker/swarm/stack/monitoring/prometheus/global.yml b/docker/swarm/stack/monitoring/prometheus/global.yml
new file mode 100644
index 0000000..d86f456
--- /dev/null
+++ b/docker/swarm/stack/monitoring/prometheus/global.yml
@@ -0,0 +1,9 @@
+parameters:
+ docker:
+ client:
+ stack:
+ monitoring:
+ service:
+ server:
+ deploy:
+ mode: global
diff --git a/docker/swarm/stack/monitoring/prometheus/init.yml b/docker/swarm/stack/monitoring/prometheus/init.yml
new file mode 100644
index 0000000..2d455f7
--- /dev/null
+++ b/docker/swarm/stack/monitoring/prometheus/init.yml
@@ -0,0 +1,45 @@
+classes:
+- system.prometheus.server.container
+parameters:
+ _param:
+ # Backward compatibility for Prometheus 1.7
+ prometheus_storage_local_engine: "persisted"
+ prometheus_storage_heap_size: 3221225472
+ prometheus_storage_num_fingerprint_mutexes: 4096
+ docker:
+ client:
+ stack:
+ monitoring:
+ network:
+ monitoring:
+ driver: overlay
+ driver_opts:
+ encrypted: 1
+ service:
+ server:
+ networks:
+ - monitoring
+ deploy:
+ labels:
+ com.mirantis.monitoring: "prometheus"
+ restart_policy:
+ condition: any
+ labels:
+ com.mirantis.monitoring: "prometheus"
+ image: ${_param:docker_image_prometheus}
+ ports:
+ - 15010:${prometheus:server:bind:port}
+ volumes:
+ - ${prometheus:server:dir:config}:${_param:prometheus_server_config_directory}
+ - ${prometheus:server:dir:data}:${_param:prometheus_server_data_directory}
+ environment:
+ PROMETHEUS_CONFIG_DIR: ${_param:prometheus_server_config_directory}
+ PROMETHEUS_DATA_DIR: ${_param:prometheus_server_data_directory}
+ PROMETHEUS_BIND_PORT: ${prometheus:server:bind:port}
+ PROMETHEUS_BIND_ADDRESS: ${prometheus:server:bind:address}
+ PROMETHEUS_STORAGE_LOCAL_RETENTION: ${prometheus:server:storage:local:retention}
+ PROMETHEUS_EXTERNAL_URL: "http://${_param:stacklight_monitor_address}:15010"
+ # Backward compatibility for Prometheus 1.7
+ PROMETHEUS_STORAGE_LOCAL_ENGINE: ${_param:prometheus_storage_local_engine}
+ PROMETHEUS_STORAGE_LOCAL_TARGET_HEAP_SIZE: ${_param:prometheus_storage_heap_size}
+ PROMETHEUS_STORAGE_LOCAL_NUM_FINGERPRINT_MUTEXES: ${_param:prometheus_storage_num_fingerprint_mutexes}
diff --git a/docker/swarm/stack/monitoring/prometheus/replicated.yml b/docker/swarm/stack/monitoring/prometheus/replicated.yml
new file mode 100644
index 0000000..c201172
--- /dev/null
+++ b/docker/swarm/stack/monitoring/prometheus/replicated.yml
@@ -0,0 +1,9 @@
+parameters:
+ docker:
+ client:
+ stack:
+ monitoring:
+ service:
+ server:
+ deploy:
+ replicas: 2
diff --git a/docker/swarm/stack/monitoring/prometheus_global.yml b/docker/swarm/stack/monitoring/prometheus_global.yml
index 9745638..6d8e4ba 100644
--- a/docker/swarm/stack/monitoring/prometheus_global.yml
+++ b/docker/swarm/stack/monitoring/prometheus_global.yml
@@ -1,131 +1,8 @@
classes:
-- system.prometheus.alertmanager.container
-- system.prometheus.pushgateway.container
-- system.prometheus.remote_storage_adapter.container
-- system.prometheus.server.container
+- system.docker.swarm.stack.monitoring.prometheus
+- system.docker.swarm.stack.monitoring.prometheus.global
+- system.docker.swarm.stack.monitoring.alertmanager
+- system.docker.swarm.stack.monitoring.prometheus_relay
+- system.docker.swarm.stack.monitoring.pushgateway
- system.docker.swarm.stack.monitoring.remote_agent
-parameters:
- _param:
- # Backward compatibility for Prometheus 1.7
- prometheus_storage_local_engine: "persisted"
- prometheus_storage_heap_size: 3221225472
- prometheus_storage_num_fingerprint_mutexes: 4096
-
- docker:
- client:
- stack:
- monitoring:
- network:
- monitoring:
- driver: overlay
- driver_opts:
- encrypted: 1
- service:
- relay:
- networks:
- - monitoring
- deploy:
- replicas: 2
- labels:
- com.mirantis.monitoring: "relay"
- restart_policy:
- condition: any
- labels:
- com.mirantis.monitoring: "relay"
- image: ${_param:docker_image_prometheus_relay}
- ports:
- - 15016:8080
- environment:
- PROMETHEUS_RELAY_DNS: 'tasks.monitoring_server'
- remote_storage_adapter:
- networks:
- - monitoring
- deploy:
- replicas: 1
- labels:
- com.mirantis.monitoring: "remote_storage_adapter"
- restart_policy:
- condition: any
- labels:
- com.mirantis.monitoring: "remote_storage_adapter"
- image: ${_param:docker_image_remote_storage_adapter}
- ports:
- - 15015:${prometheus:remote_storage_adapter:bind:port}
- environment:
- RSA_BIND_PORT: ${prometheus:remote_storage_adapter:bind:port}
- RSA_BIND_ADDRESS: ${prometheus:remote_storage_adapter:bind:address}
- RSA_INFLUXDB_RETENTION_POLICY: 'lma'
- RSA_INFLUXDB_URL: ${_param:prometheus_influxdb_url}
- RSA_INFLUXDB_DB: ${_param:prometheus_influxdb_db}
- RSA_INFLUXDB_USERNAME: ${_param:prometheus_influxdb_username}
- RSA_INFLUXDB_PASSWORD: ${_param:prometheus_influxdb_password}
- alertmanager:
- networks:
- - monitoring
- deploy:
- replicas: 2
- labels:
- com.mirantis.monitoring: "alertmanager"
- restart_policy:
- condition: any
- labels:
- com.mirantis.monitoring: "alertmanager"
- image: ${_param:docker_image_alertmanager}
- ports:
- - 15011:${prometheus:alertmanager:bind:port}
- volumes:
- - ${prometheus:alertmanager:dir:config}:${_param:prometheus_alertmanager_config_directory}
- - ${prometheus:alertmanager:dir:data}:${_param:prometheus_alertmanager_data_directory}
- environment:
- ALERTMANAGER_CONFIG_DIR: ${_param:prometheus_alertmanager_config_directory}
- ALERTMANAGER_DATA_DIR: ${_param:prometheus_alertmanager_data_directory}
- ALERTMANAGER_BIND_PORT: ${prometheus:alertmanager:bind:port}
- ALERTMANAGER_BIND_ADDRESS: ${prometheus:alertmanager:bind:address}
- ALERTMANAGER_DISCOVERY_DOMAIN: 'monitoring_alertmanager'
- ALERTMANAGER_EXTERNAL_URL: "http://${_param:stacklight_monitor_address}:15011"
- pushgateway:
- networks:
- - monitoring
- deploy:
- replicas: 2
- labels:
- com.mirantis.monitoring: "pushgateway"
- restart_policy:
- condition: any
- environment:
- PUSHGATEWAY_BIND_PORT: ${prometheus:pushgateway:bind:port}
- PUSHGATEWAY_BIND_ADDRESS: ${prometheus:pushgateway:bind:address}
- labels:
- com.mirantis.monitoring: "pushgateway"
- image: ${_param:docker_image_pushgateway}
- ports:
- - 15012:${prometheus:pushgateway:bind:port}
- server:
- networks:
- - monitoring
- deploy:
- mode: global
- labels:
- com.mirantis.monitoring: "prometheus"
- restart_policy:
- condition: any
- labels:
- com.mirantis.monitoring: "prometheus"
- image: ${_param:docker_image_prometheus}
- ports:
- - 15010:${prometheus:server:bind:port}
- volumes:
- - ${prometheus:server:dir:config}:${_param:prometheus_server_config_directory}
- - ${prometheus:server:dir:data}:${_param:prometheus_server_data_directory}
- environment:
- PROMETHEUS_CONFIG_DIR: ${_param:prometheus_server_config_directory}
- PROMETHEUS_DATA_DIR: ${_param:prometheus_server_data_directory}
- PROMETHEUS_BIND_PORT: ${prometheus:server:bind:port}
- PROMETHEUS_BIND_ADDRESS: ${prometheus:server:bind:address}
- PROMETHEUS_STORAGE_LOCAL_RETENTION: ${prometheus:server:storage:local:retention}
- PROMETHEUS_EXTERNAL_URL: "http://${_param:stacklight_monitor_address}:15010"
- # Backward compatibility for Prometheus 1.7
- PROMETHEUS_STORAGE_LOCAL_ENGINE: ${_param:prometheus_storage_local_engine}
- PROMETHEUS_STORAGE_LOCAL_TARGET_HEAP_SIZE: ${_param:prometheus_storage_heap_size}
- PROMETHEUS_STORAGE_LOCAL_NUM_FINGERPRINT_MUTEXES: ${_param:prometheus_storage_num_fingerprint_mutexes}
- PROMETHEUS_USE_STATIC_DATADIR: "true"
+- system.docker.swarm.stack.monitoring.remote_storage_adapter
diff --git a/docker/swarm/stack/monitoring/prometheus_relay.yml b/docker/swarm/stack/monitoring/prometheus_relay.yml
new file mode 100644
index 0000000..315ba1d
--- /dev/null
+++ b/docker/swarm/stack/monitoring/prometheus_relay.yml
@@ -0,0 +1,27 @@
+parameters:
+ docker:
+ client:
+ stack:
+ monitoring:
+ network:
+ monitoring:
+ driver: overlay
+ driver_opts:
+ encrypted: 1
+ service:
+ relay:
+ networks:
+ - monitoring
+ deploy:
+ replicas: 2
+ labels:
+ com.mirantis.monitoring: "relay"
+ restart_policy:
+ condition: any
+ labels:
+ com.mirantis.monitoring: "relay"
+ image: ${_param:docker_image_prometheus_relay}
+ ports:
+ - 15016:8080
+ environment:
+ PROMETHEUS_RELAY_DNS: 'tasks.monitoring_server'
diff --git a/docker/swarm/stack/monitoring/pushgateway.yml b/docker/swarm/stack/monitoring/pushgateway.yml
new file mode 100644
index 0000000..af108a6
--- /dev/null
+++ b/docker/swarm/stack/monitoring/pushgateway.yml
@@ -0,0 +1,30 @@
+classes:
+- system.prometheus.pushgateway.container
+parameters:
+ docker:
+ client:
+ stack:
+ monitoring:
+ network:
+ monitoring:
+ driver: overlay
+ driver_opts:
+ encrypted: 1
+ service:
+ pushgateway:
+ networks:
+ - monitoring
+ deploy:
+ replicas: 2
+ labels:
+ com.mirantis.monitoring: "pushgateway"
+ restart_policy:
+ condition: any
+ environment:
+ PUSHGATEWAY_BIND_PORT: ${prometheus:pushgateway:bind:port}
+ PUSHGATEWAY_BIND_ADDRESS: ${prometheus:pushgateway:bind:address}
+ labels:
+ com.mirantis.monitoring: "pushgateway"
+ image: ${_param:docker_image_pushgateway}
+ ports:
+ - 15012:${prometheus:pushgateway:bind:port}
diff --git a/docker/swarm/stack/monitoring/remote_storage_adapter.yml b/docker/swarm/stack/monitoring/remote_storage_adapter.yml
new file mode 100644
index 0000000..04ffb90
--- /dev/null
+++ b/docker/swarm/stack/monitoring/remote_storage_adapter.yml
@@ -0,0 +1,35 @@
+classes:
+- system.prometheus.remote_storage_adapter.container
+parameters:
+ docker:
+ client:
+ stack:
+ monitoring:
+ network:
+ monitoring:
+ driver: overlay
+ driver_opts:
+ encrypted: 1
+ service:
+ remote_storage_adapter:
+ networks:
+ - monitoring
+ deploy:
+ replicas: 1
+ labels:
+ com.mirantis.monitoring: "remote_storage_adapter"
+ restart_policy:
+ condition: any
+ labels:
+ com.mirantis.monitoring: "remote_storage_adapter"
+ image: ${_param:docker_image_remote_storage_adapter}
+ ports:
+ - 15015:${prometheus:remote_storage_adapter:bind:port}
+ environment:
+ RSA_BIND_PORT: ${prometheus:remote_storage_adapter:bind:port}
+ RSA_BIND_ADDRESS: ${prometheus:remote_storage_adapter:bind:address}
+ RSA_INFLUXDB_RETENTION_POLICY: 'lma'
+ RSA_INFLUXDB_URL: ${_param:prometheus_influxdb_url}
+ RSA_INFLUXDB_DB: ${_param:prometheus_influxdb_db}
+ RSA_INFLUXDB_USERNAME: ${_param:prometheus_influxdb_username}
+ RSA_INFLUXDB_PASSWORD: ${_param:prometheus_influxdb_password}
diff --git a/fluentd/label/default_output/elasticsearch.yml b/fluentd/label/default_output/elasticsearch.yml
index 3c26d15..84b2dc1 100644
--- a/fluentd/label/default_output/elasticsearch.yml
+++ b/fluentd/label/default_output/elasticsearch.yml
@@ -9,6 +9,19 @@
config:
label:
default_output:
+ filter:
+ drop_nested_timestamp_and_sensitive_data:
+ tag: "openstack.**"
+ type: record_transformer
+ enable_ruby: true
+ remove_keys: '["_dummy_1", "_dummy_2", "_dummy_3"]'
+ record:
+ - name: _dummy_1
+ value: ${fluentd:dollar}{if record.has_key?("context"); record["context"].delete("timestamp") ; end; nil }
+ - name: _dummy_2
+ value: ${fluentd:dollar}{if record.has_key?("context"); record["context"].delete("auth_token"); end; nil}
+ - name: _dummy_3
+ value: ${fluentd:dollar}{if record.has_key?("context"); record["context"].delete("auth_token_info"); end; nil}
match:
elasticsearch_output:
host: ${_param:fluentd_elasticsearch_host}
diff --git a/glusterfs/client/volume/backup.yml b/glusterfs/client/volume/backup.yml
new file mode 100644
index 0000000..eded1ac
--- /dev/null
+++ b/glusterfs/client/volume/backup.yml
@@ -0,0 +1,13 @@
+parameters:
+ _param:
+ backup_glusterfs_service_host: ${_param:glusterfs_service_host}
+ glusterfs_node01_address: ${_param:cluster_node01_address}
+ glusterfs_node02_address: ${_param:cluster_node02_address}
+ glusterfs_node03_address: ${_param:cluster_node03_address}
+ glusterfs:
+ client:
+ volumes:
+ backup:
+ path: /srv/volumes/backup
+ server: ${_param:backup_glusterfs_service_host}
+ opts: "defaults,backup-volfile-servers=${_param:glusterfs_node01_address}:${_param:glusterfs_node02_address}:${_param:glusterfs_node03_address}"
diff --git a/glusterfs/server/volume/backup.yml b/glusterfs/server/volume/backup.yml
new file mode 100644
index 0000000..22e59e2
--- /dev/null
+++ b/glusterfs/server/volume/backup.yml
@@ -0,0 +1,18 @@
+parameters:
+ glusterfs:
+ server:
+ volumes:
+ backup:
+ storage: /srv/glusterfs/backup
+ replica: 3
+ bricks:
+ - ${_param:cluster_node01_address}:/srv/glusterfs/backup
+ - ${_param:cluster_node02_address}:/srv/glusterfs/backup
+ - ${_param:cluster_node03_address}:/srv/glusterfs/backup
+ options:
+ cluster.readdir-optimize: On
+ nfs.disable: On
+ network.remote-dio: On
+ diagnostics.client-log-level: WARNING
+ diagnostics.brick-log-level: WARNING
+ cluster.favorite-child-policy: mtime
diff --git a/haproxy/proxy/listen/openstack/placement.yml b/haproxy/proxy/listen/openstack/placement.yml
new file mode 100644
index 0000000..f3b2b99
--- /dev/null
+++ b/haproxy/proxy/listen/openstack/placement.yml
@@ -0,0 +1,26 @@
+# Starting with Nova (17.0.0) Queens - accessing to / of placement service
+# returns 200 with version data instead of 401 as it was before.
+# This file should be included for nova/placement higher than Queens.
+parameters:
+ haproxy:
+ proxy:
+ listen:
+ placement_api:
+ type: openstack-service
+ service_name: placement
+ binds:
+ - address: ${_param:cluster_vip_address}
+ port: 8778
+ servers:
+ - name: ${_param:cluster_node01_hostname}
+ host: ${_param:cluster_node01_address}
+ port: 8778
+ params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3
+ - name: ${_param:cluster_node02_hostname}
+ host: ${_param:cluster_node02_address}
+ port: 8778
+ params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3
+ - name: ${_param:cluster_node03_hostname}
+ host: ${_param:cluster_node03_address}
+ port: 8778
+ params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3
diff --git a/heat/server/resource/networking_bgpvpn.yml b/heat/server/resource/networking_bgpvpn.yml
new file mode 100644
index 0000000..4fbd851
--- /dev/null
+++ b/heat/server/resource/networking_bgpvpn.yml
@@ -0,0 +1,11 @@
+parameters:
+ linux:
+ system:
+ package:
+ python-networking-bgpvpn:
+ version: latest
+ heat:
+ server:
+ dir:
+ plugins:
+ - /usr/lib/python2.7/dist-packages/networking_bgpvpn_heat
\ No newline at end of file
diff --git a/horizon/server/plugin/neutron_bgpvpn.yml b/horizon/server/plugin/neutron_bgpvpn.yml
new file mode 100644
index 0000000..7ad75ff
--- /dev/null
+++ b/horizon/server/plugin/neutron_bgpvpn.yml
@@ -0,0 +1,8 @@
+parameters:
+ horizon:
+ server:
+ plugin:
+ bgpvpn:
+ source:
+ engine: pkg
+ name: python-networking-bgpvpn
diff --git a/jenkins/client/job/debian/packages/extra.yml b/jenkins/client/job/debian/packages/extra.yml
index 61d7ee2..0a21a55 100644
--- a/jenkins/client/job/debian/packages/extra.yml
+++ b/jenkins/client/job/debian/packages/extra.yml
@@ -205,6 +205,10 @@
dist: xenial
build: pipeline
branch: debian/xenial
+ - package: python-backports.ssl-match-hostname
+ dist: xenial
+ build: pipeline
+ branch: debian/xenial
template:
type: workflow-scm
concurrent: false
diff --git a/jenkins/client/job/debian/packages/salt.yml b/jenkins/client/job/debian/packages/salt.yml
index 6089195..6230530 100644
--- a/jenkins/client/job/debian/packages/salt.yml
+++ b/jenkins/client/job/debian/packages/salt.yml
@@ -242,6 +242,9 @@
- name: openvstorage
upload_source_package: false
dist: trusty
+ - name: oslo-templates
+ upload_source_package: false
+ dist: trusty
- name: owncloud
upload_source_package: false
dist: trusty
@@ -581,6 +584,9 @@
- name: openvstorage
upload_source_package: true
dist: xenial
+ - name: oslo-templates
+ upload_source_package: true
+ dist: xenial
- name: owncloud
upload_source_package: true
dist: xenial
diff --git a/jenkins/client/job/deploy/lab/component/aaa.yml b/jenkins/client/job/deploy/lab/component/aaa.yml
index 1c640d5..26a66fd 100644
--- a/jenkins/client/job/deploy/lab/component/aaa.yml
+++ b/jenkins/client/job/deploy/lab/component/aaa.yml
@@ -8,4 +8,4 @@
stack_type: heat
stack_install: core,aaa
stack_test: ""
- job_timer: ""
+ job_timer: "H H(0-6) * * *"
diff --git a/jenkins/client/job/deploy/lab/component/drivetrain.yml b/jenkins/client/job/deploy/lab/component/drivetrain.yml
index 945ac4a..6d05945 100644
--- a/jenkins/client/job/deploy/lab/component/drivetrain.yml
+++ b/jenkins/client/job/deploy/lab/component/drivetrain.yml
@@ -8,7 +8,7 @@
stack_type: heat
stack_install: core
stack_test: ""
- job_timer: ""
+ job_timer: "H H(0-6) * * *"
- stack_name: drivetrain_ha_clusters
stack_env: devcloud
stack_type: heat
diff --git a/jenkins/client/job/oscore/tests.yml b/jenkins/client/job/oscore/tests.yml
index 8cedaf8..63bd9b3 100644
--- a/jenkins/client/job/oscore/tests.yml
+++ b/jenkins/client/job/oscore/tests.yml
@@ -280,11 +280,11 @@
TEST_TEMPEST_PATTERN:
type: string
description: Run tests matched to pattern only
- default: "tempest --concurrency 2"
+ default: "{{test_pattern}}"
TEST_PATTERN:
type: string
description: Run tests matched to pattern only
- default: "tempest --concurrency 2"
+ default: "{{test_pattern}}"
TEST_MODEL:
type: string
description: Environment salt model
@@ -297,6 +297,10 @@
type: boolean
default: 'true'
description: Whether to fail build on test results
+ RUN_SMOKE:
+ type: boolean
+ default: "{{run_smoke}}"
+ description: Enabling of running smoke tests
test-runner-template:
name: "{{job_prefix}}-{{test_type}}-runner"
template:
@@ -332,6 +336,10 @@
type: string
description: Job for results processing
default: "{{proc_results_job}}"
+ TEST_TYPE:
+ type: string
+ description: Name of test type
+ default: "{{test_type}}"
SLAVE_NODE:
type: string
default: 'python'
diff --git a/jenkins/client/job/salt-formulas/tests.yml b/jenkins/client/job/salt-formulas/tests.yml
index 5727216..501dd38 100644
--- a/jenkins/client/job/salt-formulas/tests.yml
+++ b/jenkins/client/job/salt-formulas/tests.yml
@@ -96,6 +96,7 @@
- name: openssh
- name: openvpn
- name: openvstorage
+ - name: oslo-templates
- name: owncloud
- name: panko
- name: postfix
diff --git a/jenkins/client/job/salt-models/tests.yml b/jenkins/client/job/salt-models/tests.yml
index c68e3d9..8744c0c 100644
--- a/jenkins/client/job/salt-models/tests.yml
+++ b/jenkins/client/job/salt-models/tests.yml
@@ -82,6 +82,28 @@
APT_REPOSITORY_GPG:
type: string
default: ""
+ test_customers_salt_models:
+ name: test-customers-salt-models
+ template:
+ type: workflow-scm
+ discard:
+ build:
+ keep_num: 50
+ artifact:
+ keep_num: 50
+ scm:
+ type: git
+ url: "${_param:jenkins_gerrit_url}/mk/mk-pipelines"
+ branch: "${_param:jenkins_pipelines_branch}"
+ credentials: "gerrit"
+ script: test-customers-salt-models.groovy
+ concurrent: false
+ param:
+ CUSTOMERS:
+ type: string
+ description: "Comma separated list of customer model names"
+ default: "{{customers}}"
+
test_salt_model_customer:
name: test-salt-model-customer-{{name}}
template:
diff --git a/keystone/client/service/keystone.yml b/keystone/client/service/keystone.yml
index d9092e0..ba116f8 100644
--- a/keystone/client/service/keystone.yml
+++ b/keystone/client/service/keystone.yml
@@ -2,6 +2,9 @@
_param:
cluster_public_protocol: https
keystone_service_protocol: http
+ keystone_public_path: "/v2.0"
+ keystone_internal_path: "/v2.0"
+ keystone_admin_path: "/v2.0"
keystone:
client:
server:
@@ -15,12 +18,12 @@
public_address: ${_param:cluster_public_host}
public_protocol: ${_param:cluster_public_protocol}
public_port: 5000
- public_path: '/v2.0'
+ public_path: ${_param:keystone_public_path}
internal_address: ${_param:keystone_service_host}
internal_port: 5000
- internal_path: '/v2.0'
+ internal_path: ${_param:keystone_internal_path}
internal_protocol: ${_param:keystone_service_protocol}
admin_address: ${_param:keystone_service_host}
admin_port: 35357
- admin_path: '/v2.0'
+ admin_path: ${_param:keystone_admin_path}
admin_protocol: ${_param:keystone_service_protocol}
diff --git a/mongodb/server/cluster.yml b/mongodb/server/cluster.yml
index f3c16d6..02294c4 100644
--- a/mongodb/server/cluster.yml
+++ b/mongodb/server/cluster.yml
@@ -2,10 +2,13 @@
- service.mongodb.server.cluster
parameters:
_param:
+ openstack_telemetry_node01_hostname: mdb01
+ openstack_telemetry_node02_hostname: mdb02
+ openstack_telemetry_node03_hostname: mdb03
mongodb_server_replica_set: mongodb
- mongodb_master: mdb01
+ mongodb_master: ${_param:openstack_telemetry_node01_hostname}
mongodb_server_members:
- - host: mdb01
+ - host: ${_param:openstack_telemetry_node01_hostname}
priority: 2
- - host: mdb02
- - host: mdb03
+ - host: ${_param:openstack_telemetry_node02_hostname}
+ - host: ${_param:openstack_telemetry_node03_hostname}
diff --git a/neutron/compute/cluster.yml b/neutron/compute/cluster.yml
index 13ee31c..e348a93 100644
--- a/neutron/compute/cluster.yml
+++ b/neutron/compute/cluster.yml
@@ -4,6 +4,8 @@
_param:
neutron_enable_qos: False
neutron_enable_vlan_aware_vms: False
+ neutron_enable_bgp_vpn: False
+ neutron_bgp_vpn_driver: bagpipe
linux:
system:
package:
@@ -15,6 +17,9 @@
dvr: ${_param:neutron_compute_dvr}
qos: ${_param:neutron_enable_qos}
vlan_aware_vms: ${_param:neutron_enable_vlan_aware_vms}
+ bgp_vpn:
+ enabled: ${_param:neutron_enable_bgp_vpn}
+ driver: ${_param:neutron_bgp_vpn_driver}
agent_mode: ${_param:neutron_compute_agent_mode}
external_access: ${_param:neutron_compute_external_access}
backend:
diff --git a/neutron/control/opendaylight/cluster.yml b/neutron/control/opendaylight/cluster.yml
new file mode 100644
index 0000000..7a62e8b
--- /dev/null
+++ b/neutron/control/opendaylight/cluster.yml
@@ -0,0 +1,23 @@
+classes:
+- service.keepalived.cluster.single
+- service.haproxy.proxy.single
+- service.neutron.control.cluster
+- system.neutron.control.openvswitch.cluster
+parameters:
+ _param:
+ opendaylight_router: odl-router_v2
+ opendaylight_driver: opendaylight_v2
+ neutron:
+ server:
+ backend:
+ opendaylight: true
+ host: ${_param:opendaylight_service_host}
+ rest_api_port: 8282
+ user: admin
+ password: admin
+ ovsdb_connection: tcp:127.0.0.1:6639
+ router: ${_param:opendaylight_router}
+ enable_websocket: true
+ mechanism:
+ ovs:
+ driver: ${_param:opendaylight_driver}
diff --git a/neutron/control/opendaylight/single.yml b/neutron/control/opendaylight/single.yml
new file mode 100644
index 0000000..e0c3ea9
--- /dev/null
+++ b/neutron/control/opendaylight/single.yml
@@ -0,0 +1,21 @@
+classes:
+- service.neutron.control.single
+- system.neutron.control.openvswitch.single
+parameters:
+ _param:
+ opendaylight_router: odl-router_v2
+ opendaylight_driver: opendaylight_v2
+ neutron:
+ server:
+ backend:
+ opendaylight: true
+ host: ${_param:opendaylight_service_host}
+ rest_api_port: 8282
+ user: admin
+ password: admin
+ ovsdb_connection: tcp:127.0.0.1:6639
+ router: ${_param:opendaylight_router}
+ enable_websocket: true
+ mechanism:
+ ovs:
+ driver: ${_param:opendaylight_driver}
diff --git a/neutron/control/openvswitch/cluster.yml b/neutron/control/openvswitch/cluster.yml
index 80489c8..ca2e066 100644
--- a/neutron/control/openvswitch/cluster.yml
+++ b/neutron/control/openvswitch/cluster.yml
@@ -12,6 +12,8 @@
neutron_tenant_network_types: "flat,vxlan"
neutron_enable_qos: False
neutron_enable_vlan_aware_vms: False
+ neutron_enable_bgp_vpn: False
+ neutron_bgp_vpn_driver: bagpipe
neutron:
server:
global_physnet_mtu: ${_param:neutron_global_physnet_mtu}
@@ -19,6 +21,9 @@
dvr: ${_param:neutron_control_dvr}
qos: ${_param:neutron_enable_qos}
vlan_aware_vms: ${_param:neutron_enable_vlan_aware_vms}
+ bgp_vpn:
+ enabled: ${_param:neutron_enable_bgp_vpn}
+ driver: ${_param:neutron_bgp_vpn_driver}
backend:
engine: ml2
tenant_network_types: "${_param:neutron_tenant_network_types}"
diff --git a/neutron/control/openvswitch/single.yml b/neutron/control/openvswitch/single.yml
index 009c116..17cb57e 100644
--- a/neutron/control/openvswitch/single.yml
+++ b/neutron/control/openvswitch/single.yml
@@ -10,6 +10,8 @@
neutron_tenant_network_types: "flat,vxlan"
neutron_enable_qos: False
neutron_enable_vlan_aware_vms: False
+ neutron_enable_bgp_vpn: False
+ neutron_bgp_vpn_driver: bagpipe
neutron:
server:
global_physnet_mtu: ${_param:neutron_global_physnet_mtu}
@@ -17,6 +19,9 @@
dvr: ${_param:neutron_control_dvr}
qos: ${_param:neutron_enable_qos}
vlan_aware_vms: ${_param:neutron_enable_vlan_aware_vms}
+ bgp_vpn:
+ enabled: ${_param:neutron_enable_bgp_vpn}
+ driver: ${_param:neutron_bgp_vpn_driver}
backend:
engine: ml2
tenant_network_types: "${_param:neutron_tenant_network_types}"
diff --git a/prometheus/server/target/dns.yml b/prometheus/server/target/dns.yml
deleted file mode 100644
index e2745f1..0000000
--- a/prometheus/server/target/dns.yml
+++ /dev/null
@@ -1,32 +0,0 @@
-parameters:
- prometheus:
- server:
- target:
- dns:
- enabled: true
- endpoint:
- - name: 'pushgateway'
- domain:
- - 'tasks.monitoring_pushgateway'
- type: A
- port: ${prometheus:pushgateway:bind:port}
- - name: 'prometheus'
- domain:
- - 'tasks.monitoring_server'
- type: A
- port: ${prometheus:server:bind:port}
- - name: 'alertmanager'
- domain:
- - 'tasks.monitoring_alertmanager'
- type: A
- port: ${prometheus:alertmanager:bind:port}
- - name: 'remote_agent'
- domain:
- - 'tasks.monitoring_remote_agent'
- type: A
- port: ${telegraf:remote_agent:output:prometheus_client:bind:port}
- - name: 'remote_storage_adapter'
- domain:
- - 'tasks.monitoring_remote_storage_adapter'
- type: A
- port: ${prometheus:remote_storage_adapter:bind:port}
diff --git a/prometheus/server/target/dns/alertmanager.yml b/prometheus/server/target/dns/alertmanager.yml
new file mode 100644
index 0000000..78172d1
--- /dev/null
+++ b/prometheus/server/target/dns/alertmanager.yml
@@ -0,0 +1,12 @@
+parameters:
+ prometheus:
+ server:
+ target:
+ dns:
+ enabled: true
+ endpoint:
+ - name: 'alertmanager'
+ domain:
+ - 'tasks.monitoring_alertmanager'
+ type: A
+ port: ${prometheus:alertmanager:bind:port}
diff --git a/prometheus/server/target/dns/init.yml b/prometheus/server/target/dns/init.yml
new file mode 100644
index 0000000..361d296
--- /dev/null
+++ b/prometheus/server/target/dns/init.yml
@@ -0,0 +1,6 @@
+classes:
+- system.prometheus.server.target.dns.alertmanager
+- system.prometheus.server.target.dns.prometheus
+- system.prometheus.server.target.dns.pushgateway
+- system.prometheus.server.target.dns.remote_agent
+- system.prometheus.server.target.dns.remote_storage_adapter
diff --git a/prometheus/server/target/dns/prometheus.yml b/prometheus/server/target/dns/prometheus.yml
new file mode 100644
index 0000000..abffe03
--- /dev/null
+++ b/prometheus/server/target/dns/prometheus.yml
@@ -0,0 +1,12 @@
+parameters:
+ prometheus:
+ server:
+ target:
+ dns:
+ enabled: true
+ endpoint:
+ - name: 'prometheus'
+ domain:
+ - 'tasks.monitoring_server'
+ type: A
+ port: ${prometheus:server:bind:port}
diff --git a/prometheus/server/target/dns/pushgateway.yml b/prometheus/server/target/dns/pushgateway.yml
new file mode 100644
index 0000000..9022fa7
--- /dev/null
+++ b/prometheus/server/target/dns/pushgateway.yml
@@ -0,0 +1,12 @@
+parameters:
+ prometheus:
+ server:
+ target:
+ dns:
+ enabled: true
+ endpoint:
+ - name: 'pushgateway'
+ domain:
+ - 'tasks.monitoring_pushgateway'
+ type: A
+ port: ${prometheus:pushgateway:bind:port}
\ No newline at end of file
diff --git a/prometheus/server/target/dns/remote_agent.yml b/prometheus/server/target/dns/remote_agent.yml
new file mode 100644
index 0000000..6801ffc
--- /dev/null
+++ b/prometheus/server/target/dns/remote_agent.yml
@@ -0,0 +1,12 @@
+parameters:
+ prometheus:
+ server:
+ target:
+ dns:
+ enabled: true
+ endpoint:
+ - name: 'remote_agent'
+ domain:
+ - 'tasks.monitoring_remote_agent'
+ type: A
+ port: ${telegraf:remote_agent:output:prometheus_client:bind:port}
diff --git a/prometheus/server/target/dns/remote_storage_adapter.yml b/prometheus/server/target/dns/remote_storage_adapter.yml
new file mode 100644
index 0000000..618f438
--- /dev/null
+++ b/prometheus/server/target/dns/remote_storage_adapter.yml
@@ -0,0 +1,12 @@
+parameters:
+ prometheus:
+ server:
+ target:
+ dns:
+ enabled: true
+ endpoint:
+ - name: 'remote_storage_adapter'
+ domain:
+ - 'tasks.monitoring_remote_storage_adapter'
+ type: A
+ port: ${prometheus:remote_storage_adapter:bind:port}
diff --git a/reclass/storage/system/opendaylight_control_single.yml b/reclass/storage/system/opendaylight_control_single.yml
new file mode 100644
index 0000000..ad809f5
--- /dev/null
+++ b/reclass/storage/system/opendaylight_control_single.yml
@@ -0,0 +1,13 @@
+parameters:
+ _param:
+ opendaylight_control_hostname: odl01
+ reclass:
+ storage:
+ node:
+ opendaylight_control_node01:
+ name: ${_param:opendaylight_control_hostname}
+ domain: ${_param:cluster_domain}
+ params:
+ salt_master_host: ${_param:reclass_config_master}
+ linux_system_codename: ${_param:linux_system_codename}
+ single_address: ${_param:opendaylight_service_host}