Merge "Install logrotate formula during SaltMaster bootstrap"
diff --git a/classes/cluster/k8s-aio-calico/kubernetes/compute.yml b/classes/cluster/k8s-aio-calico/kubernetes/compute.yml
index ede1437..be4d1c7 100644
--- a/classes/cluster/k8s-aio-calico/kubernetes/compute.yml
+++ b/classes/cluster/k8s-aio-calico/kubernetes/compute.yml
@@ -43,9 +43,9 @@
network:
resolv:
dns:
- - 10.254.0.10
+ - 172.18.208.44
- 172.18.176.4
- - 172.18.176.7
+ - 10.254.0.10
interface:
ens3:
enabled: true
diff --git a/classes/cluster/k8s-compact/kubernetes/compute.yml b/classes/cluster/k8s-compact/kubernetes/compute.yml
index edb70a4..4537d07 100644
--- a/classes/cluster/k8s-compact/kubernetes/compute.yml
+++ b/classes/cluster/k8s-compact/kubernetes/compute.yml
@@ -45,9 +45,9 @@
network:
resolv:
dns:
- - ${_param:kubernetes_internal_dns_address}
+ - 172.18.208.44
- 172.18.176.4
- - 172.18.176.7
+ - ${_param:kubernetes_internal_dns_address}
interface:
ens3:
enabled: true
@@ -57,8 +57,5 @@
address: ${_param:single_address}
netmask: 255.255.255.0
gateway: 192.168.122.1
- route:
- kubernetes_services:
- address: 10.201.0.0
- netmask: 255.255.0.0
- gateway: ${_param:single_address}
+ post_up_cmds:
+ - ip r rep 10.254.0.0/16 via ${_param:deploy_address}
diff --git a/classes/cluster/k8s-ha-calico-cloudprovider/kubernetes/compute.yml b/classes/cluster/k8s-ha-calico-cloudprovider/kubernetes/compute.yml
index 4fa8ad2..bb04c5e 100644
--- a/classes/cluster/k8s-ha-calico-cloudprovider/kubernetes/compute.yml
+++ b/classes/cluster/k8s-ha-calico-cloudprovider/kubernetes/compute.yml
@@ -47,9 +47,9 @@
network:
resolv:
dns:
- - 10.254.0.10
+ - 172.18.208.44
- 172.18.176.4
- - 172.18.176.7
+ - 10.254.0.10
interface:
primary_interface:
route:
diff --git a/classes/cluster/k8s-ha-calico-flannel-virtlet/kubernetes/compute.yml b/classes/cluster/k8s-ha-calico-flannel-virtlet/kubernetes/compute.yml
index 1cd7106..29a179b 100644
--- a/classes/cluster/k8s-ha-calico-flannel-virtlet/kubernetes/compute.yml
+++ b/classes/cluster/k8s-ha-calico-flannel-virtlet/kubernetes/compute.yml
@@ -50,9 +50,9 @@
network:
resolv:
dns:
- - 10.254.0.10
+ - 172.18.208.44
- 172.18.176.4
- - 172.18.176.7
+ - 10.254.0.10
interface:
ens3:
enabled: true
@@ -62,14 +62,13 @@
address: ${_param:deploy_address}
netmask: 255.255.255.0
gateway: 192.168.10.1
- route:
- kubernetes_services:
- address: 10.254.0.0
- netmask: 255.255.0.0
- gateway: ${_param:deploy_address}
+ post_up_cmds:
+ - ip r rep 10.254.0.0/16 via ${_param:deploy_address}
ens4:
enabled: true
type: eth
proto: static
address: ${_param:single_address}
netmask: '255.255.255.0'
+ ipflush_onchange: true
+ restart_on_ipflush: true
diff --git a/classes/cluster/k8s-ha-calico-syndic/kubernetes/compute.yml b/classes/cluster/k8s-ha-calico-syndic/kubernetes/compute.yml
index 9871b70..7afc253 100644
--- a/classes/cluster/k8s-ha-calico-syndic/kubernetes/compute.yml
+++ b/classes/cluster/k8s-ha-calico-syndic/kubernetes/compute.yml
@@ -34,9 +34,9 @@
network:
resolv:
dns:
- - 10.254.0.10
+ - 172.18.208.44
- 172.18.176.4
- - 172.18.176.7
+ - 10.254.0.10
interface:
primary_interface:
route:
diff --git a/classes/cluster/k8s-ha-calico/kubernetes/compute.yml b/classes/cluster/k8s-ha-calico/kubernetes/compute.yml
index 476f176..646db96 100644
--- a/classes/cluster/k8s-ha-calico/kubernetes/compute.yml
+++ b/classes/cluster/k8s-ha-calico/kubernetes/compute.yml
@@ -44,9 +44,9 @@
network:
resolv:
dns:
- - 10.254.0.10
+ - 172.18.208.44
- 172.18.176.4
- - 172.18.176.7
+ - 10.254.0.10
interface:
ens3:
enabled: true
@@ -56,14 +56,13 @@
address: ${_param:deploy_address}
netmask: 255.255.255.0
gateway: 192.168.10.1
- route:
- kubernetes_services:
- address: 10.254.0.0
- netmask: 255.255.0.0
- gateway: ${_param:deploy_address}
+ post_up_cmds:
+ - ip r rep 10.254.0.0/16 via ${_param:deploy_address}
ens4:
enabled: true
type: eth
proto: static
address: ${_param:single_address}
netmask: '255.255.255.0'
+ ipflush_onchange: true
+ restart_on_ipflush: true
diff --git a/classes/cluster/os-ha-contrail-40/opencontrail/control.yml b/classes/cluster/os-ha-contrail-40/opencontrail/control.yml
index 4a4fab2..1286459 100644
--- a/classes/cluster/os-ha-contrail-40/opencontrail/control.yml
+++ b/classes/cluster/os-ha-contrail-40/opencontrail/control.yml
@@ -17,6 +17,7 @@
- system.opencontrail.client.resource.global_vrouter_config
- system.haproxy.proxy.listen.opencontrail.analytics
- system.docker.client.compose
+- system.memcached.server.single
- cluster.os-ha-contrail-40
parameters:
_param:
@@ -52,3 +53,13 @@
pkgs:
- docker-engine
- python-docker
+ opencontrail:
+ config:
+ cache:
+ members:
+ - host: ${_param:opencontrail_control_node01_address}
+ port: 11211
+ - host: ${_param:opencontrail_control_node02_address}
+ port: 11211
+ - host: ${_param:opencontrail_control_node03_address}
+ port: 11211
diff --git a/classes/cluster/os-ha-contrail/opencontrail/control.yml b/classes/cluster/os-ha-contrail/opencontrail/control.yml
index 239ecf9..11d8dfe 100644
--- a/classes/cluster/os-ha-contrail/opencontrail/control.yml
+++ b/classes/cluster/os-ha-contrail/opencontrail/control.yml
@@ -16,6 +16,7 @@
- system.opencontrail.client.resource.openstack_metadata
- system.opencontrail.client.resource.global_vrouter_config
- system.haproxy.proxy.listen.opencontrail.analytics
+- system.memcached.server.single
- cluster.os-ha-contrail
parameters:
_param:
@@ -67,6 +68,15 @@
engine: rabbitmq
host: ${_param:openstack_control_address}
port: 5672
+ config:
+ cache:
+ members:
+ - host: ${_param:opencontrail_control_node01_address}
+ port: 11211
+ - host: ${_param:opencontrail_control_node02_address}
+ port: 11211
+ - host: ${_param:opencontrail_control_node03_address}
+ port: 11211
client:
virtual_networks:
network01:
diff --git a/classes/cluster/sl-k8s-calico/kubernetes/compute.yml b/classes/cluster/sl-k8s-calico/kubernetes/compute.yml
index 3522796..c041583 100644
--- a/classes/cluster/sl-k8s-calico/kubernetes/compute.yml
+++ b/classes/cluster/sl-k8s-calico/kubernetes/compute.yml
@@ -44,9 +44,9 @@
network:
resolv:
dns:
- - 10.254.0.10
+ - 172.18.208.44
- 172.18.176.4
- - 172.18.176.7
+ - 10.254.0.10
interface:
ens3:
enabled: true
diff --git a/classes/cluster/sl-os-contrail/openstack/control.yml b/classes/cluster/sl-os-contrail/openstack/control.yml
index dee70ed..6adac4a 100755
--- a/classes/cluster/sl-os-contrail/openstack/control.yml
+++ b/classes/cluster/sl-os-contrail/openstack/control.yml
@@ -40,6 +40,7 @@
- system.galera.server.database.keystone
- system.galera.server.database.nova
- system.galera.server.database.designate
+- system.keepalived.cluster.instance.default_keepalived_check
- cluster.sl-os-contrail
parameters:
_param:
diff --git a/classes/cluster/sl-os-ovs/openstack/control.yml b/classes/cluster/sl-os-ovs/openstack/control.yml
index ea1cdd6..f1bc2a0 100644
--- a/classes/cluster/sl-os-ovs/openstack/control.yml
+++ b/classes/cluster/sl-os-ovs/openstack/control.yml
@@ -28,6 +28,7 @@
- system.galera.server.database.keystone
- system.galera.server.database.nova
- system.haproxy.proxy.listen.openstack.nova-placement
+- system.keepalived.cluster.instance.default_keepalived_check
- cluster.sl-os-ovs
parameters:
_param:
diff --git a/classes/cluster/sl-pike-dvr/openstack/control.yml b/classes/cluster/sl-pike-dvr/openstack/control.yml
index 643c144..fa09daf 100644
--- a/classes/cluster/sl-pike-dvr/openstack/control.yml
+++ b/classes/cluster/sl-pike-dvr/openstack/control.yml
@@ -37,6 +37,7 @@
- system.galera.server.database.nova
- system.galera.server.database.designate
- system.haproxy.proxy.listen.openstack.nova-placement
+- system.keepalived.cluster.instance.default_keepalived_check
- cluster.sl-pike-dvr
parameters:
diff --git a/classes/cluster/virtual-mcp-mitaka-dvr-trusty/.env b/classes/cluster/virtual-mcp-mitaka-dvr-trusty/.env
new file mode 100644
index 0000000..d2e169a
--- /dev/null
+++ b/classes/cluster/virtual-mcp-mitaka-dvr-trusty/.env
@@ -0,0 +1 @@
+EXTRA_FORMULAS="ntp sphinx nginx heka grafana rsyslog prometheus telegraf memcached collectd fluentd"
diff --git a/classes/cluster/virtual-mcp-mitaka-dvr-trusty/infra/config.yml b/classes/cluster/virtual-mcp-mitaka-dvr-trusty/infra/config.yml
new file mode 100644
index 0000000..6938a4a
--- /dev/null
+++ b/classes/cluster/virtual-mcp-mitaka-dvr-trusty/infra/config.yml
@@ -0,0 +1,194 @@
+classes:
+- service.git.client
+- system.linux.system.single
+- system.linux.system.repo.mcp.salt
+- system.linux.system.repo.mcp.apt_mirantis.openstack
+- system.openssh.client.lab
+- system.salt.master.pkg
+- system.salt.master.api
+- system.reclass.storage.salt
+- system.salt.minion.ca.salt_master
+- system.salt.minion.cert.proxy
+- system.sphinx.server.doc.reclass
+- system.keystone.client.single
+- system.keystone.client.service.aodh
+- system.keystone.client.service.ceilometer
+- system.keystone.client.service.nova21
+- system.keystone.client.service.glare
+- system.keystone.client.service.cinder3
+- system.keystone.client.service.designate
+- system.mysql.client.single
+- system.reclass.storage.system.openstack_control_cluster
+- system.reclass.storage.system.stacklightv2_server_cluster
+- system.reclass.storage.system.openstack_compute_multi
+- system.reclass.storage.system.openstack_dashboard_single
+- system.reclass.storage.system.openstack_proxy_single
+- system.reclass.storage.system.openstack_gateway_single
+- cluster.virtual-mcp-mitaka-dvr-trusty
+parameters:
+ _param:
+ linux_system_codename: xenial
+ openstack_linux_system_codename: trusty
+ reclass_data_repository: https://gerrit.mcp.mirantis.net/salt-models/mcp-virtual-lab
+ reclass_data_revision: master
+ salt_master_environment_repository: "https://github.com/tcpcloud"
+ salt_master_environment_revision: master
+ salt_api_password_hash: "$6$sGnRlxGf$al5jMCetLP.vfI/fTl3Z0N7Za1aeiexL487jAtyRABVfT3NlwZxQGVhO7S1N8OwS/34VHYwZQA8lkXwKMN/GS1"
+ reclass_config_master: ${_param:infra_config_deploy_address}
+ single_address: ${_param:infra_config_address}
+ salt_master_host: 127.0.0.1
+ salt_master_base_environment: prd
+ salt_minion_ca_host: ${linux:network:fqdn}
+ linux:
+ network:
+ interface:
+ ens4:
+ enabled: true
+ type: eth
+ proto: static
+ address: ${_param:single_address}
+ netmask: 255.255.255.0
+ nginx:
+ server:
+ site:
+ nginx_proxy_openstack_web:
+ proxy:
+ host: ${_param:openstack_proxy_address}
+ nginx_proxy_openstack_api_heat_cfn:
+ enabled: false
+ salt:
+ master:
+ reactor:
+ reclass/minion/classify:
+ - salt://reclass/reactor/node_register.sls
+ reclass:
+ storage:
+ class_mapping:
+ common_node:
+ expression: all
+ node_param:
+ single_address:
+ value_template: <<node_control_ip>>
+ linux_system_codename:
+ value_template: <<node_os>>
+ salt_master_host:
+ value_template: <<node_master_ip>>
+ infra_config:
+ expression: <<node_hostname>>__startswith__cfg
+ cluster_param:
+ infra_config_address:
+ value_template: <<node_control_ip>>
+ infra_config_deploy_address:
+ value_template: <<node_deploy_ip>>
+ cluster_domain:
+ value_template: <<node_domain>>
+ openstack_control01:
+ expression: <<node_hostname>>__equals__ctl01
+ cluster_param:
+ openstack_control_node01_address:
+ value_template: <<node_control_ip>>
+ openstack_control02:
+ expression: <<node_hostname>>__equals__ctl02
+ cluster_param:
+ openstack_control_node02_address:
+ value_template: <<node_control_ip>>
+ openstack_control03:
+ expression: <<node_hostname>>__equals__ctl03
+ cluster_param:
+ openstack_control_node03_address:
+ value_template: <<node_control_ip>>
+ openstack_compute:
+ expression: <<node_hostname>>__startswith__cmp
+ node_class:
+ value_template:
+ - cluster.<<node_cluster>>.openstack.compute
+ node_param:
+ tenant_address:
+ value_template: <<node_tenant_ip>>
+ external_address:
+ value_template: <<node_external_ip>>
+ openstack_gateway:
+ expression: <<node_hostname>>__startswith__gtw
+ node_class:
+ value_template:
+ - cluster.<<node_cluster>>.openstack.gateway
+ node_param:
+ tenant_address:
+ value_template: <<node_tenant_ip>>
+ external_address:
+ value_template: <<node_external_ip>>
+ cluster_param:
+ openstack_gateway_node01_address:
+ value_template: <<node_control_ip>>
+ stacklight_monitor_node01:
+ expression: <<node_hostname>>__equals__mon01
+ cluster_param:
+ stacklight_monitor_node01_address:
+ value_template: <<node_control_ip>>
+ stacklight_monitor_node02:
+ expression: <<node_hostname>>__equals__mon02
+ cluster_param:
+ stacklight_monitor_node02_address:
+ value_template: <<node_control_ip>>
+ stacklight_monitor_node03:
+ expression: <<node_hostname>>__equals__mon03
+ cluster_param:
+ stacklight_monitor_node03_address:
+ value_template: <<node_control_ip>>
+ openstack_dashboard:
+ expression: <<node_hostname>>__startswith__prx
+ node_class:
+ value_template:
+ - cluster.<<node_cluster>>.openstack.dashboard
+ cluster_param:
+ openstack_proxy_node01_address:
+ value_template: <<node_control_ip>>
+ node:
+ openstack_control_node01:
+ classes:
+ - service.galera.master.cluster
+ params:
+ mysql_cluster_role: master
+ linux_system_codename: ${_param:openstack_linux_system_codename}
+ openstack_control_node02:
+ classes:
+ - service.galera.slave.cluster
+ params:
+ mysql_cluster_role: slave
+ linux_system_codename: ${_param:openstack_linux_system_codename}
+ openstack_control_node03:
+ classes:
+ - service.galera.slave.cluster
+ params:
+ mysql_cluster_role: slave
+ linux_system_codename: ${_param:openstack_linux_system_codename}
+ openstack_compute_node01:
+ params:
+ tenant_address: 10.1.0.105
+ external_address: 10.16.0.105
+ linux_system_codename: ${_param:openstack_linux_system_codename}
+ openstack_compute_node02:
+ params:
+ tenant_address: 10.1.0.106
+ external_address: 10.16.0.106
+ linux_system_codename: ${_param:openstack_linux_system_codename}
+ openstack_gateway_node01:
+ params:
+ tenant_address: 10.1.0.110
+ external_address: 10.16.0.110
+ linux_system_codename: ${_param:openstack_linux_system_codename}
+ openstack_proxy_node01:
+ params:
+ linux_system_codename: ${_param:openstack_linux_system_codename}
+ stacklight_server_node01:
+ classes:
+ - system.influxdb.server.single
+ - system.influxdb.database.stacklight
+ params:
+ linux_system_codename: ${_param:openstack_linux_system_codename}
+ stacklight_server_node02:
+ params:
+ linux_system_codename: ${_param:openstack_linux_system_codename}
+ stacklight_server_node03:
+ params:
+ linux_system_codename: ${_param:openstack_linux_system_codename}
diff --git a/classes/cluster/virtual-mcp-mitaka-dvr-trusty/infra/init.yml b/classes/cluster/virtual-mcp-mitaka-dvr-trusty/infra/init.yml
new file mode 100644
index 0000000..5c7c450
--- /dev/null
+++ b/classes/cluster/virtual-mcp-mitaka-dvr-trusty/infra/init.yml
@@ -0,0 +1,22 @@
+parameters:
+ _jenkins:
+ tests_enabled: false
+ _param:
+ cluster_domain: virtual-mcp-mitaka-dvr-trusty.local
+ cluster_name: virtual-mcp-mitaka-dvr-trusty
+ infra_config_hostname: cfg01
+ infra_config_deploy_address: 192.168.10.90
+ infra_config_address: 172.16.10.90
+ linux:
+ network:
+ host:
+ cfg01:
+ address: ${_param:infra_config_address}
+ names:
+ - ${_param:infra_config_hostname}
+ - ${_param:infra_config_hostname}.${_param:cluster_domain}
+ cfg:
+ address: ${_param:infra_config_address}
+ names:
+ - cfg
+ - cfg.${_param:cluster_domain}
diff --git a/classes/cluster/virtual-mcp-mitaka-dvr-trusty/init.yml b/classes/cluster/virtual-mcp-mitaka-dvr-trusty/init.yml
new file mode 100644
index 0000000..3593d3b
--- /dev/null
+++ b/classes/cluster/virtual-mcp-mitaka-dvr-trusty/init.yml
@@ -0,0 +1,23 @@
+classes:
+- system.linux.network.dynamic_hosts
+- service.grafana.collector
+- system.fluentd
+- system.fluentd.label.default_metric
+- system.fluentd.label.default_metric.prometheus
+- system.fluentd.label.default_output.elasticsearch
+- system.fluentd.label.default_output.drop_event
+- system.linux.system.repo.mcp.extra
+- system.linux.system.repo.mcp.apt_mirantis.fluentd
+- system.linux.system.repo.mcp.apt_mirantis.openstack
+- system.linux.system.single
+- system.rsyslog.client.single
+- system.prometheus.collector
+- system.telegraf.agent
+- system.openssh.server.team.lab
+- system.openssh.server.team.tcpcloud
+- system.openssh.server.team.stacklight
+- system.openssh.server.team.mcp_qa
+- cluster.virtual-mcp-mitaka-dvr-trusty.infra
+- cluster.virtual-mcp-mitaka-dvr-trusty.openstack
+- cluster.virtual-mcp-mitaka-dvr-trusty.stacklight
+- cluster.overrides
diff --git a/classes/cluster/virtual-mcp-mitaka-dvr-trusty/openstack/compute.yml b/classes/cluster/virtual-mcp-mitaka-dvr-trusty/openstack/compute.yml
new file mode 100644
index 0000000..cf2722e
--- /dev/null
+++ b/classes/cluster/virtual-mcp-mitaka-dvr-trusty/openstack/compute.yml
@@ -0,0 +1,60 @@
+classes:
+- system.linux.system.repo.mcp.apt_mirantis.openstack
+- system.linux.system.repo.mcp.extra
+- system.linux.system.repo.saltstack.trusty
+- system.linux.network.hosts
+- system.nova.compute.cluster
+- system.neutron.compute.cluster
+- system.ceilometer.agent.cluster
+- system.linux.network.interface.single_ovs_dvr
+- system.prometheus.exporters.libvirt
+- cluster.virtual-mcp-mitaka-dvr-trusty
+parameters:
+ _param:
+ primary_interface: eth1
+ tenant_interface: eth2
+ external_interface: eth3
+ interface_mtu: 1500
+ neutron:
+ compute:
+ notification:
+ driver: messagingv2
+ topics: "notifications,${_param:stacklight_notification_topic}"
+ nova:
+ compute:
+ vncproxy_url: http://${_param:cluster_vip_address}:6080
+ message_queue:
+ members:
+ - host: ${_param:openstack_control_node01_address}
+ - host: ${_param:openstack_control_node02_address}
+ - host: ${_param:openstack_control_node03_address}
+ notification:
+ driver: messagingv2
+ topics: "notifications,${_param:stacklight_notification_topic}"
+ notify_on:
+ state_change: vm_and_task_state
+ linux:
+ network:
+ bridge: openvswitch
+ interface:
+ primary_interface:
+ enabled: true
+ ipflush_onchange: true
+ name: ${_param:primary_interface}
+ mtu: ${_param:interface_mtu}
+ proto: manual
+ type: eth
+ tenant_interface:
+ enabled: true
+ ipflush_onchange: true
+ name: ${_param:tenant_interface}
+ mtu: ${_param:interface_mtu}
+ proto: manual
+ type: eth
+ external_interface:
+ enabled: true
+ ipflush_onchange: true
+ name: ${_param:external_interface}
+ mtu: ${_param:interface_mtu}
+ proto: manual
+ type: eth
\ No newline at end of file
diff --git a/classes/cluster/virtual-mcp-mitaka-dvr-trusty/openstack/control.yml b/classes/cluster/virtual-mcp-mitaka-dvr-trusty/openstack/control.yml
new file mode 100644
index 0000000..8f4a5ff
--- /dev/null
+++ b/classes/cluster/virtual-mcp-mitaka-dvr-trusty/openstack/control.yml
@@ -0,0 +1,161 @@
+classes:
+- system.linux.system.lowmem
+- system.linux.storage.loopback
+- system.linux.system.repo.glusterfs
+- system.linux.system.repo.mcp.apt_mirantis.openstack
+- system.linux.system.repo.mcp.extra
+- system.linux.system.repo.saltstack.trusty
+- system.memcached.server.single
+- system.rabbitmq.server.cluster
+- system.rabbitmq.server.vhost.openstack
+- system.keystone.server.wsgi
+- system.keystone.server.cluster
+- system.glusterfs.client.cluster
+- system.glusterfs.client.volume.glance
+- system.glusterfs.client.volume.keystone
+- system.glusterfs.server.volume.glance
+- system.glusterfs.server.volume.keystone
+- system.glusterfs.server.cluster
+- system.glance.control.cluster
+- system.nova.control.cluster
+- system.neutron.control.openvswitch.cluster
+- system.cinder.control.cluster
+- system.cinder.control.backend.lvm
+- system.cinder.volume.single
+- system.cinder.volume.backend.lvm
+- system.heat.server.cluster
+- system.ceilometer.server.cluster
+- system.ceilometer.server.backend.influxdb
+- system.aodh.server.cluster
+- system.heka.ceilometer_collector.single
+- system.designate.server.cluster
+- system.designate.server.backend.bind
+- system.bind.server.single
+- system.galera.server.cluster
+- system.galera.server.database.aodh
+- system.galera.server.database.ceilometer
+- system.galera.server.database.cinder
+- system.galera.server.database.glance
+- system.galera.server.database.grafana
+- system.galera.server.database.heat
+- system.galera.server.database.keystone
+- system.galera.server.database.nova
+- system.galera.server.database.designate
+- cluster.virtual-mcp-mitaka-dvr-trusty
+
+parameters:
+ _param:
+ keepalived_vip_interface: eth1
+ linux:
+ system:
+ package:
+ python-msgpack:
+ version: latest
+ network:
+ interface:
+ eth1:
+ enabled: true
+ type: eth
+ proto: static
+ address: ${_param:single_address}
+ netmask: 255.255.255.0
+ keepalived:
+ cluster:
+ instance:
+ VIP:
+ virtual_router_id: 150
+ keystone:
+ server:
+ admin_email: ${_param:admin_email}
+ notification:
+ driver: messagingv2
+ topics: "notifications,${_param:stacklight_notification_topic}"
+ glance:
+ server:
+ storage:
+ engine: file
+ images: []
+ workers: 1
+ notification:
+ driver: messagingv2
+ topics: "notifications,${_param:stacklight_notification_topic}"
+ heat:
+ server:
+ notification:
+ driver: messagingv2
+ topics: "notifications,${_param:stacklight_notification_topic}"
+ neutron:
+ server:
+ notification:
+ driver: messagingv2
+ topics: "notifications,${_param:stacklight_notification_topic}"
+ nova:
+ controller:
+ networking: dvr
+ cpu_allocation: 54
+ metadata:
+ password: ${_param:metadata_password}
+ bind:
+ private_address: ${_param:cluster_local_address}
+ public_address: ${_param:cluster_vip_address}
+ novncproxy_port: 6080
+ vncproxy_url: http://${_param:cluster_vip_address}:6080
+ workers: 1
+ notification:
+ driver: messagingv2
+ topics: "notifications,${_param:stacklight_notification_topic}"
+ cinder:
+ volume:
+ notification:
+ driver: messagingv2
+ topics: "notifications,${_param:stacklight_notification_topic}"
+ controller:
+ notification:
+ driver: messagingv2
+ topics: "notifications,${_param:stacklight_notification_topic}"
+ bind:
+ server:
+ control:
+ mgmt:
+ enabled: true
+ bind:
+ address: ${_param:single_address}
+ port: 953
+ allow:
+ - ${_param:openstack_control_node01_address}
+ - ${_param:openstack_control_node02_address}
+ - ${_param:openstack_control_node03_address}
+ keys:
+ - designate
+ designate:
+ server:
+ pools:
+ default:
+ description: 'test pool'
+ targets:
+ default:
+ description: 'test target1'
+ default1:
+ type: ${_param:designate_pool_target_type}
+ description: 'test target2'
+ masters: ${_param:designate_pool_target_masters}
+ options:
+ host: ${_param:openstack_control_node02_address}
+ port: 53
+ rndc_host: ${_param:openstack_control_node02_address}
+ rndc_port: 953
+ rndc_key_file: /etc/designate/rndc.key
+ default2:
+ type: ${_param:designate_pool_target_type}
+ description: 'test target3'
+ masters: ${_param:designate_pool_target_masters}
+ options:
+ host: ${_param:openstack_control_node03_address}
+ port: 53
+ rndc_host: ${_param:openstack_control_node03_address}
+ rndc_port: 953
+ rndc_key_file: /etc/designate/rndc.key
+ quota:
+ zones: ${_param:designate_quota_zones}
+ worker:
+ enabled: ${_param:designate_worker_enabled}
\ No newline at end of file
diff --git a/classes/cluster/virtual-mcp-mitaka-dvr-trusty/openstack/dashboard.yml b/classes/cluster/virtual-mcp-mitaka-dvr-trusty/openstack/dashboard.yml
new file mode 100644
index 0000000..177b577
--- /dev/null
+++ b/classes/cluster/virtual-mcp-mitaka-dvr-trusty/openstack/dashboard.yml
@@ -0,0 +1,15 @@
+classes:
+- system.horizon.server.single
+- system.linux.system.repo.saltstack.trusty
+parameters:
+ _param:
+ horizon_site_branding: OpenStack Dashboard
+ linux:
+ network:
+ interface:
+ eth1:
+ enabled: true
+ type: eth
+ proto: static
+ address: ${_param:single_address}
+ netmask: 255.255.255.0
diff --git a/classes/cluster/virtual-mcp-mitaka-dvr-trusty/openstack/gateway.yml b/classes/cluster/virtual-mcp-mitaka-dvr-trusty/openstack/gateway.yml
new file mode 100644
index 0000000..2794889
--- /dev/null
+++ b/classes/cluster/virtual-mcp-mitaka-dvr-trusty/openstack/gateway.yml
@@ -0,0 +1,45 @@
+classes:
+- system.linux.system.repo.mcp.apt_mirantis.openstack
+- system.linux.system.repo.mcp.extra
+- system.linux.system.repo.saltstack.trusty
+- system.linux.network.interface.single_ovs_dvr
+- system.neutron.gateway.cluster
+- cluster.virtual-mcp-mitaka-dvr-trusty
+parameters:
+ _param:
+ primary_interface: eth1
+ tenant_interface: eth2
+ external_interface: eth3
+ interface_mtu: 9000
+ neutron_gateway_dvr: True
+ neutron_gateway_agent_mode: dvr_snat
+ neutron:
+ gateway:
+ notification:
+ driver: messagingv2
+ topics: "notifications,${_param:stacklight_notification_topic}"
+ linux:
+ network:
+ bridge: openvswitch
+ interface:
+ primary_interface:
+ enabled: true
+ ipflush_onchange: true
+ name: ${_param:primary_interface}
+ mtu: ${_param:interface_mtu}
+ proto: manual
+ type: eth
+ tenant_interface:
+ enabled: true
+ ipflush_onchange: true
+ name: ${_param:tenant_interface}
+ mtu: ${_param:interface_mtu}
+ proto: manual
+ type: eth
+ external_interface:
+ enabled: true
+ ipflush_onchange: true
+ name: ${_param:external_interface}
+ mtu: ${_param:interface_mtu}
+ proto: manual
+ type: eth
diff --git a/classes/cluster/virtual-mcp-mitaka-dvr-trusty/openstack/init.yml b/classes/cluster/virtual-mcp-mitaka-dvr-trusty/openstack/init.yml
new file mode 100644
index 0000000..67256b5
--- /dev/null
+++ b/classes/cluster/virtual-mcp-mitaka-dvr-trusty/openstack/init.yml
@@ -0,0 +1,213 @@
+parameters:
+ _param:
+ openstack_proxy_hostname: prx
+ openstack_proxy_address: ${_param:openstack_proxy_node01_address}
+ openstack_proxy_node01_hostname: prx01
+ openstack_proxy_node01_address: 172.16.10.121
+ openstack_control_hostname: ctl
+ openstack_control_node01_hostname: ctl01
+ openstack_control_node02_hostname: ctl02
+ openstack_control_node03_hostname: ctl03
+ openstack_control_address: 172.16.10.254
+ openstack_control_node01_address: 172.16.10.91
+ openstack_control_node02_address: 172.16.10.92
+ openstack_control_node03_address: 172.16.10.93
+ openstack_gateway_hostname: gtw
+ openstack_gateway_address: ${_param:openstack_gateway_node01_address}
+ openstack_gateway_node01_hostname: gtw01
+ openstack_gateway_node01_address: 172.16.10.94
+ openstack_compute_node01_hostname: cmp01
+ openstack_compute_node02_hostname: cmp02
+ openstack_compute_node01_address: 172.16.10.95
+ openstack_compute_node02_address: 172.16.10.96
+ openstack_database_address: ${_param:openstack_control_address}
+ openstack_database_node01_address: ${_param:openstack_control_node01_address}
+ openstack_database_node02_address: ${_param:openstack_control_node02_address}
+ openstack_database_node03_address: ${_param:openstack_control_node03_address}
+ openstack_message_queue_address: ${_param:openstack_control_address}
+ openstack_message_queue_node01_address: ${_param:openstack_control_node01_address}
+ openstack_message_queue_node02_address: ${_param:openstack_control_node02_address}
+ openstack_message_queue_node03_address: ${_param:openstack_control_node03_address}
+ openstack_log_appender: true
+ openstack_fluentd_handler_enabled: true
+
+ openstack_version: mitaka
+ apt_mk_version: nightly
+ mcp_repo_version: 1.1
+ openstack_region: RegionOne
+ admin_email: root@localhost
+ cluster_public_host: 172.16.10.254
+ neutron_public_protocol: http
+ cluster_public_protocol: http
+ neutron_control_dvr: True
+ neutron_tenant_network_types: "flat,vxlan"
+ neutron_l3_ha: False
+ neutron_global_physnet_mtu: 1500
+ neutron_external_mtu: 1500
+ neutron_gateway_dvr: True
+ neutron_gateway_agent_mode: dvr_snat
+ neutron_compute_dvr: True
+ neutron_compute_agent_mode: dvr
+ neutron_compute_external_access: True
+ galera_server_cluster_name: openstack_cluster
+ galera_server_maintenance_password: workshop
+ galera_server_admin_password: workshop
+ cluster_vip_address: ${_param:openstack_control_address}
+ cluster_local_address: ${_param:single_address}
+ cluster_node01_hostname: ctl01
+ cluster_node01_address: ${_param:openstack_control_node01_address}
+ cluster_node02_hostname: ctl02
+ cluster_node02_address: ${_param:openstack_control_node02_address}
+ cluster_node03_hostname: ctl03
+ cluster_node03_address: ${_param:openstack_control_node03_address}
+ rabbitmq_secret_key: workshop
+ rabbitmq_admin_password: workshop
+ rabbitmq_openstack_password: workshop
+ rabbitmq_cold_password: workshop
+ designate_admin_api_enabled: true
+ designate_bind9_rndc_key: 4pc+X4PDqb2q+5o72dISm72LM1Ds9X2EYZjqg+nmsS7FhdTwzFFY8l/iEDmHxnyjkA33EQC8H+z0fLLBunoitw==
+ designate_domain_id: 5186883b-91fb-4891-bd49-e6769234a8fc
+ designate_quota_zones: 40
+ designate_pool_ns_records:
+ - hostname: 'ns1.example.org.'
+ priority: 10
+ designate_pool_nameservers:
+ - host: ${_param:openstack_control_node01_address}
+ port: 53
+ - host: ${_param:openstack_control_node02_address}
+ port: 53
+ - host: ${_param:openstack_control_node03_address}
+ port: 53
+ designate_pool_target_type: bind9
+ designate_pool_target_masters:
+ - host: ${_param:openstack_control_node01_address}
+ port: 5354
+ - host: ${_param:openstack_control_node02_address}
+ port: 5354
+ - host: ${_param:openstack_control_node03_address}
+ port: 5354
+ designate_pool_target_options:
+ host: ${_param:openstack_control_node01_address}
+ port: 53
+ rndc_host: ${_param:openstack_control_node01_address}
+ rndc_port: 953
+ rndc_key_file: /etc/designate/rndc.key
+ designate_version: ${_param:openstack_version}
+ designate_worker_enabled: false
+ glance_version: ${_param:openstack_version}
+ glance_service_host: ${_param:cluster_vip_address}
+ keystone_version: ${_param:openstack_version}
+ keystone_service_host: ${_param:cluster_vip_address}
+ heat_version: ${_param:openstack_version}
+ heat_service_host: ${_param:cluster_vip_address}
+ heat_domain_admin_password: workshop
+ ceilometer_version: ${_param:openstack_version}
+ ceilometer_service_host: ${_param:cluster_vip_address}
+ aodh_version: ${_param:openstack_version}
+ aodh_service_host: ${_param:cluster_vip_address}
+ cinder_version: ${_param:openstack_version}
+ cinder_service_host: ${_param:cluster_vip_address}
+ ceilometer_graphite_publisher_host: 172.16.10.107
+ ceilometer_graphite_publisher_port: 2013
+ nova_version: ${_param:openstack_version}
+ nova_service_host: ${_param:cluster_vip_address}
+ nova_vncproxy_url: http://${_param:cluster_vip_address}:8060
+ neutron_version: ${_param:openstack_version}
+ neutron_service_host: ${_param:cluster_vip_address}
+ glusterfs_service_host: ${_param:cluster_vip_address}
+ designate_service_host: ${_param:cluster_vip_address}
+ metadata_password: password
+ mysql_admin_user: root
+ mysql_admin_password: workshop
+ mysql_cinder_password: workshop
+ mysql_ceilometer_password: workshop
+ mysql_glance_password: workshop
+ mysql_grafana_password: workshop
+ mysql_heat_password: workshop
+ mysql_keystone_password: workshop
+ mysql_neutron_password: workshop
+ mysql_nova_password: workshop
+ mysql_aodh_password: workshop
+ mysql_designate_password: workshop
+ keystone_service_token: workshop
+ keystone_admin_password: workshop
+ keystone_aodh_password: workshop
+ keystone_ceilometer_password: workshop
+ keystone_cinder_password: workshop
+ keystone_glance_password: workshop
+ keystone_heat_password: workshop
+ keystone_keystone_password: workshop
+ keystone_neutron_password: workshop
+ keystone_nova_password: workshop
+ keystone_designate_password: workshop
+ ceilometer_secret_key: workshop
+ horizon_version: ${_param:openstack_version}
+ horizon_secret_key: opaesee8Que2yahJoh9fo0eefo1Aeyo6ahyei8zeiboh3aeth5loth7ieNa5xi5e
+ horizon_identity_host: ${_param:cluster_vip_address}
+ horizon_identity_encryption: none
+ horizon_identity_version: 2
+ mongodb_server_replica_set: ceilometer
+ mongodb_ceilometer_password: cloudlab
+ mongodb_admin_password: cloudlab
+ mongodb_shared_key: eoTh1AwahlahqueingeejooLughah4tei9feing0eeVaephooDi2li1TaeV1ooth
+ ceilometer_influxdb_password: lmapass
+ loopback_device_size: 20
+ linux:
+ network:
+ purge_hosts: true
+ host:
+ prx:
+ address: ${_param:openstack_proxy_address}
+ names:
+ - ${_param:openstack_proxy_hostname}
+ - ${_param:openstack_proxy_hostname}.${_param:cluster_domain}
+ prx01:
+ address: ${_param:openstack_proxy_node01_address}
+ names:
+ - ${_param:openstack_proxy_node01_hostname}
+ - ${_param:openstack_proxy_node01_hostname}.${_param:cluster_domain}
+ ctl:
+ address: ${_param:openstack_control_address}
+ names:
+ - ${_param:openstack_control_hostname}
+ - ${_param:openstack_control_hostname}.${_param:cluster_domain}
+ ctl01:
+ address: ${_param:openstack_control_node01_address}
+ names:
+ - ${_param:openstack_control_node01_hostname}
+ - ${_param:openstack_control_node01_hostname}.${_param:cluster_domain}
+ ctl02:
+ address: ${_param:openstack_control_node02_address}
+ names:
+ - ${_param:openstack_control_node02_hostname}
+ - ${_param:openstack_control_node02_hostname}.${_param:cluster_domain}
+ ctl03:
+ address: ${_param:openstack_control_node03_address}
+ names:
+ - ${_param:openstack_control_node03_hostname}
+ - ${_param:openstack_control_node03_hostname}.${_param:cluster_domain}
+ gtw:
+ address: ${_param:openstack_gateway_address}
+ names:
+ - ${_param:openstack_gateway_hostname}
+ - ${_param:openstack_gateway_hostname}.${_param:cluster_domain}
+ gtw01:
+ address: ${_param:openstack_gateway_address}
+ names:
+ - ${_param:openstack_gateway_hostname}
+ - ${_param:openstack_gateway_hostname}.${_param:cluster_domain}
+ cmp01:
+ address: ${_param:openstack_control_node01_address}
+ names:
+ - ${_param:openstack_compute_node01_hostname}
+ - ${_param:openstack_compute_node01_hostname}.${_param:cluster_domain}
+ cmp02:
+ address: ${_param:openstack_control_node02_address}
+ names:
+ - ${_param:openstack_compute_node02_hostname}
+ - ${_param:openstack_compute_node02_hostname}.${_param:cluster_domain}
+ system:
+ user:
+ root:
+ name: root
+ password: false
diff --git a/classes/cluster/virtual-mcp-mitaka-dvr-trusty/openstack/proxy.yml b/classes/cluster/virtual-mcp-mitaka-dvr-trusty/openstack/proxy.yml
new file mode 100644
index 0000000..1aaf437
--- /dev/null
+++ b/classes/cluster/virtual-mcp-mitaka-dvr-trusty/openstack/proxy.yml
@@ -0,0 +1,15 @@
+classes:
+- system.nginx.server.single
+- system.nginx.server.proxy.openstack_api
+- system.nginx.server.proxy.openstack_vnc
+- system.nginx.server.proxy.openstack_web
+- system.salt.minion.cert.proxy
+- cluster.virtual-mcp-mitaka-dvr-trusty
+parameters:
+ _param:
+ nginx_proxy_ssl:
+ enabled: true
+ authority: ${_param:salt_minion_ca_authority}
+ engine: salt
+ mode: secure
+ salt_minion_ca_host: cfg01.${_param:cluster_domain}
\ No newline at end of file
diff --git a/classes/cluster/virtual-mcp-mitaka-dvr-trusty/stacklight/client.yml b/classes/cluster/virtual-mcp-mitaka-dvr-trusty/stacklight/client.yml
new file mode 100644
index 0000000..47787ee
--- /dev/null
+++ b/classes/cluster/virtual-mcp-mitaka-dvr-trusty/stacklight/client.yml
@@ -0,0 +1,22 @@
+classes:
+- system.docker.client
+- system.elasticsearch.client.single
+- system.grafana.client
+- system.grafana.client.datasource.prometheus
+- system.kibana.client.single
+- cluster.virtual-mcp-mitaka-dvr-trusty
+parameters:
+ _param:
+ # Elasticsearch/Kibana client parameters
+ stacklight_log_address: ${_param:stacklight_monitor_address}
+ # Grafana client parameters
+ grafana_address: ${_param:stacklight_monitor_address}
+ grafana_port: 15013
+ grafana_user: admin
+ grafana_password: ${_param:grafana_admin_password}
+ grafana_prometheus_address: ${_param:stacklight_monitor_address}
+ grafana_prometheus_port: 15016
+
+ cluster_node01_address: ${_param:stacklight_monitor_node01_address}
+ cluster_node02_address: ${_param:stacklight_monitor_node02_address}
+ cluster_node03_address: ${_param:stacklight_monitor_node03_address}
diff --git a/classes/cluster/virtual-mcp-mitaka-dvr-trusty/stacklight/init.yml b/classes/cluster/virtual-mcp-mitaka-dvr-trusty/stacklight/init.yml
new file mode 100644
index 0000000..f8bfdbe
--- /dev/null
+++ b/classes/cluster/virtual-mcp-mitaka-dvr-trusty/stacklight/init.yml
@@ -0,0 +1,45 @@
+parameters:
+ _param:
+ stacklight_monitor_hostname: mon
+ stacklight_monitor_node01_hostname: mon01
+ stacklight_monitor_node02_hostname: mon02
+ stacklight_monitor_node03_hostname: mon03
+ stacklight_monitor_address: 172.16.10.253
+ stacklight_monitor_node01_address: 172.16.10.100
+ stacklight_monitor_node02_address: 172.16.10.101
+ stacklight_monitor_node03_address: 172.16.10.102
+ stacklight_log_address: ${_param:stacklight_monitor_address}
+ stacklight_telemetry_address: ${_param:stacklight_monitor_address}
+ stacklight_telemetry_node01_address: ${_param:stacklight_monitor_node01_address}
+ prometheus_control_address: ${_param:stacklight_monitor_address}
+ fluentd_elasticsearch_host: ${_param:stacklight_log_address}
+ elasticsearch_port: 9200
+ stacklight_environment: ${_param:cluster_domain}
+ stacklight_notification_topic: stacklight_notifications
+ grafana_admin_password: admin
+ grafana_database_type: mysql
+ grafana_database_host: ${_param:openstack_database_address}
+ grafana_database_password: ${_param:mysql_grafana_password}
+ linux:
+ network:
+ host:
+ mon:
+ address: ${_param:stacklight_monitor_address}
+ names:
+ - ${_param:stacklight_monitor_hostname}
+ - ${_param:stacklight_monitor_hostname}.${_param:cluster_domain}
+ mon01:
+ address: ${_param:stacklight_monitor_node01_address}
+ names:
+ - ${_param:stacklight_monitor_node01_hostname}
+ - ${_param:stacklight_monitor_node01_hostname}.${_param:cluster_domain}
+ mon02:
+ address: ${_param:stacklight_monitor_node02_address}
+ names:
+ - ${_param:stacklight_monitor_node02_hostname}
+ - ${_param:stacklight_monitor_node02_hostname}.${_param:cluster_domain}
+ mon03:
+ address: ${_param:stacklight_monitor_node03_address}
+ names:
+ - ${_param:stacklight_monitor_node03_hostname}
+ - ${_param:stacklight_monitor_node03_hostname}.${_param:cluster_domain}
diff --git a/classes/cluster/virtual-mcp-mitaka-dvr-trusty/stacklight/proxy.yml b/classes/cluster/virtual-mcp-mitaka-dvr-trusty/stacklight/proxy.yml
new file mode 100644
index 0000000..e272ae5
--- /dev/null
+++ b/classes/cluster/virtual-mcp-mitaka-dvr-trusty/stacklight/proxy.yml
@@ -0,0 +1,17 @@
+classes:
+- system.nginx.server.single
+- system.nginx.server.proxy.stacklight.grafana
+- system.nginx.server.proxy.stacklight.kibana
+- system.nginx.server.proxy.monitoring.prometheus_server
+- system.nginx.server.proxy.monitoring.prometheus_alertmanager
+- system.salt.minion.cert.proxy
+- cluster.virtual-mcp-mitaka-dvr-trusty
+parameters:
+ _param:
+ nginx_proxy_grafana_port: 15013
+ nginx_proxy_ssl:
+ enabled: true
+ authority: ${_param:salt_minion_ca_authority}
+ engine: salt
+ mode: secure
+ salt_minion_ca_host: cfg01.${_param:cluster_domain}
diff --git a/classes/cluster/virtual-mcp-mitaka-dvr-trusty/stacklight/server.yml b/classes/cluster/virtual-mcp-mitaka-dvr-trusty/stacklight/server.yml
new file mode 100644
index 0000000..12748d8
--- /dev/null
+++ b/classes/cluster/virtual-mcp-mitaka-dvr-trusty/stacklight/server.yml
@@ -0,0 +1,67 @@
+classes:
+- system.docker.host
+- system.linux.system.repo.influxdb
+- system.linux.system.repo.mcp.salt
+- system.linux.system.repo.mcp.apt_mirantis.elastic
+- system.linux.system.repo.mcp.apt_mirantis.kibana
+- system.linux.system.repo.docker
+- system.elasticsearch.server.cluster
+- system.elasticsearch.server.curator
+- system.kibana.server.single
+- system.haproxy.proxy.listen.stacklight.elasticsearch
+- system.haproxy.proxy.listen.stacklight.kibana
+- system.haproxy.proxy.listen.stacklight.influxdb_relay
+- service.haproxy.proxy.single
+- system.influxdb.relay.cluster
+- system.influxdb.server.single
+- system.influxdb.database.prometheus
+- system.influxdb.database.ceilometer
+- system.keepalived.cluster.instance.prometheus_server_vip
+- system.telegraf.agent.remote
+- system.prometheus.server.remote_write.docker
+- system.prometheus.server.alertmanager.dns
+- system.prometheus.server.target.dns
+- system.docker.swarm.stack.monitoring.prometheus_global
+- system.docker.swarm.stack.dashboard
+- cluster.virtual-mcp-mitaka-dvr-trusty
+parameters:
+ _param:
+ kibana_elasticsearch_host: ${_param:stacklight_monitor_address}
+ keepalived_prometheus_vip_address: ${_param:stacklight_monitor_address}
+ keepalived_prometheus_vip_password: 'password'
+ keepalived_prometheus_vip_interface: eth1
+ cluster_vip_address: ${_param:stacklight_monitor_address}
+ cluster_local_address: ${_param:single_address}
+ cluster_elasticsearch_port: 9200
+ cluster_kibana_port: 5601
+ cluster_node01_hostname: mon01
+ cluster_node01_address: ${_param:stacklight_monitor_node01_address}
+ cluster_node02_hostname: mon02
+ cluster_node02_address: ${_param:stacklight_monitor_node02_address}
+ cluster_node03_hostname: mon03
+ cluster_node03_address: ${_param:stacklight_monitor_node03_address}
+ docker_image_alertmanager: docker-prod-virtual.docker.mirantis.net/openstack-docker/alertmanager:latest
+ docker_image_pushgateway: docker-prod-virtual.docker.mirantis.net/openstack-docker/pushgateway:latest
+ docker_image_prometheus: docker-prod-virtual.docker.mirantis.net/openstack-docker/prometheus:latest
+ docker_image_remote_agent: docker-prod-virtual.docker.mirantis.net/openstack-docker/telegraf:latest
+ docker_image_remote_storage_adapter: docker-prod-virtual.docker.mirantis.net/openstack-docker/remote_storage_adapter:latest
+ docker_image_remote_collector: docker-prod-virtual.docker.mirantis.net/openstack-docker/heka:latest
+ docker_image_prometheus_relay: docker-prod-virtual.docker.mirantis.net/openstack-docker/prometheus_relay:latest
+ docker_image_grafana: grafana/grafana:5.0.3
+ influxdb_port: 8086
+ influxdb_admin_password: password
+ influxdb_stacklight_password: lmapass
+ prometheus_influxdb_url: "http://${_param:stacklight_monitor_address}:${_param:influxdb_port}/"
+ prometheus_influxdb_db: prometheus
+ prometheus_influxdb_username: lma
+ prometheus_influxdb_password: ${_param:influxdb_stacklight_password}
+ remote_collector_telegraf_host: monitoring_remote_agent
+ linux:
+ network:
+ interface:
+ eth1:
+ enabled: true
+ type: eth
+ proto: static
+ address: ${_param:single_address}
+ netmask: 255.255.255.0
diff --git a/classes/cluster/virtual-mcp-mitaka-dvr/infra/config.yml b/classes/cluster/virtual-mcp-mitaka-dvr/infra/config.yml
index 07eaa0f..977eea1 100644
--- a/classes/cluster/virtual-mcp-mitaka-dvr/infra/config.yml
+++ b/classes/cluster/virtual-mcp-mitaka-dvr/infra/config.yml
@@ -2,7 +2,7 @@
- service.git.client
- system.linux.system.single
- system.linux.system.repo.mcp.salt
-- system.linux.system.repo.mcp.openstack
+- system.linux.system.repo.mcp.apt_mirantis.openstack
- system.openssh.client.lab
- system.salt.master.pkg
- system.salt.master.api
@@ -24,11 +24,11 @@
- system.reclass.storage.system.openstack_dashboard_single
- system.reclass.storage.system.openstack_proxy_single
- system.reclass.storage.system.openstack_gateway_single
-- cluster.virtual-mcp-mitaka-dvr.openstack.proxy
-- cluster.virtual-mcp-mitaka-dvr.stacklight.proxy
- cluster.virtual-mcp-mitaka-dvr
parameters:
_param:
+ linux_system_codename: xenial
+ openstack_linux_system_codename: xenial
reclass_data_repository: https://gerrit.mcp.mirantis.net/salt-models/mcp-virtual-lab
reclass_data_revision: master
salt_master_environment_repository: "https://github.com/tcpcloud"
@@ -140,7 +140,6 @@
node_class:
value_template:
- cluster.<<node_cluster>>.openstack.dashboard
- - cluster.<<node_cluster>>.openstack.proxy
cluster_param:
openstack_proxy_node01_address:
value_template: <<node_control_ip>>
@@ -150,37 +149,46 @@
- service.galera.master.cluster
params:
mysql_cluster_role: master
- linux_system_codename: xenial
+ linux_system_codename: ${_param:openstack_linux_system_codename}
openstack_control_node02:
classes:
- service.galera.slave.cluster
params:
mysql_cluster_role: slave
- linux_system_codename: xenial
+ linux_system_codename: ${_param:openstack_linux_system_codename}
openstack_control_node03:
classes:
- service.galera.slave.cluster
params:
mysql_cluster_role: slave
- linux_system_codename: xenial
- stacklight_server_node01:
- classes:
- - system.influxdb.server.single
- - system.influxdb.database.stacklight
+ linux_system_codename: ${_param:openstack_linux_system_codename}
openstack_compute_node01:
params:
tenant_address: 10.1.0.105
external_address: 10.16.0.105
+ linux_system_codename: ${_param:openstack_linux_system_codename}
openstack_compute_node02:
params:
tenant_address: 10.1.0.106
external_address: 10.16.0.106
+ linux_system_codename: ${_param:openstack_linux_system_codename}
openstack_gateway_node01:
params:
tenant_address: 10.1.0.110
external_address: 10.16.0.110
+ linux_system_codename: ${_param:openstack_linux_system_codename}
openstack_proxy_node01:
- classes:
- - cluster.virtual-mcp-mitaka-dvr.openstack.proxy
params:
- linux_system_codename: xenial
+ linux_system_codename: ${_param:openstack_linux_system_codename}
+ stacklight_server_node01:
+ classes:
+ - system.influxdb.server.single
+ - system.influxdb.database.stacklight
+ params:
+ linux_system_codename: ${_param:openstack_linux_system_codename}
+ stacklight_server_node02:
+ params:
+ linux_system_codename: ${_param:openstack_linux_system_codename}
+ stacklight_server_node03:
+ params:
+ linux_system_codename: ${_param:openstack_linux_system_codename}
diff --git a/classes/cluster/virtual-mcp-mitaka-dvr/openstack/compute.yml b/classes/cluster/virtual-mcp-mitaka-dvr/openstack/compute.yml
index 9e41e85..d000096 100644
--- a/classes/cluster/virtual-mcp-mitaka-dvr/openstack/compute.yml
+++ b/classes/cluster/virtual-mcp-mitaka-dvr/openstack/compute.yml
@@ -1,5 +1,5 @@
classes:
-- system.linux.system.repo.mcp.openstack
+- system.linux.system.repo.mcp.apt_mirantis.openstack
- system.linux.system.repo.mcp.extra
- system.linux.system.repo.saltstack.xenial
- system.linux.network.hosts
@@ -15,7 +15,6 @@
tenant_interface: ens5
external_interface: ens6
interface_mtu: 1500
- linux_system_codename: xenial
neutron:
compute:
notification:
diff --git a/classes/cluster/virtual-mcp-mitaka-dvr/openstack/control.yml b/classes/cluster/virtual-mcp-mitaka-dvr/openstack/control.yml
index 1fac8c1..20c3b3d 100644
--- a/classes/cluster/virtual-mcp-mitaka-dvr/openstack/control.yml
+++ b/classes/cluster/virtual-mcp-mitaka-dvr/openstack/control.yml
@@ -2,7 +2,7 @@
- system.linux.system.lowmem
- system.linux.storage.loopback
- system.linux.system.repo.glusterfs
-- system.linux.system.repo.mcp.openstack
+- system.linux.system.repo.mcp.apt_mirantis.openstack
- system.linux.system.repo.mcp.extra
- system.linux.system.repo.saltstack.xenial
- system.memcached.server.single
diff --git a/classes/cluster/virtual-mcp-mitaka-dvr/openstack/dashboard.yml b/classes/cluster/virtual-mcp-mitaka-dvr/openstack/dashboard.yml
index 743aa63..6b484c5 100644
--- a/classes/cluster/virtual-mcp-mitaka-dvr/openstack/dashboard.yml
+++ b/classes/cluster/virtual-mcp-mitaka-dvr/openstack/dashboard.yml
@@ -1,10 +1,6 @@
classes:
-- system.linux.system.repo.ubuntu
-- system.linux.system.repo.mcp.openstack
-- system.linux.system.repo.mcp.extra
-- system.linux.system.repo.saltstack.xenial
- system.horizon.server.single
-- cluster.virtual-mcp-mitaka-dvr
+- system.linux.system.repo.saltstack.xenial
parameters:
_param:
horizon_site_branding: OpenStack Dashboard
diff --git a/classes/cluster/virtual-mcp-mitaka-dvr/openstack/gateway.yml b/classes/cluster/virtual-mcp-mitaka-dvr/openstack/gateway.yml
index d7d93e8..0717926 100644
--- a/classes/cluster/virtual-mcp-mitaka-dvr/openstack/gateway.yml
+++ b/classes/cluster/virtual-mcp-mitaka-dvr/openstack/gateway.yml
@@ -1,5 +1,5 @@
classes:
-- system.linux.system.repo.mcp.openstack
+- system.linux.system.repo.mcp.apt_mirantis.openstack
- system.linux.system.repo.mcp.extra
- system.linux.system.repo.saltstack.xenial
- system.linux.network.interface.single_ovs_dvr
@@ -13,7 +13,6 @@
interface_mtu: 9000
neutron_gateway_dvr: True
neutron_gateway_agent_mode: dvr_snat
- linux_system_codename: xenial
neutron:
gateway:
notification:
diff --git a/classes/cluster/virtual-mcp-mitaka-ovs-trusty/.env b/classes/cluster/virtual-mcp-mitaka-ovs-trusty/.env
new file mode 100644
index 0000000..49c1ca4
--- /dev/null
+++ b/classes/cluster/virtual-mcp-mitaka-ovs-trusty/.env
@@ -0,0 +1 @@
+EXTRA_FORMULAS="fluentd grafana heka nginx ntp prometheus rsyslog sphinx telegraf"
diff --git a/classes/cluster/virtual-mcp-mitaka-ovs-trusty/infra/config.yml b/classes/cluster/virtual-mcp-mitaka-ovs-trusty/infra/config.yml
new file mode 100644
index 0000000..89eba6c
--- /dev/null
+++ b/classes/cluster/virtual-mcp-mitaka-ovs-trusty/infra/config.yml
@@ -0,0 +1,202 @@
+classes:
+- service.git.client
+- system.linux.system.single
+- system.linux.system.repo.mcp.salt
+- system.linux.system.repo.mcp.apt_mirantis.openstack
+- system.openssh.client.lab
+- system.salt.master.pkg
+- system.salt.master.api
+- system.reclass.storage.salt
+- system.salt.minion.ca.salt_master
+- system.salt.minion.cert.proxy
+- system.sphinx.server.doc.reclass
+- system.keystone.client.core
+- system.keystone.client.service.ceilometer
+- system.keystone.client.service.designate
+- system.keystone.client.service.cinder
+- system.keystone.client.service.cinder2
+- system.keystone.client.service.cinder3
+- system.keystone.client.service.glance
+- system.keystone.client.service.glare
+- system.keystone.client.service.heat
+- system.keystone.client.service.heat-cfn
+- system.keystone.client.service.keystone
+- system.keystone.client.service.neutron
+- system.keystone.client.service.nova-ec2
+- system.keystone.client.service.nova21
+- system.keystone.client.service.nova-placement
+- system.mysql.client.single
+- system.reclass.storage.system.openstack_control_cluster
+- system.reclass.storage.system.stacklightv2_server_cluster
+- system.reclass.storage.system.openstack_compute_multi
+- system.reclass.storage.system.openstack_dashboard_single
+- system.reclass.storage.system.openstack_proxy_single
+- system.reclass.storage.system.openstack_gateway_single
+- cluster.virtual-mcp-mitaka-ovs-trusty
+parameters:
+ _param:
+ linux_system_codename: xenial
+ openstack_linux_system_codename: trusty
+ reclass_data_repository: https://gerrit.mcp.mirantis.net/salt-models/mcp-virtual-lab
+ reclass_data_revision: master
+ reclass_config_master: ${_param:infra_config_deploy_address}
+ single_address: ${_param:infra_config_address}
+ salt_master_host: 127.0.0.1
+ salt_master_base_environment: prd
+ salt_minion_ca_host: ${linux:network:fqdn}
+ salt_api_password_hash: "$6$sGnRlxGf$al5jMCetLP.vfI/fTl3Z0N7Za1aeiexL487jAtyRABVfT3NlwZxQGVhO7S1N8OwS/34VHYwZQA8lkXwKMN/GS1"
+ linux:
+ network:
+ interface:
+ ens4:
+ enabled: true
+ type: eth
+ proto: static
+ address: ${_param:single_address}
+ netmask: 255.255.255.0
+ nginx:
+ server:
+ site:
+ nginx_proxy_openstack_web:
+ proxy:
+ host: ${_param:openstack_proxy_address}
+ nginx_proxy_openstack_api_heat_cfn:
+ enabled: false
+ salt:
+ master:
+ reactor:
+ reclass/minion/classify:
+ - salt://reclass/reactor/node_register.sls
+ reclass:
+ storage:
+ class_mapping:
+ common_node:
+ expression: all
+ node_param:
+ single_address:
+ value_template: <<node_control_ip>>
+ linux_system_codename:
+ value_template: <<node_os>>
+ salt_master_host:
+ value_template: <<node_master_ip>>
+ infra_config:
+ expression: <<node_hostname>>__startswith__cfg
+ cluster_param:
+ infra_config_address:
+ value_template: <<node_control_ip>>
+ infra_config_deploy_address:
+ value_template: <<node_deploy_ip>>
+ cluster_domain:
+ value_template: <<node_domain>>
+ openstack_control01:
+ expression: <<node_hostname>>__equals__ctl01
+ cluster_param:
+ openstack_control_node01_address:
+ value_template: <<node_control_ip>>
+ openstack_control02:
+ expression: <<node_hostname>>__equals__ctl02
+ cluster_param:
+ openstack_control_node02_address:
+ value_template: <<node_control_ip>>
+ openstack_control03:
+ expression: <<node_hostname>>__equals__ctl03
+ cluster_param:
+ openstack_control_node03_address:
+ value_template: <<node_control_ip>>
+ openstack_compute:
+ expression: <<node_hostname>>__startswith__cmp
+ node_class:
+ value_template:
+ - cluster.<<node_cluster>>.openstack.compute
+ node_param:
+ tenant_address:
+ value_template: <<node_tenant_ip>>
+ external_address:
+ value_template: <<node_external_ip>>
+ openstack_gateway:
+ expression: <<node_hostname>>__startswith__gtw
+ node_class:
+ value_template:
+ - cluster.<<node_cluster>>.openstack.gateway
+ node_param:
+ tenant_address:
+ value_template: <<node_tenant_ip>>
+ external_address:
+ value_template: <<node_external_ip>>
+ cluster_param:
+ openstack_gateway_node01_address:
+ value_template: <<node_control_ip>>
+ stacklight_monitor_node01:
+ expression: <<node_hostname>>__equals__mon01
+ cluster_param:
+ stacklight_monitor_node01_address:
+ value_template: <<node_control_ip>>
+ stacklight_monitor_node02:
+ expression: <<node_hostname>>__equals__mon02
+ cluster_param:
+ stacklight_monitor_node02_address:
+ value_template: <<node_control_ip>>
+ stacklight_monitor_node03:
+ expression: <<node_hostname>>__equals__mon03
+ cluster_param:
+ stacklight_monitor_node03_address:
+ value_template: <<node_control_ip>>
+ openstack_dashboard:
+ expression: <<node_hostname>>__startswith__prx
+ node_class:
+ value_template:
+ - cluster.<<node_cluster>>.openstack.dashboard
+ cluster_param:
+ openstack_proxy_node01_address:
+ value_template: <<node_control_ip>>
+ node:
+ openstack_control_node01:
+ classes:
+ - service.galera.master.cluster
+ params:
+ mysql_cluster_role: master
+ linux_system_codename: ${_param:openstack_linux_system_codename}
+ openstack_control_node02:
+ classes:
+ - service.galera.slave.cluster
+ params:
+ mysql_cluster_role: slave
+ linux_system_codename: ${_param:openstack_linux_system_codename}
+ openstack_control_node03:
+ classes:
+ - service.galera.slave.cluster
+ params:
+ mysql_cluster_role: slave
+ linux_system_codename: ${_param:openstack_linux_system_codename}
+ openstack_compute_node01:
+ params:
+ tenant_address: 10.1.0.105
+ external_address: 10.16.0.105
+ linux_system_codename: ${_param:openstack_linux_system_codename}
+ openstack_compute_node02:
+ params:
+ tenant_address: 10.1.0.106
+ external_address: 10.16.0.106
+ linux_system_codename: ${_param:openstack_linux_system_codename}
+ openstack_gateway_node01:
+ params:
+ tenant_address: 10.1.0.110
+ external_address: 10.16.0.110
+ linux_system_codename: ${_param:openstack_linux_system_codename}
+ openstack_proxy_node01:
+ classes:
+ - cluster.virtual-mcp-mitaka-ovs-trusty.openstack.proxy
+ params:
+ linux_system_codename: ${_param:openstack_linux_system_codename}
+ stacklight_server_node01:
+ classes:
+ - system.influxdb.server.single
+ - system.influxdb.database.stacklight
+ params:
+ linux_system_codename: ${_param:openstack_linux_system_codename}
+ stacklight_server_node02:
+ params:
+ linux_system_codename: ${_param:openstack_linux_system_codename}
+ stacklight_server_node03:
+ params:
+ linux_system_codename: ${_param:openstack_linux_system_codename}
diff --git a/classes/cluster/virtual-mcp-mitaka-ovs-trusty/infra/init.yml b/classes/cluster/virtual-mcp-mitaka-ovs-trusty/infra/init.yml
new file mode 100644
index 0000000..1032ef5
--- /dev/null
+++ b/classes/cluster/virtual-mcp-mitaka-ovs-trusty/infra/init.yml
@@ -0,0 +1,22 @@
+parameters:
+ _jenkins:
+ tests_enabled: false
+ _param:
+ cluster_domain: virtual-mcp-mitaka-ovs-trusty.local
+ cluster_name: virtual-mcp-mitaka-ovs-trusty
+ infra_config_hostname: cfg01
+ infra_config_deploy_address: 192.168.10.90
+ infra_config_address: 172.16.10.90
+ linux:
+ network:
+ host:
+ cfg01:
+ address: ${_param:infra_config_address}
+ names:
+ - ${_param:infra_config_hostname}
+ - ${_param:infra_config_hostname}.${_param:cluster_domain}
+ cfg:
+ address: ${_param:infra_config_address}
+ names:
+ - cfg
+ - cfg.${_param:cluster_domain}
diff --git a/classes/cluster/virtual-mcp-mitaka-ovs-trusty/init.yml b/classes/cluster/virtual-mcp-mitaka-ovs-trusty/init.yml
new file mode 100644
index 0000000..4312c7d
--- /dev/null
+++ b/classes/cluster/virtual-mcp-mitaka-ovs-trusty/init.yml
@@ -0,0 +1,23 @@
+classes:
+- system.linux.network.dynamic_hosts
+- service.grafana.collector
+- system.fluentd
+- system.fluentd.label.default_metric
+- system.fluentd.label.default_metric.prometheus
+- system.fluentd.label.default_output.elasticsearch
+- system.fluentd.label.default_output.drop_event
+- system.linux.system.repo.mcp.extra
+- system.linux.system.repo.mcp.apt_mirantis.fluentd
+- system.linux.system.repo.mcp.apt_mirantis.openstack
+- system.linux.system.single
+- system.rsyslog.client.single
+- system.openssh.server.team.lab
+- system.openssh.server.team.tcpcloud
+- system.openssh.server.team.stacklight
+- system.openssh.server.team.mcp_qa
+- system.prometheus.collector
+- system.telegraf.agent
+- cluster.virtual-mcp-mitaka-ovs-trusty.infra
+- cluster.virtual-mcp-mitaka-ovs-trusty.openstack
+- cluster.virtual-mcp-mitaka-ovs-trusty.stacklight
+- cluster.overrides
diff --git a/classes/cluster/virtual-mcp-mitaka-ovs-trusty/openstack/compute.yml b/classes/cluster/virtual-mcp-mitaka-ovs-trusty/openstack/compute.yml
new file mode 100644
index 0000000..7646ca0
--- /dev/null
+++ b/classes/cluster/virtual-mcp-mitaka-ovs-trusty/openstack/compute.yml
@@ -0,0 +1,69 @@
+classes:
+- system.linux.system.repo.mcp.apt_mirantis.openstack
+- system.linux.system.repo.mcp.extra
+- system.linux.system.repo.saltstack.trusty
+- system.linux.network.hosts
+- system.nova.compute.cluster
+- system.neutron.compute.cluster
+- system.heka.alarm.openstack_compute
+- system.prometheus.exporters.libvirt
+- cluster.virtual-mcp-mitaka-ovs-trusty
+parameters:
+ _param:
+ primary_interface: eth1
+ tenant_interface: eth2
+ external_interface: eth3
+ interface_mtu: 1500
+ nova:
+ compute:
+ vncproxy_url: http://${_param:cluster_vip_address}:6080
+ notification:
+ driver: messagingv2
+ topics: "notifications,${_param:stacklight_notification_topic}"
+ notify_on:
+ state_change: vm_and_task_state
+ message_queue:
+ members:
+ - host: ${_param:openstack_control_node01_address}
+ - host: ${_param:openstack_control_node02_address}
+ - host: ${_param:openstack_control_node03_address}
+ linux:
+ network:
+ bridge: openvswitch
+ interface:
+ dhcp_int:
+ enabled: true
+ name: eth0
+ proto: dhcp
+ type: eth
+ mtu: ${_param:interface_mtu}
+ primary_interface:
+ enabled: true
+ ipflush_onchange: true
+ name: ${_param:primary_interface}
+ mtu: ${_param:interface_mtu}
+ proto: manual
+ type: eth
+ tenant_interface:
+ enabled: true
+ ipflush_onchange: true
+ name: ${_param:tenant_interface}
+ mtu: ${_param:interface_mtu}
+ proto: manual
+ type: eth
+ br-mgmt:
+ enabled: true
+ type: bridge
+ proto: static
+ address: ${_param:single_address}
+ netmask: 255.255.255.0
+ use_interfaces:
+ - ${_param:primary_interface}
+ br-mesh:
+ enabled: true
+ type: bridge
+ proto: static
+ address: ${_param:tenant_address}
+ netmask: 255.255.255.0
+ use_interfaces:
+ - ${_param:tenant_interface}
diff --git a/classes/cluster/virtual-mcp-mitaka-ovs-trusty/openstack/control.yml b/classes/cluster/virtual-mcp-mitaka-ovs-trusty/openstack/control.yml
new file mode 100644
index 0000000..bfe22fc
--- /dev/null
+++ b/classes/cluster/virtual-mcp-mitaka-ovs-trusty/openstack/control.yml
@@ -0,0 +1,157 @@
+classes:
+- system.linux.system.lowmem
+- system.linux.storage.loopback
+- system.linux.system.repo.glusterfs
+- system.linux.system.repo.mcp.apt_mirantis.openstack
+- system.linux.system.repo.mcp.extra
+- system.linux.system.repo.saltstack.trusty
+- system.memcached.server.single
+- system.rabbitmq.server.cluster
+- system.rabbitmq.server.vhost.openstack
+- system.keystone.server.wsgi
+- system.keystone.server.cluster
+- system.glusterfs.client.cluster
+- system.glusterfs.client.volume.glance
+- system.glusterfs.client.volume.keystone
+- system.glusterfs.server.volume.glance
+- system.glusterfs.server.volume.keystone
+- system.glusterfs.server.cluster
+- system.glance.control.cluster
+- system.heka.ceilometer_collector.single
+- system.nova.control.cluster
+- system.neutron.control.openvswitch.cluster
+- system.cinder.control.cluster
+- system.cinder.control.backend.lvm
+- system.cinder.volume.single
+- system.cinder.volume.backend.lvm
+- system.heat.server.cluster
+- system.designate.server.cluster
+- system.designate.server.backend.bind
+- system.bind.server.single
+- system.galera.server.cluster
+- system.galera.server.database.ceilometer
+- system.galera.server.database.cinder
+- system.galera.server.database.glance
+- system.galera.server.database.grafana
+- system.galera.server.database.heat
+- system.galera.server.database.keystone
+- system.galera.server.database.nova
+- system.galera.server.database.designate
+- cluster.virtual-mcp-mitaka-ovs-trusty
+
+parameters:
+ _param:
+ keepalived_vip_interface: eth1
+ linux:
+ system:
+ package:
+ python-msgpack:
+ version: latest
+ network:
+ interface:
+ eth1:
+ enabled: true
+ type: eth
+ proto: static
+ address: ${_param:single_address}
+ netmask: 255.255.255.0
+ keepalived:
+ cluster:
+ instance:
+ VIP:
+ virtual_router_id: 150
+ keystone:
+ server:
+ admin_email: ${_param:admin_email}
+ notification:
+ driver: messagingv2
+ topics: "notifications,${_param:stacklight_notification_topic}"
+ glance:
+ server:
+ storage:
+ engine: file
+ images: []
+ workers: 1
+ notification:
+ driver: messagingv2
+ topics: "notifications,${_param:stacklight_notification_topic}"
+ heat:
+ server:
+ notification:
+ driver: messagingv2
+ topics: "notifications,${_param:stacklight_notification_topic}"
+ neutron:
+ server:
+ notification:
+ driver: messagingv2
+ topics: "notifications,${_param:stacklight_notification_topic}"
+ nova:
+ controller:
+ networking: dvr
+ cpu_allocation: 54
+ metadata:
+ password: ${_param:metadata_password}
+ bind:
+ private_address: ${_param:cluster_local_address}
+ public_address: ${_param:cluster_vip_address}
+ novncproxy_port: 6080
+ vncproxy_url: http://${_param:cluster_vip_address}:6080
+ workers: 1
+ notification:
+ driver: messagingv2
+ topics: "notifications,${_param:stacklight_notification_topic}"
+ cinder:
+ volume:
+ notification:
+ driver: messagingv2
+ topics: "notifications,${_param:stacklight_notification_topic}"
+ controller:
+ notification:
+ driver: messagingv2
+ topics: "notifications,${_param:stacklight_notification_topic}"
+ bind:
+ server:
+ control:
+ mgmt:
+ enabled: true
+ bind:
+ address: ${_param:single_address}
+ port: 953
+ allow:
+ - ${_param:openstack_control_node01_address}
+ - ${_param:openstack_control_node02_address}
+ - ${_param:openstack_control_node03_address}
+ keys:
+ - designate
+ designate:
+ server:
+ pools:
+ default:
+ description: 'test pool'
+ targets:
+ default:
+ description: 'test target1'
+ default1:
+ type: ${_param:designate_pool_target_type}
+ description: 'test target2'
+ masters: ${_param:designate_pool_target_masters}
+ options:
+ host: ${_param:openstack_control_node02_address}
+ port: 53
+ rndc_host: ${_param:openstack_control_node02_address}
+ rndc_port: 953
+ rndc_key_file: /etc/designate/rndc.key
+ default2:
+ type: ${_param:designate_pool_target_type}
+ description: 'test target3'
+ masters: ${_param:designate_pool_target_masters}
+ options:
+ host: ${_param:openstack_control_node03_address}
+ port: 53
+ rndc_host: ${_param:openstack_control_node03_address}
+ rndc_port: 953
+ rndc_key_file: /etc/designate/rndc.key
+ quota:
+ zones: ${_param:designate_quota_zones}
+ worker:
+ enabled: ${_param:designate_worker_enabled}
\ No newline at end of file
diff --git a/classes/cluster/virtual-mcp-mitaka-ovs-trusty/openstack/dashboard.yml b/classes/cluster/virtual-mcp-mitaka-ovs-trusty/openstack/dashboard.yml
new file mode 100644
index 0000000..177b577
--- /dev/null
+++ b/classes/cluster/virtual-mcp-mitaka-ovs-trusty/openstack/dashboard.yml
@@ -0,0 +1,15 @@
+classes:
+- system.horizon.server.single
+- system.linux.system.repo.saltstack.trusty
+parameters:
+ _param:
+ horizon_site_branding: OpenStack Dashboard
+ linux:
+ network:
+ interface:
+ eth1:
+ enabled: true
+ type: eth
+ proto: static
+ address: ${_param:single_address}
+ netmask: 255.255.255.0
diff --git a/classes/cluster/virtual-mcp-mitaka-ovs-trusty/openstack/gateway.yml b/classes/cluster/virtual-mcp-mitaka-ovs-trusty/openstack/gateway.yml
new file mode 100644
index 0000000..0aa1032
--- /dev/null
+++ b/classes/cluster/virtual-mcp-mitaka-ovs-trusty/openstack/gateway.yml
@@ -0,0 +1,80 @@
+classes:
+- system.linux.system.repo.mcp.apt_mirantis.openstack
+- system.linux.system.repo.mcp.extra
+- system.linux.system.repo.saltstack.trusty
+- system.neutron.gateway.cluster
+- cluster.virtual-mcp-mitaka-ovs-trusty
+parameters:
+ _param:
+ primary_interface: eth1
+ tenant_interface: eth2
+ external_interface: eth3
+ interface_mtu: 9000
+ linux:
+ network:
+ bridge: openvswitch
+ interface:
+ dhcp_int:
+ enabled: true
+ name: eth0
+ proto: dhcp
+ type: eth
+ mtu: ${_param:interface_mtu}
+ primary_interface:
+ enabled: true
+ ipflush_onchange: true
+ name: ${_param:primary_interface}
+ mtu: ${_param:interface_mtu}
+ proto: manual
+ type: eth
+ tenant_interface:
+ enabled: true
+ ipflush_onchange: true
+ name: ${_param:tenant_interface}
+ mtu: ${_param:interface_mtu}
+ proto: manual
+ type: eth
+ external_interface:
+ enabled: true
+ ipflush_onchange: true
+ name: ${_param:external_interface}
+ mtu: ${_param:interface_mtu}
+ proto: manual
+ type: eth
+ br-floating:
+ enabled: true
+ type: ovs_bridge
+ mtu: ${_param:interface_mtu}
+ br-mgmt:
+ enabled: true
+ type: bridge
+ proto: static
+ address: ${_param:single_address}
+ netmask: 255.255.255.0
+ mtu: ${_param:interface_mtu}
+ use_interfaces:
+ - ${_param:primary_interface}
+ br-mesh:
+ enabled: true
+ type: bridge
+ mtu: ${_param:interface_mtu}
+ proto: static
+ address: ${_param:tenant_address}
+ netmask: 255.255.255.0
+ use_interfaces:
+ - ${_param:tenant_interface}
+ float-to-ex:
+ enabled: true
+ type: ovs_port
+ mtu: ${_param:interface_mtu}
+ bridge: br-floating
+ br-ex:
+ enabled: true
+ type: bridge
+ mtu: ${_param:interface_mtu}
+ address: ${_param:external_address}
+ netmask: 255.255.255.0
+ use_interfaces:
+ - ${_param:external_interface}
+ use_ovs_ports:
+ - float-to-ex
diff --git a/classes/cluster/virtual-mcp-mitaka-ovs-trusty/openstack/init.yml b/classes/cluster/virtual-mcp-mitaka-ovs-trusty/openstack/init.yml
new file mode 100644
index 0000000..e0cf2f1
--- /dev/null
+++ b/classes/cluster/virtual-mcp-mitaka-ovs-trusty/openstack/init.yml
@@ -0,0 +1,207 @@
+parameters:
+ _param:
+ openstack_proxy_hostname: prx
+ openstack_proxy_address: ${_param:openstack_proxy_node01_address}
+ openstack_proxy_node01_hostname: prx01
+ openstack_proxy_node01_address: 172.16.10.121
+ openstack_control_hostname: ctl
+ openstack_control_node01_hostname: ctl01
+ openstack_control_node02_hostname: ctl02
+ openstack_control_node03_hostname: ctl03
+ openstack_control_address: 172.16.10.254
+ openstack_control_node01_address: 172.16.10.91
+ openstack_control_node02_address: 172.16.10.92
+ openstack_control_node03_address: 172.16.10.93
+ openstack_gateway_hostname: gtw
+ openstack_gateway_address: ${_param:openstack_gateway_node01_address}
+ openstack_gateway_node01_hostname: gtw01
+ openstack_gateway_node01_address: 172.16.10.94
+ openstack_compute_node01_hostname: cmp01
+ openstack_compute_node02_hostname: cmp02
+ openstack_compute_node01_address: 172.16.10.95
+ openstack_compute_node02_address: 172.16.10.96
+ openstack_database_address: ${_param:openstack_control_address}
+ openstack_message_queue_address: ${_param:openstack_control_address}
+ openstack_message_queue_node01_address: ${_param:openstack_control_node01_address}
+ openstack_message_queue_node02_address: ${_param:openstack_control_node02_address}
+ openstack_message_queue_node03_address: ${_param:openstack_control_node03_address}
+
+ openstack_version: mitaka
+ apt_mk_version: nightly
+ mcp_repo_version: 1.1
+ openstack_region: RegionOne
+ admin_email: root@localhost
+ cluster_public_protocol: http
+ cluster_public_host: 172.16.10.254
+ neutron_public_protocol: http
+ neutron_control_dvr: False
+ neutron_tenant_network_types: "flat,vxlan"
+ neutron_l3_ha: False
+ neutron_global_physnet_mtu: 1500
+ neutron_external_mtu: 1500
+ neutron_gateway_dvr: False
+ neutron_gateway_agent_mode: legacy
+ neutron_compute_dvr: False
+ neutron_compute_agent_mode: legacy
+ neutron_compute_external_access: False
+ galera_server_cluster_name: openstack_cluster
+ galera_server_maintenance_password: workshop
+ galera_server_admin_password: workshop
+ cluster_vip_address: ${_param:openstack_control_address}
+ cluster_local_address: ${_param:single_address}
+ cluster_node01_hostname: ${_param:openstack_control_node01_hostname}
+ cluster_node01_address: ${_param:openstack_control_node01_address}
+ cluster_node02_hostname: ${_param:openstack_control_node02_hostname}
+ cluster_node02_address: ${_param:openstack_control_node02_address}
+ cluster_node03_hostname: ${_param:openstack_control_node03_hostname}
+ cluster_node03_address: ${_param:openstack_control_node03_address}
+ rabbitmq_secret_key: workshop
+ rabbitmq_admin_password: workshop
+ rabbitmq_openstack_password: workshop
+ rabbitmq_cold_password: workshop
+ designate_admin_api_enabled: true
+ designate_bind9_rndc_key: 4pc+X4PDqb2q+5o72dISm72LM1Ds9X2EYZjqg+nmsS7FhdTwzFFY8l/iEDmHxnyjkA33EQC8H+z0fLLBunoitw==
+ designate_domain_id: 5186883b-91fb-4891-bd49-e6769234a8fc
+ designate_quota_zones: 40
+ designate_pool_ns_records:
+ - hostname: 'ns1.example.org.'
+ priority: 10
+ designate_pool_nameservers:
+ - host: ${_param:openstack_control_node01_address}
+ port: 53
+ - host: ${_param:openstack_control_node02_address}
+ port: 53
+ - host: ${_param:openstack_control_node03_address}
+ port: 53
+ designate_pool_target_type: bind9
+ designate_pool_target_masters:
+ - host: ${_param:openstack_control_node01_address}
+ port: 5354
+ - host: ${_param:openstack_control_node02_address}
+ port: 5354
+ - host: ${_param:openstack_control_node03_address}
+ port: 5354
+ designate_pool_target_options:
+ host: ${_param:openstack_control_node01_address}
+ port: 53
+ rndc_host: ${_param:openstack_control_node01_address}
+ rndc_port: 953
+ rndc_key_file: /etc/designate/rndc.key
+ designate_version: ${_param:openstack_version}
+ designate_worker_enabled: false
+ glance_version: ${_param:openstack_version}
+ glance_service_host: ${_param:cluster_vip_address}
+ keystone_version: ${_param:openstack_version}
+ keystone_service_host: ${_param:cluster_vip_address}
+ heat_version: ${_param:openstack_version}
+ heat_service_host: ${_param:cluster_vip_address}
+ heat_domain_admin_password: workshop
+ ceilometer_version: ${_param:openstack_version}
+ ceilometer_service_host: ${_param:cluster_vip_address}
+ cinder_version: ${_param:openstack_version}
+ cinder_service_host: ${_param:cluster_vip_address}
+ ceilometer_graphite_publisher_host: 172.16.10.107
+ ceilometer_graphite_publisher_port: 2013
+ nova_version: ${_param:openstack_version}
+ nova_service_host: ${_param:cluster_vip_address}
+ nova_vncproxy_url: http://${_param:cluster_vip_address}:8060
+ neutron_version: ${_param:openstack_version}
+ neutron_service_host: ${_param:cluster_vip_address}
+ glusterfs_service_host: ${_param:cluster_vip_address}
+ designate_service_host: ${_param:cluster_vip_address}
+ metadata_password: workshop
+ mysql_admin_user: root
+ mysql_admin_password: workshop
+ mysql_cinder_password: workshop
+ mysql_ceilometer_password: workshop
+ mysql_glance_password: workshop
+ mysql_grafana_password: workshop
+ mysql_heat_password: workshop
+ mysql_keystone_password: workshop
+ mysql_neutron_password: workshop
+ mysql_nova_password: workshop
+ mysql_aodh_password: workshop
+ mysql_designate_password: workshop
+ keystone_service_token: workshop
+ keystone_admin_password: workshop
+ keystone_ceilometer_password: workshop
+ keystone_cinder_password: workshop
+ keystone_glance_password: workshop
+ keystone_heat_password: workshop
+ keystone_keystone_password: workshop
+ keystone_neutron_password: workshop
+ keystone_nova_password: workshop
+ keystone_designate_password: workshop
+ ceilometer_secret_key: workshop
+ horizon_version: ${_param:openstack_version}
+ horizon_secret_key: opaesee8Que2yahJoh9fo0eefo1Aeyo6ahyei8zeiboh3aeth5loth7ieNa5xi5e
+ horizon_identity_host: ${_param:cluster_vip_address}
+ horizon_identity_encryption: none
+ horizon_identity_version: 2
+ mongodb_server_replica_set: ceilometer
+ mongodb_ceilometer_password: cloudlab
+ mongodb_admin_password: cloudlab
+ mongodb_shared_key: eoTh1AwahlahqueingeejooLughah4tei9feing0eeVaephooDi2li1TaeV1ooth
+ loopback_device_size: 20
+ ceilometer_influxdb_password: lmapass
+ openstack_log_appender: true
+ openstack_fluentd_handler_enabled: true
+ linux:
+ network:
+ purge_hosts: true
+ host:
+ prx:
+ address: ${_param:openstack_proxy_address}
+ names:
+ - ${_param:openstack_proxy_hostname}
+ - ${_param:openstack_proxy_hostname}.${_param:cluster_domain}
+ prx01:
+ address: ${_param:openstack_proxy_node01_address}
+ names:
+ - ${_param:openstack_proxy_node01_hostname}
+ - ${_param:openstack_proxy_node01_hostname}.${_param:cluster_domain}
+ ctl:
+ address: ${_param:openstack_control_address}
+ names:
+ - ${_param:openstack_control_hostname}
+ - ${_param:openstack_control_hostname}.${_param:cluster_domain}
+ ctl01:
+ address: ${_param:openstack_control_node01_address}
+ names:
+ - ${_param:openstack_control_node01_hostname}
+ - ${_param:openstack_control_node01_hostname}.${_param:cluster_domain}
+ ctl02:
+ address: ${_param:openstack_control_node02_address}
+ names:
+ - ${_param:openstack_control_node02_hostname}
+ - ${_param:openstack_control_node02_hostname}.${_param:cluster_domain}
+ ctl03:
+ address: ${_param:openstack_control_node03_address}
+ names:
+ - ${_param:openstack_control_node03_hostname}
+ - ${_param:openstack_control_node03_hostname}.${_param:cluster_domain}
+ gtw:
+ address: ${_param:openstack_gateway_address}
+ names:
+ - ${_param:openstack_gateway_hostname}
+ - ${_param:openstack_gateway_hostname}.${_param:cluster_domain}
+ gtw01:
+ address: ${_param:openstack_gateway_address}
+ names:
+ - ${_param:openstack_gateway_hostname}
+ - ${_param:openstack_gateway_hostname}.${_param:cluster_domain}
+ cmp01:
+ address: ${_param:openstack_compute_node01_address}
+ names:
+ - ${_param:openstack_compute_node01_hostname}
+ - ${_param:openstack_compute_node01_hostname}.${_param:cluster_domain}
+ cmp02:
+ address: ${_param:openstack_compute_node02_address}
+ names:
+ - ${_param:openstack_compute_node02_hostname}
+ - ${_param:openstack_compute_node02_hostname}.${_param:cluster_domain}
+ system:
+ user:
+ root:
+ name: root
+ password: false
diff --git a/classes/cluster/virtual-mcp-mitaka-ovs-trusty/openstack/proxy.yml b/classes/cluster/virtual-mcp-mitaka-ovs-trusty/openstack/proxy.yml
new file mode 100644
index 0000000..64f6c6a
--- /dev/null
+++ b/classes/cluster/virtual-mcp-mitaka-ovs-trusty/openstack/proxy.yml
@@ -0,0 +1,15 @@
+classes:
+- system.nginx.server.single
+- system.nginx.server.proxy.openstack_api
+- system.nginx.server.proxy.openstack_vnc
+- system.nginx.server.proxy.openstack_web
+- system.salt.minion.cert.proxy
+- cluster.virtual-mcp-mitaka-ovs-trusty
+parameters:
+ _param:
+ nginx_proxy_ssl:
+ enabled: true
+ authority: ${_param:salt_minion_ca_authority}
+ engine: salt
+ mode: secure
+ salt_minion_ca_host: cfg01.${_param:cluster_domain}
\ No newline at end of file
diff --git a/classes/cluster/virtual-mcp-mitaka-ovs-trusty/stacklight/client.yml b/classes/cluster/virtual-mcp-mitaka-ovs-trusty/stacklight/client.yml
new file mode 100644
index 0000000..4988908
--- /dev/null
+++ b/classes/cluster/virtual-mcp-mitaka-ovs-trusty/stacklight/client.yml
@@ -0,0 +1,21 @@
+classes:
+- system.docker.client
+- system.elasticsearch.client.single
+- system.grafana.client
+- system.grafana.client.datasource.prometheus
+- system.kibana.client.single
+parameters:
+ _param:
+ # Elasticsearch/Kibana client parameters
+ stacklight_log_address: ${_param:stacklight_monitor_address}
+ # Grafana client parameters
+ grafana_address: ${_param:stacklight_monitor_address}
+ grafana_port: 15013
+ grafana_user: admin
+ grafana_password: ${_param:grafana_admin_password}
+ grafana_prometheus_address: ${_param:stacklight_monitor_address}
+ grafana_prometheus_port: 15016
+
+ cluster_node01_address: ${_param:stacklight_monitor_node01_address}
+ cluster_node02_address: ${_param:stacklight_monitor_node02_address}
+ cluster_node03_address: ${_param:stacklight_monitor_node03_address}
diff --git a/classes/cluster/virtual-mcp-mitaka-ovs-trusty/stacklight/init.yml b/classes/cluster/virtual-mcp-mitaka-ovs-trusty/stacklight/init.yml
new file mode 100644
index 0000000..68c0524
--- /dev/null
+++ b/classes/cluster/virtual-mcp-mitaka-ovs-trusty/stacklight/init.yml
@@ -0,0 +1,42 @@
+parameters:
+ _param:
+ stacklight_monitor_address: 172.16.10.253
+ stacklight_monitor_node01_address: 172.16.10.100
+ stacklight_monitor_node02_address: 172.16.10.101
+ stacklight_monitor_node03_address: 172.16.10.102
+ stacklight_log_address: ${_param:stacklight_monitor_address}
+ stacklight_telemetry_address: ${_param:stacklight_monitor_address}
+ stacklight_telemetry_node01_address: ${_param:stacklight_monitor_node01_address}
+ prometheus_control_address: ${_param:stacklight_monitor_address}
+ heka_elasticsearch_host: ${_param:stacklight_monitor_address}
+ elasticsearch_port: 9200
+ stacklight_environment: ${_param:cluster_domain}
+ stacklight_notification_topic: stacklight_notifications
+ grafana_admin_password: admin
+ grafana_database_type: mysql
+ grafana_database_host: ${_param:openstack_database_address}
+ grafana_database_password: ${_param:mysql_grafana_password}
+ fluentd_elasticsearch_host: ${_param:stacklight_log_address}
+ linux:
+ network:
+ host:
+ mon:
+ address: ${_param:stacklight_monitor_address}
+ names:
+ - mon
+ - mon.${_param:cluster_domain}
+ mon01:
+ address: ${_param:stacklight_monitor_node01_address}
+ names:
+ - mon01
+ - mon01.${_param:cluster_domain}
+ mon02:
+ address: ${_param:stacklight_monitor_node02_address}
+ names:
+ - mon02
+ - mon02.${_param:cluster_domain}
+ mon03:
+ address: ${_param:stacklight_monitor_node03_address}
+ names:
+ - mon03
+ - mon03.${_param:cluster_domain}
diff --git a/classes/cluster/virtual-mcp-mitaka-ovs-trusty/stacklight/proxy.yml b/classes/cluster/virtual-mcp-mitaka-ovs-trusty/stacklight/proxy.yml
new file mode 100644
index 0000000..f09a263
--- /dev/null
+++ b/classes/cluster/virtual-mcp-mitaka-ovs-trusty/stacklight/proxy.yml
@@ -0,0 +1,17 @@
+classes:
+- system.nginx.server.single
+- system.nginx.server.proxy.stacklight.grafana
+- system.nginx.server.proxy.stacklight.kibana
+- system.nginx.server.proxy.monitoring.prometheus_server
+- system.nginx.server.proxy.monitoring.prometheus_alertmanager
+- system.salt.minion.cert.proxy
+- cluster.virtual-mcp-mitaka-ovs-trusty
+parameters:
+ _param:
+ nginx_proxy_grafana_port: 15013
+ nginx_proxy_ssl:
+ enabled: true
+ authority: ${_param:salt_minion_ca_authority}
+ engine: salt
+ mode: secure
+ salt_minion_ca_host: cfg01.${_param:cluster_domain}
diff --git a/classes/cluster/virtual-mcp-mitaka-ovs-trusty/stacklight/server.yml b/classes/cluster/virtual-mcp-mitaka-ovs-trusty/stacklight/server.yml
new file mode 100644
index 0000000..2202580
--- /dev/null
+++ b/classes/cluster/virtual-mcp-mitaka-ovs-trusty/stacklight/server.yml
@@ -0,0 +1,73 @@
+classes:
+- system.docker.host
+- system.linux.system.repo.influxdb
+- system.linux.system.repo.mcp.salt
+- system.linux.system.repo.mcp.apt_mirantis.elastic
+- system.linux.system.repo.mcp.apt_mirantis.kibana
+- system.linux.system.repo.docker
+- system.heka.remote_collector.container
+- system.heka.remote_collector.input.amqp
+- system.heka.remote_collector.output.elasticsearch
+- system.heka.remote_collector.output.telegraf
+- system.elasticsearch.server.cluster
+- system.elasticsearch.server.curator
+- system.kibana.server.single
+- system.haproxy.proxy.listen.stacklight.elasticsearch
+- system.haproxy.proxy.listen.stacklight.kibana
+- system.haproxy.proxy.listen.stacklight.influxdb_relay
+- service.haproxy.proxy.single
+- system.influxdb.relay.cluster
+- system.influxdb.server.single
+- system.influxdb.database.prometheus
+- system.influxdb.database.ceilometer
+- system.keepalived.cluster.instance.prometheus_server_vip
+- system.telegraf.agent.remote
+- system.prometheus.server.remote_write.docker
+- system.prometheus.server.alertmanager.dns
+- system.prometheus.server.target.dns
+- system.docker.swarm.stack.monitoring.prometheus_global
+- system.docker.swarm.stack.monitoring.remote_collector
+- system.docker.swarm.stack.dashboard
+- cluster.virtual-mcp-mitaka-ovs-trusty
+parameters:
+ _param:
+ heka_amqp_host: ${_param:openstack_control_address}
+ kibana_elasticsearch_host: ${_param:stacklight_monitor_address}
+ keepalived_prometheus_vip_address: ${_param:stacklight_monitor_address}
+ keepalived_prometheus_vip_password: 'password'
+ keepalived_prometheus_vip_interface: eth1
+ cluster_vip_address: ${_param:stacklight_monitor_address}
+ cluster_local_address: ${_param:single_address}
+ cluster_elasticsearch_port: 9200
+ cluster_kibana_port: 5601
+ cluster_node01_hostname: mon01
+ cluster_node01_address: ${_param:stacklight_monitor_node01_address}
+ cluster_node02_hostname: mon02
+ cluster_node02_address: ${_param:stacklight_monitor_node02_address}
+ cluster_node03_hostname: mon03
+ cluster_node03_address: ${_param:stacklight_monitor_node03_address}
+ docker_image_alertmanager: docker-prod-virtual.docker.mirantis.net/openstack-docker/alertmanager:latest
+ docker_image_pushgateway: docker-prod-virtual.docker.mirantis.net/openstack-docker/pushgateway:latest
+ docker_image_prometheus: docker-prod-virtual.docker.mirantis.net/openstack-docker/prometheus:latest
+ docker_image_remote_agent: docker-prod-virtual.docker.mirantis.net/openstack-docker/telegraf:latest
+ docker_image_remote_storage_adapter: docker-prod-virtual.docker.mirantis.net/openstack-docker/remote_storage_adapter:latest
+ docker_image_remote_collector: docker-prod-virtual.docker.mirantis.net/openstack-docker/heka:latest
+ docker_image_prometheus_relay: docker-prod-virtual.docker.mirantis.net/openstack-docker/prometheus_relay:latest
+ docker_image_grafana: grafana/grafana:4.5.2
+ influxdb_port: 8086
+ influxdb_admin_password: password
+ influxdb_stacklight_password: lmapass
+ prometheus_influxdb_url: "http://${_param:stacklight_monitor_address}:${_param:influxdb_port}/"
+ prometheus_influxdb_db: prometheus
+ prometheus_influxdb_username: lma
+ prometheus_influxdb_password: ${_param:influxdb_stacklight_password}
+ remote_collector_telegraf_host: monitoring_remote_agent
+ linux:
+ network:
+ interface:
+ eth1:
+ enabled: true
+ type: eth
+ proto: static
+ address: ${_param:single_address}
+ netmask: 255.255.255.0
diff --git a/classes/cluster/virtual-mcp-mitaka-ovs/infra/config.yml b/classes/cluster/virtual-mcp-mitaka-ovs/infra/config.yml
index ca39912..37c5594 100644
--- a/classes/cluster/virtual-mcp-mitaka-ovs/infra/config.yml
+++ b/classes/cluster/virtual-mcp-mitaka-ovs/infra/config.yml
@@ -2,7 +2,7 @@
- service.git.client
- system.linux.system.single
- system.linux.system.repo.mcp.salt
-- system.linux.system.repo.mcp.openstack
+- system.linux.system.repo.mcp.apt_mirantis.openstack
- system.openssh.client.lab
- system.salt.master.pkg
- system.salt.master.api
@@ -32,11 +32,11 @@
- system.reclass.storage.system.openstack_dashboard_single
- system.reclass.storage.system.openstack_proxy_single
- system.reclass.storage.system.openstack_gateway_single
-- cluster.virtual-mcp-mitaka-ovs.openstack.proxy
-- cluster.virtual-mcp-mitaka-ovs.stacklight.proxy
- cluster.virtual-mcp-mitaka-ovs
parameters:
_param:
+ linux_system_codename: xenial
+ openstack_linux_system_codename: xenial
reclass_data_repository: https://gerrit.mcp.mirantis.net/salt-models/mcp-virtual-lab
reclass_data_revision: master
reclass_config_master: ${_param:infra_config_deploy_address}
@@ -146,7 +146,6 @@
node_class:
value_template:
- cluster.<<node_cluster>>.openstack.dashboard
- - cluster.<<node_cluster>>.openstack.proxy
cluster_param:
openstack_proxy_node01_address:
value_template: <<node_control_ip>>
@@ -156,37 +155,48 @@
- service.galera.master.cluster
params:
mysql_cluster_role: master
- linux_system_codename: xenial
+ linux_system_codename: ${_param:openstack_linux_system_codename}
openstack_control_node02:
classes:
- service.galera.slave.cluster
params:
mysql_cluster_role: slave
- linux_system_codename: xenial
+ linux_system_codename: ${_param:openstack_linux_system_codename}
openstack_control_node03:
classes:
- service.galera.slave.cluster
params:
mysql_cluster_role: slave
- linux_system_codename: xenial
- stacklight_server_node01:
- classes:
- - system.influxdb.server.single
- - system.influxdb.database.stacklight
+ linux_system_codename: ${_param:openstack_linux_system_codename}
openstack_compute_node01:
params:
tenant_address: 10.1.0.105
external_address: 10.16.0.105
+ linux_system_codename: ${_param:openstack_linux_system_codename}
openstack_compute_node02:
params:
tenant_address: 10.1.0.106
external_address: 10.16.0.106
+ linux_system_codename: ${_param:openstack_linux_system_codename}
openstack_gateway_node01:
params:
tenant_address: 10.1.0.110
external_address: 10.16.0.110
+ linux_system_codename: ${_param:openstack_linux_system_codename}
openstack_proxy_node01:
classes:
- cluster.virtual-mcp-mitaka-ovs.openstack.proxy
params:
- linux_system_codename: xenial
+ linux_system_codename: ${_param:openstack_linux_system_codename}
+ stacklight_server_node01:
+ classes:
+ - system.influxdb.server.single
+ - system.influxdb.database.stacklight
+ params:
+ linux_system_codename: ${_param:openstack_linux_system_codename}
+ stacklight_server_node02:
+ params:
+ linux_system_codename: ${_param:openstack_linux_system_codename}
+ stacklight_server_node03:
+ params:
+ linux_system_codename: ${_param:openstack_linux_system_codename}
diff --git a/classes/cluster/virtual-mcp-mitaka-ovs/openstack/compute.yml b/classes/cluster/virtual-mcp-mitaka-ovs/openstack/compute.yml
index cbe05b2..fa6b011 100644
--- a/classes/cluster/virtual-mcp-mitaka-ovs/openstack/compute.yml
+++ b/classes/cluster/virtual-mcp-mitaka-ovs/openstack/compute.yml
@@ -1,5 +1,5 @@
classes:
-- system.linux.system.repo.mcp.openstack
+- system.linux.system.repo.mcp.apt_mirantis.openstack
- system.linux.system.repo.mcp.extra
- system.linux.system.repo.saltstack.xenial
- system.linux.network.hosts
@@ -14,7 +14,6 @@
tenant_interface: ens5
external_interface: ens6
interface_mtu: 1500
- linux_system_codename: xenial
nova:
compute:
vncproxy_url: http://${_param:cluster_vip_address}:6080
diff --git a/classes/cluster/virtual-mcp-mitaka-ovs/openstack/control.yml b/classes/cluster/virtual-mcp-mitaka-ovs/openstack/control.yml
index c06ed3d..a734d72 100644
--- a/classes/cluster/virtual-mcp-mitaka-ovs/openstack/control.yml
+++ b/classes/cluster/virtual-mcp-mitaka-ovs/openstack/control.yml
@@ -2,7 +2,7 @@
- system.linux.system.lowmem
- system.linux.storage.loopback
- system.linux.system.repo.glusterfs
-- system.linux.system.repo.mcp.openstack
+- system.linux.system.repo.mcp.apt_mirantis.openstack
- system.linux.system.repo.mcp.extra
- system.linux.system.repo.saltstack.xenial
- system.memcached.server.single
diff --git a/classes/cluster/virtual-mcp-mitaka-ovs/openstack/dashboard.yml b/classes/cluster/virtual-mcp-mitaka-ovs/openstack/dashboard.yml
index 7e27212..6b484c5 100644
--- a/classes/cluster/virtual-mcp-mitaka-ovs/openstack/dashboard.yml
+++ b/classes/cluster/virtual-mcp-mitaka-ovs/openstack/dashboard.yml
@@ -1,10 +1,6 @@
classes:
-- system.linux.system.repo.ubuntu
-- system.linux.system.repo.mcp.openstack
-- system.linux.system.repo.mcp.extra
-- system.linux.system.repo.saltstack.xenial
- system.horizon.server.single
-- cluster.virtual-mcp-mitaka-ovs
+- system.linux.system.repo.saltstack.xenial
parameters:
_param:
horizon_site_branding: OpenStack Dashboard
diff --git a/classes/cluster/virtual-mcp-mitaka-ovs/openstack/gateway.yml b/classes/cluster/virtual-mcp-mitaka-ovs/openstack/gateway.yml
index fa035c4..03d6708 100644
--- a/classes/cluster/virtual-mcp-mitaka-ovs/openstack/gateway.yml
+++ b/classes/cluster/virtual-mcp-mitaka-ovs/openstack/gateway.yml
@@ -1,5 +1,5 @@
classes:
-- system.linux.system.repo.mcp.openstack
+- system.linux.system.repo.mcp.apt_mirantis.openstack
- system.linux.system.repo.mcp.extra
- system.linux.system.repo.saltstack.xenial
- system.neutron.gateway.cluster
@@ -10,7 +10,6 @@
tenant_interface: ens5
external_interface: ens6
interface_mtu: 9000
- linux_system_codename: xenial
linux:
network:
bridge: openvswitch
diff --git a/classes/cluster/virtual-mcp-newton-dvr/infra/config.yml b/classes/cluster/virtual-mcp-newton-dvr/infra/config.yml
index 0678b6e..8e507df 100644
--- a/classes/cluster/virtual-mcp-newton-dvr/infra/config.yml
+++ b/classes/cluster/virtual-mcp-newton-dvr/infra/config.yml
@@ -2,7 +2,7 @@
- service.git.client
- system.linux.system.single
- system.linux.system.repo.mcp.salt
-- system.linux.system.repo.mcp.openstack
+- system.linux.system.repo.mcp.apt_mirantis.openstack
- system.openssh.client.lab
- system.salt.master.pkg
- system.salt.master.api
diff --git a/classes/cluster/virtual-mcp-newton-dvr/openstack/compute.yml b/classes/cluster/virtual-mcp-newton-dvr/openstack/compute.yml
index 85ffec0..97c19d3 100644
--- a/classes/cluster/virtual-mcp-newton-dvr/openstack/compute.yml
+++ b/classes/cluster/virtual-mcp-newton-dvr/openstack/compute.yml
@@ -1,5 +1,5 @@
classes:
-- system.linux.system.repo.mcp.openstack
+- system.linux.system.repo.mcp.apt_mirantis.openstack
- system.linux.system.repo.mcp.extra
- system.linux.system.repo.saltstack.xenial
- system.linux.network.hosts
diff --git a/classes/cluster/virtual-mcp-newton-dvr/openstack/control.yml b/classes/cluster/virtual-mcp-newton-dvr/openstack/control.yml
index 0f67d74..7fe891b 100644
--- a/classes/cluster/virtual-mcp-newton-dvr/openstack/control.yml
+++ b/classes/cluster/virtual-mcp-newton-dvr/openstack/control.yml
@@ -2,7 +2,7 @@
- system.linux.system.lowmem
- system.linux.storage.loopback
- system.linux.system.repo.glusterfs
-- system.linux.system.repo.mcp.openstack
+- system.linux.system.repo.mcp.apt_mirantis.openstack
- system.linux.system.repo.mcp.extra
- system.linux.system.repo.saltstack.xenial
- system.memcached.server.single
diff --git a/classes/cluster/virtual-mcp-newton-dvr/openstack/dashboard.yml b/classes/cluster/virtual-mcp-newton-dvr/openstack/dashboard.yml
index af3f824..131595d 100644
--- a/classes/cluster/virtual-mcp-newton-dvr/openstack/dashboard.yml
+++ b/classes/cluster/virtual-mcp-newton-dvr/openstack/dashboard.yml
@@ -1,6 +1,6 @@
classes:
- system.linux.system.repo.ubuntu
-- system.linux.system.repo.mcp.openstack
+- system.linux.system.repo.mcp.apt_mirantis.openstack
- system.linux.system.repo.mcp.extra
- system.linux.system.repo.saltstack.xenial
- system.horizon.server.single
diff --git a/classes/cluster/virtual-mcp-newton-dvr/openstack/gateway.yml b/classes/cluster/virtual-mcp-newton-dvr/openstack/gateway.yml
index fe6c97d..5322f4f 100644
--- a/classes/cluster/virtual-mcp-newton-dvr/openstack/gateway.yml
+++ b/classes/cluster/virtual-mcp-newton-dvr/openstack/gateway.yml
@@ -1,5 +1,5 @@
classes:
-- system.linux.system.repo.mcp.openstack
+- system.linux.system.repo.mcp.apt_mirantis.openstack
- system.linux.system.repo.mcp.extra
- system.linux.system.repo.saltstack.xenial
- system.linux.network.interface.single_ovs_dvr
diff --git a/classes/cluster/virtual-mcp-newton-ovs/infra/config.yml b/classes/cluster/virtual-mcp-newton-ovs/infra/config.yml
index 79d311d..7267afb 100644
--- a/classes/cluster/virtual-mcp-newton-ovs/infra/config.yml
+++ b/classes/cluster/virtual-mcp-newton-ovs/infra/config.yml
@@ -2,7 +2,7 @@
- service.git.client
- system.linux.system.single
- system.linux.system.repo.mcp.salt
-- system.linux.system.repo.mcp.openstack
+- system.linux.system.repo.mcp.apt_mirantis.openstack
- system.openssh.client.lab
- system.salt.master.pkg
- system.salt.master.api
diff --git a/classes/cluster/virtual-mcp-newton-ovs/openstack/compute.yml b/classes/cluster/virtual-mcp-newton-ovs/openstack/compute.yml
index 59b6bc3..1031c6f 100644
--- a/classes/cluster/virtual-mcp-newton-ovs/openstack/compute.yml
+++ b/classes/cluster/virtual-mcp-newton-ovs/openstack/compute.yml
@@ -1,5 +1,5 @@
classes:
-- system.linux.system.repo.mcp.openstack
+- system.linux.system.repo.mcp.apt_mirantis.openstack
- system.linux.system.repo.mcp.extra
- system.linux.system.repo.saltstack.xenial
- system.linux.network.hosts
diff --git a/classes/cluster/virtual-mcp-newton-ovs/openstack/control.yml b/classes/cluster/virtual-mcp-newton-ovs/openstack/control.yml
index 37c9611..28aa6d3 100644
--- a/classes/cluster/virtual-mcp-newton-ovs/openstack/control.yml
+++ b/classes/cluster/virtual-mcp-newton-ovs/openstack/control.yml
@@ -2,7 +2,7 @@
- system.linux.system.lowmem
- system.linux.storage.loopback
- system.linux.system.repo.glusterfs
-- system.linux.system.repo.mcp.openstack
+- system.linux.system.repo.mcp.apt_mirantis.openstack
- system.linux.system.repo.mcp.extra
- system.linux.system.repo.saltstack.xenial
- system.memcached.server.single
diff --git a/classes/cluster/virtual-mcp-newton-ovs/openstack/dashboard.yml b/classes/cluster/virtual-mcp-newton-ovs/openstack/dashboard.yml
index 04d1b0d..6aae392 100644
--- a/classes/cluster/virtual-mcp-newton-ovs/openstack/dashboard.yml
+++ b/classes/cluster/virtual-mcp-newton-ovs/openstack/dashboard.yml
@@ -1,6 +1,6 @@
classes:
- system.linux.system.repo.ubuntu
-- system.linux.system.repo.mcp.openstack
+- system.linux.system.repo.mcp.apt_mirantis.openstack
- system.linux.system.repo.mcp.extra
- system.linux.system.repo.saltstack.xenial
- system.horizon.server.single
diff --git a/classes/cluster/virtual-mcp-newton-ovs/openstack/gateway.yml b/classes/cluster/virtual-mcp-newton-ovs/openstack/gateway.yml
index a54d889..a6370f3 100644
--- a/classes/cluster/virtual-mcp-newton-ovs/openstack/gateway.yml
+++ b/classes/cluster/virtual-mcp-newton-ovs/openstack/gateway.yml
@@ -1,5 +1,5 @@
classes:
-- system.linux.system.repo.mcp.openstack
+- system.linux.system.repo.mcp.apt_mirantis.openstack
- system.linux.system.repo.mcp.extra
- system.linux.system.repo.saltstack.xenial
- system.neutron.gateway.cluster
diff --git a/classes/cluster/virtual-mcp-pike-dvr-ceph-rgw/openstack/control.yml b/classes/cluster/virtual-mcp-pike-dvr-ceph-rgw/openstack/control.yml
index e5f0e64..922bcf4 100644
--- a/classes/cluster/virtual-mcp-pike-dvr-ceph-rgw/openstack/control.yml
+++ b/classes/cluster/virtual-mcp-pike-dvr-ceph-rgw/openstack/control.yml
@@ -44,6 +44,7 @@
- system.cinder.volume.single
- system.cinder.volume.notification.messagingv2
- cluster.virtual-mcp-pike-dvr-ceph-rgw.infra
+- system.keepalived.cluster.instance.default_keepalived_check
- cluster.virtual-mcp-pike-dvr-ceph-rgw
parameters:
_param:
diff --git a/classes/cluster/virtual-mcp-pike-dvr-ssl-barbican/openstack/compute.yml b/classes/cluster/virtual-mcp-pike-dvr-ssl-barbican/openstack/compute.yml
index 16731e3..52c6ade 100644
--- a/classes/cluster/virtual-mcp-pike-dvr-ssl-barbican/openstack/compute.yml
+++ b/classes/cluster/virtual-mcp-pike-dvr-ssl-barbican/openstack/compute.yml
@@ -4,14 +4,14 @@
- system.linux.system.repo.mcp.apt_mirantis.saltstack_2016_3
- system.linux.network.hosts
- system.linux.storage.loopback
+- system.cinder.volume.single
+- system.cinder.volume.backend.lvm
- system.nova.compute.cluster
- system.neutron.compute.cluster
- system.ceilometer.client.nova_compute
- system.ceilometer.agent.cluster
- system.ceilometer.agent.polling.default
- system.linux.network.interface.single_ovs_dvr
-- service.cinder.volume.single
-- system.cinder.volume.backend.lvm
- cluster.virtual-mcp-pike-dvr-ssl-barbican
parameters:
_param:
diff --git a/classes/cluster/virtual-mcp-pike-dvr-ssl-barbican/openstack/control.yml b/classes/cluster/virtual-mcp-pike-dvr-ssl-barbican/openstack/control.yml
index cb8a506..98bdc23 100644
--- a/classes/cluster/virtual-mcp-pike-dvr-ssl-barbican/openstack/control.yml
+++ b/classes/cluster/virtual-mcp-pike-dvr-ssl-barbican/openstack/control.yml
@@ -30,6 +30,7 @@
- system.nova.control.cluster
- system.neutron.control.openvswitch.cluster
- system.cinder.control.cluster
+- system.cinder.control.backend.lvm
- system.heat.server.cluster
- system.designate.server.cluster
- system.galera.server.cluster
diff --git a/classes/cluster/virtual-mcp-pike-dvr-ssl-barbican/openstack/proxy.yml b/classes/cluster/virtual-mcp-pike-dvr-ssl-barbican/openstack/proxy.yml
index 074dd4f..69159d4 100644
--- a/classes/cluster/virtual-mcp-pike-dvr-ssl-barbican/openstack/proxy.yml
+++ b/classes/cluster/virtual-mcp-pike-dvr-ssl-barbican/openstack/proxy.yml
@@ -7,6 +7,7 @@
- cluster.virtual-mcp-pike-dvr-ssl-barbican
parameters:
_param:
+ cluster_public_host: ${_param:openstack_proxy_address}
nginx_proxy_ssl:
enabled: true
authority: ${_param:salt_minion_ca_authority}
diff --git a/classes/cluster/virtual-mcp-pike-dvr-ssl/openstack/compute.yml b/classes/cluster/virtual-mcp-pike-dvr-ssl/openstack/compute.yml
index 72c1133..bb4d099 100644
--- a/classes/cluster/virtual-mcp-pike-dvr-ssl/openstack/compute.yml
+++ b/classes/cluster/virtual-mcp-pike-dvr-ssl/openstack/compute.yml
@@ -3,6 +3,9 @@
- system.linux.system.repo.mcp.extra
- system.linux.system.repo.mcp.apt_mirantis.saltstack_2016_3
- system.linux.network.hosts
+- system.linux.storage.loopback
+- system.cinder.volume.single
+- system.cinder.volume.backend.lvm
- system.nova.compute.cluster
- system.neutron.compute.cluster
- system.ceilometer.client.nova_compute
@@ -17,6 +20,7 @@
external_interface: ens6
interface_mtu: 1500
linux_system_codename: xenial
+ loopback_device_size: 20
linux:
network:
interface:
diff --git a/classes/cluster/virtual-mcp-pike-dvr-ssl/openstack/control.yml b/classes/cluster/virtual-mcp-pike-dvr-ssl/openstack/control.yml
index 41cc920..0e92dbc 100644
--- a/classes/cluster/virtual-mcp-pike-dvr-ssl/openstack/control.yml
+++ b/classes/cluster/virtual-mcp-pike-dvr-ssl/openstack/control.yml
@@ -29,6 +29,7 @@
- system.nova.control.cluster
- system.neutron.control.openvswitch.cluster
- system.cinder.control.cluster
+- system.cinder.control.backend.lvm
- system.heat.server.cluster
- system.designate.server.cluster
- system.galera.server.cluster
diff --git a/classes/cluster/virtual-mcp-pike-dvr-ssl/openstack/proxy.yml b/classes/cluster/virtual-mcp-pike-dvr-ssl/openstack/proxy.yml
index fd43ed6..0abc6b8 100644
--- a/classes/cluster/virtual-mcp-pike-dvr-ssl/openstack/proxy.yml
+++ b/classes/cluster/virtual-mcp-pike-dvr-ssl/openstack/proxy.yml
@@ -7,6 +7,7 @@
- cluster.virtual-mcp-pike-dvr-ssl
parameters:
_param:
+ cluster_public_host: ${_param:openstack_proxy_address}
nginx_proxy_ssl:
enabled: true
authority: ${_param:salt_minion_ca_authority}
diff --git a/classes/cluster/virtual-mcp-pike-dvr/openstack/proxy.yml b/classes/cluster/virtual-mcp-pike-dvr/openstack/proxy.yml
index 3420f43..d6ea854 100644
--- a/classes/cluster/virtual-mcp-pike-dvr/openstack/proxy.yml
+++ b/classes/cluster/virtual-mcp-pike-dvr/openstack/proxy.yml
@@ -7,9 +7,10 @@
- cluster.virtual-mcp-pike-dvr
parameters:
_param:
+ cluster_public_host: ${_param:openstack_proxy_address}
nginx_proxy_ssl:
enabled: true
authority: ${_param:salt_minion_ca_authority}
engine: salt
mode: secure
- salt_minion_ca_host: cfg01.${_param:cluster_domain}
\ No newline at end of file
+ salt_minion_ca_host: cfg01.${_param:cluster_domain}
diff --git a/classes/cluster/virtual-mcp-pike-ovs-ceph/openstack/control.yml b/classes/cluster/virtual-mcp-pike-ovs-ceph/openstack/control.yml
index d0a95c8..bd910d0 100644
--- a/classes/cluster/virtual-mcp-pike-ovs-ceph/openstack/control.yml
+++ b/classes/cluster/virtual-mcp-pike-ovs-ceph/openstack/control.yml
@@ -41,6 +41,7 @@
- system.cinder.control.notification.messagingv2
- system.cinder.volume.single
- system.cinder.volume.notification.messagingv2
+- system.keepalived.cluster.instance.default_keepalived_check
- cluster.virtual-mcp-pike-ovs-ceph.infra
parameters:
_param:
diff --git a/classes/cluster/virtual-mcp-pike-ovs/openstack/proxy.yml b/classes/cluster/virtual-mcp-pike-ovs/openstack/proxy.yml
index 2819d1e..83edc51 100644
--- a/classes/cluster/virtual-mcp-pike-ovs/openstack/proxy.yml
+++ b/classes/cluster/virtual-mcp-pike-ovs/openstack/proxy.yml
@@ -7,6 +7,7 @@
- cluster.virtual-mcp-pike-ovs
parameters:
_param:
+ cluster_public_host: ${_param:openstack_proxy_address}
nginx_proxy_ssl:
enabled: true
authority: ${_param:salt_minion_ca_authority}
diff --git a/classes/cluster/virtual-mcp11-contrail-nfv/openstack/control.yml b/classes/cluster/virtual-mcp11-contrail-nfv/openstack/control.yml
index 7fcf421..b5a4177 100755
--- a/classes/cluster/virtual-mcp11-contrail-nfv/openstack/control.yml
+++ b/classes/cluster/virtual-mcp11-contrail-nfv/openstack/control.yml
@@ -42,6 +42,7 @@
- system.galera.server.database.nova
- system.galera.server.database.designate
- system.heka.alarm.openstack_control
+- system.keepalived.cluster.instance.default_keepalived_check
- cluster.virtual-mcp11-contrail-nfv
parameters:
_param:
diff --git a/classes/cluster/virtual-mcp11-contrail/openstack/control.yml b/classes/cluster/virtual-mcp11-contrail/openstack/control.yml
index 485c5ab..36536bd 100755
--- a/classes/cluster/virtual-mcp11-contrail/openstack/control.yml
+++ b/classes/cluster/virtual-mcp11-contrail/openstack/control.yml
@@ -40,6 +40,7 @@
- system.galera.server.database.keystone
- system.galera.server.database.nova
- system.galera.server.database.designate
+- system.keepalived.cluster.instance.default_keepalived_check
- cluster.virtual-mcp11-contrail
parameters:
_param:
diff --git a/classes/cluster/virtual-mcp11-dvr/openstack/control.yml b/classes/cluster/virtual-mcp11-dvr/openstack/control.yml
index ee9785b..7f1abcf 100644
--- a/classes/cluster/virtual-mcp11-dvr/openstack/control.yml
+++ b/classes/cluster/virtual-mcp11-dvr/openstack/control.yml
@@ -33,6 +33,7 @@
- system.galera.server.database.heat
- system.galera.server.database.keystone
- system.galera.server.database.nova
+- system.keepalived.cluster.instance.default_keepalived_check
- cluster.virtual-mcp11-dvr
parameters:
diff --git a/classes/cluster/virtual-mcp11-k8s-calico/infra/config.yml b/classes/cluster/virtual-mcp11-k8s-calico/infra/config.yml
index 580b4b2..29f3b3f 100644
--- a/classes/cluster/virtual-mcp11-k8s-calico/infra/config.yml
+++ b/classes/cluster/virtual-mcp11-k8s-calico/infra/config.yml
@@ -1,7 +1,9 @@
classes:
+- system.linux.system.single
+- system.linux.system.single.debian
+- system.linux.system.repo.mcp.salt
- system.linux.system.repo.mcp.apt_mirantis.ubuntu
- system.linux.system.repo.mcp.apt_mirantis.saltstack_2016_3
-- system.linux.system.repo.mcp.salt
- system.openssh.client.lab
- system.salt.master.pkg
- system.salt.minion.ca.salt_master
@@ -11,6 +13,7 @@
- system.mysql.client.database.grafana
- system.reclass.storage.salt
- system.reclass.storage.system.kubernetes_control_cluster
+- system.sphinx.server.doc.reclass
- cluster.virtual-mcp11-k8s-calico.stacklight.proxy
- cluster.virtual-mcp11-k8s-calico
parameters:
@@ -20,6 +23,7 @@
reclass_data_revision: master
reclass_config_master: ${_param:infra_config_deploy_address}
single_address: ${_param:infra_config_address}
+ deploy_address: ${_param:infra_config_deploy_address}
linux_system_codename: xenial
salt_api_password_hash: "$6$WV0P1shnoDh2gI/Z$22/Bcd7ffMv0jDlFpT63cAU4PiXHz9pjXwngToKwqAsgoeK4HNR3PiKaushjxp3JsQ8hNoJmAC6TxzVqfV8WH/"
salt_master_host: ${_param:infra_config_deploy_address}
@@ -40,6 +44,8 @@
value_template: <<node_os>>
salt_master_host:
value_template: <<node_master_ip>>
+ deploy_address:
+ value_template: <<node_deploy_ip>>
infra_config:
expression: <<node_hostname>>__equals__cfg01
cluster_param:
@@ -59,21 +65,30 @@
cluster_param:
kubernetes_control_node01_address:
value_template: <<node_control_ip>>
+ kubernetes_control_node01_deploy_address:
+ value_template: <<node_deploy_ip>>
kubernetes_control02:
expression: <<node_hostname>>__equals__ctl02
cluster_param:
kubernetes_control_node02_address:
value_template: <<node_control_ip>>
+ kubernetes_control_node02_deploy_address:
+ value_template: <<node_deploy_ip>>
kubernetes_control03:
expression: <<node_hostname>>__equals__ctl03
cluster_param:
kubernetes_control_node03_address:
value_template: <<node_control_ip>>
+ kubernetes_control_node03_deploy_address:
+ value_template: <<node_deploy_ip>>
kubernetes_compute:
expression: <<node_hostname>>__startswith__cmp
node_class:
value_template:
- cluster.<<node_cluster>>.kubernetes.compute
+ node_param:
+ deploy_address:
+ value_template: <<node_deploy_ip>>
stacklight_monitor01:
expression: <<node_hostname>>__equals__mon01
cluster_param:
@@ -148,6 +163,7 @@
salt_master_host: ${_param:infra_config_deploy_address}
linux_system_codename: xenial
single_address: ${_param:kubernetes_compute_node01_address}
+ deploy_address: ${_param:kubernetes_compute_node01_deploy_address}
kubernetes_compute_node02:
name: ${_param:kubernetes_compute_node02_hostname}
domain: ${_param:cluster_domain}
@@ -157,3 +173,4 @@
salt_master_host: ${_param:infra_config_deploy_address}
linux_system_codename: xenial
single_address: ${_param:kubernetes_compute_node02_address}
+ deploy_address: ${_param:kubernetes_compute_node02_deploy_address}
diff --git a/classes/cluster/virtual-mcp11-k8s-calico/infra/init.yml b/classes/cluster/virtual-mcp11-k8s-calico/infra/init.yml
index e19165e..f1fd25f 100644
--- a/classes/cluster/virtual-mcp11-k8s-calico/infra/init.yml
+++ b/classes/cluster/virtual-mcp11-k8s-calico/infra/init.yml
@@ -1,11 +1,3 @@
-classes:
-- system.linux.system.single
-- system.linux.system.single.debian
-- system.linux.system.repo.mcp.extra
-- system.linux.system.repo.mcp.salt
-- system.linux.system.repo.mcp.apt_mirantis.ubuntu
-- system.openssh.server.team.all
-- system.rsyslog.client.single
parameters:
_param:
# infra service addresses
@@ -16,6 +8,7 @@
cluster_domain: virtual-mcp11-k8s-calico.local
cluster_name: virtual-mcp11-k8s-calico
apt_mk_version: nightly
+ primary_interface: ens3
linux:
network:
resolv:
diff --git a/classes/cluster/virtual-mcp11-k8s-calico/init.yml b/classes/cluster/virtual-mcp11-k8s-calico/init.yml
index c75a053..1f8d779 100644
--- a/classes/cluster/virtual-mcp11-k8s-calico/init.yml
+++ b/classes/cluster/virtual-mcp11-k8s-calico/init.yml
@@ -1,14 +1,29 @@
classes:
+- service.grafana.collector
- system.linux.network.dynamic_hosts
+- system.linux.system.single
+- system.linux.system.single.debian
+- system.linux.system.repo.mcp.extra
+- system.linux.system.repo.mcp.apt_mirantis.fluentd
+- system.linux.system.repo.mcp.apt_mirantis.openstack
- system.fluentd
- system.fluentd.label.default_metric
- system.fluentd.label.default_metric.prometheus
- system.fluentd.label.default_output.elasticsearch
- system.fluentd.label.default_output.drop_event
-- system.linux.system.repo.mcp.extra
-- system.linux.system.repo.mcp.apt_mirantis.fluentd
-- system.linux.system.repo.mcp.apt_mirantis.openstack
+- system.openssh.server.team.lab
+- system.openssh.server.team.tcpcloud
+- system.openssh.server.team.mcp_qa
+- system.openssh.server.team.k8s_team
+- system.rsyslog.client.single
+- system.prometheus.collector
+- system.telegraf.agent
- cluster.virtual-mcp11-k8s-calico.kubernetes
- cluster.virtual-mcp11-k8s-calico.stacklight
- cluster.virtual-mcp11-k8s-calico.infra
- cluster.overrides
+parameters:
+ salt:
+ minion:
+ trusted_ca_minions:
+ - cfg01
diff --git a/classes/cluster/virtual-mcp11-k8s-calico/kubernetes/compute.yml b/classes/cluster/virtual-mcp11-k8s-calico/kubernetes/compute.yml
index 27395f0..5bc5eba 100644
--- a/classes/cluster/virtual-mcp11-k8s-calico/kubernetes/compute.yml
+++ b/classes/cluster/virtual-mcp11-k8s-calico/kubernetes/compute.yml
@@ -1,6 +1,7 @@
classes:
- system.linux.system.repo.mcp.apt_mirantis.docker_legacy
- system.kubernetes.pool.cluster
+- system.linux.network.hosts
- system.salt.minion.cert.k8s_client
- system.salt.minion.cert.etcd_client
- cluster.virtual-mcp11-k8s-calico
@@ -10,9 +11,13 @@
pkgs:
- ${_param:kubernetes_docker_package}
- python-docker
+ options:
+ bip: 172.31.255.1/24
+ storage-driver: overlay2
kubernetes:
pool:
kubelet:
+ address: ${_param:single_address}
fail_on_swap: ${_param:kubelet_fail_on_swap}
network:
calico:
@@ -20,7 +25,6 @@
image: ${_param:kubernetes_calico_image}
calicoctl_image: ${_param:kubernetes_calico_calicoctl_image}
cni_image: ${_param:kubernetes_calico_cni_image}
- mtu: ${_param:kubernetes_mtu}
etcd:
ssl:
enabled: true
@@ -28,7 +32,7 @@
addons:
virtlet:
enabled: ${_param:kubernetes_virtlet_enabled}
- namespace: kube-system
+ namespace: ${_param:kubernetes_addon_namespace}
image: ${_param:kubernetes_virtlet_image}
criproxy_version: ${_param:kubernetes_criproxy_version}
criproxy_source: ${_param:kubernetes_criproxy_checksum}
@@ -42,17 +46,25 @@
resolv:
dns:
- 10.254.0.10
+ - 172.18.176.4
+ - 172.18.176.7
interface:
- ens4:
+ ens3:
+ enabled: true
+ type: eth
+ proto: static
+ name: ${_param:primary_interface}
+ address: ${_param:deploy_address}
+ netmask: 255.255.255.0
+ gateway: 192.168.10.1
route:
kubernetes_services:
address: 10.254.0.0
netmask: 255.255.0.0
- gateway: ${_param:single_address}
- interface:
+ gateway: ${_param:deploy_address}
ens4:
- route:
- kubernetes_services:
- address: 10.254.0.0
- netmask: 255.255.0.0
- gateway: ${_param:single_address}
+ enabled: true
+ type: eth
+ proto: static
+ address: ${_param:single_address}
+ netmask: '255.255.255.0'
diff --git a/classes/cluster/virtual-mcp11-k8s-calico/kubernetes/control.yml b/classes/cluster/virtual-mcp11-k8s-calico/kubernetes/control.yml
index 352aa0e..95462f1 100644
--- a/classes/cluster/virtual-mcp11-k8s-calico/kubernetes/control.yml
+++ b/classes/cluster/virtual-mcp11-k8s-calico/kubernetes/control.yml
@@ -11,10 +11,13 @@
- cluster.virtual-mcp11-k8s-calico
parameters:
_param:
- keepalived_vip_interface: ens3
+ keepalived_vip_interface: ${_param:primary_interface}
keepalived_vip_virtual_router_id: 60
+ cluster_local_address: ${_param:deploy_address}
etcd:
server:
+ bind:
+ host: ${_param:deploy_address}
source:
engine: docker_hybrid
ssl:
@@ -26,6 +29,9 @@
kubernetes:
common:
addons:
+ dashboard:
+ enabled: ${_param:kubernetes_dashboard}
+ image: ${_param:kubernetes_dashboard_image}
helm:
enabled: ${_param:kubernetes_helm_enabled}
calico_policy:
@@ -35,6 +41,14 @@
enabled: ${_param:kubernetes_netchecker_enabled}
agent_image: ${_param:kubernetes_netchecker_agent_image}
server_image: ${_param:kubernetes_netchecker_server_image}
+ agent_probeurls: ${_param:kubernetes_netchecker_agent_probeurls}
+ dns:
+ enabled: ${_param:kubernetes_dns}
+ kubedns_image: ${_param:kubernetes_kubedns_image}
+ dnsmasq_image: ${_param:kubernetes_dnsmasq_image}
+ sidecar_image: ${_param:kubernetes_sidecar_image}
+ autoscaler:
+ image: ${_param:kubernetes_dns_autoscaler_image}
coredns:
enabled: ${_param:kubernetes_coredns_enabled}
externaldns:
@@ -43,6 +57,7 @@
provider: ${_param:kubernetes_externaldns_provider}
master:
kubelet:
+ address: ${_param:single_address}
fail_on_swap: ${_param:kubelet_fail_on_swap}
etcd:
ssl:
@@ -56,4 +71,5 @@
namespace:
netchecker:
enabled: ${_param:kubernetes_netchecker_enabled}
-
+ auth:
+ mode: Node,RBAC
diff --git a/classes/cluster/virtual-mcp11-k8s-calico/kubernetes/init.yml b/classes/cluster/virtual-mcp11-k8s-calico/kubernetes/init.yml
index 20bcfcf..d71cc9f 100644
--- a/classes/cluster/virtual-mcp11-k8s-calico/kubernetes/init.yml
+++ b/classes/cluster/virtual-mcp11-k8s-calico/kubernetes/init.yml
@@ -15,8 +15,6 @@
kubernetes_scheduler_token: VgkUHfrW07zNxrb0ucFyX7NBnSJN9Xp6
kubernetes_controller-manager_token: uXrdZ1YKF6qlYm3sHje2iEXMGAGDWOIU
kubernetes_dns_token: 0S1I4iJeFjq5fopPwwCwTp3xFpEZfeUl
- kubernetes_mtu: 1500
- mcp_version: testing
etcd_initial_token: IN7KaRMSo3xkGxkjAAPtkRkAgqN4ZNRq
# docker package version
@@ -34,16 +32,20 @@
kubernetes_virtlet_image: mirantis/virtlet:v1.0.0
kubernetes_criproxy_version: v0.10.0
kubernetes_criproxy_checksum: md5=52717b1f70f15558ef4bdb0e4d4948da
- kubernetes_externaldns_image: mirantis/external-dns:latest
- kubernetes_externaldns_provider: coredns
+ kubernetes_dashboard_image: gcr.io/google_containers/kubernetes-dashboard-amd64:v1.5.1
+ kubernetes_kubedns_image: gcr.io/google_containers/k8s-dns-kube-dns-amd64:1.14.5
+ kubernetes_dnsmasq_image: gcr.io/google_containers/k8s-dns-dnsmasq-amd64:1.14.5
+ kubernetes_sidecar_image: gcr.io/google_containers/k8s-dns-sidecar-amd64:1.14.5
+ kubernetes_dns_autoscaler_image: gcr.io/google_containers/cluster-proportional-autoscaler-amd64:1.0.0
# switches of addons
- kubernetes_helm_enabled: true
+ kubernetes_addon_namespace: kube-system
+ kubernetes_dns: true
+ kubernetes_dashboard: true
+ kubernetes_helm_enabled: false
kubernetes_netchecker_enabled: true
kubernetes_calico_policy_enabled: false
kubernetes_virtlet_enabled: false
- kubernetes_coredns_enabled: false
- kubernetes_externaldns_enabled: false
# addresses and hostnames
kubernetes_internal_api_address: 10.254.0.1
@@ -59,27 +61,40 @@
kubernetes_control_node03_address: 172.16.10.103
kubernetes_compute_node01_address: 172.16.10.105
kubernetes_compute_node02_address: 172.16.10.106
+ kubernetes_control_node01_deploy_address: 192.168.10.101
+ kubernetes_control_node02_deploy_address: 192.168.10.102
+ kubernetes_control_node03_deploy_address: 192.168.10.103
+ kubernetes_compute_node01_deploy_address: 192.168.10.105
+ kubernetes_compute_node02_deploy_address: 192.168.10.106
kubernetes_proxy_node01_hostname: prx01
kubernetes_proxy_node01_address: 172.16.10.121
cluster_vip_address: ${_param:kubernetes_control_address}
- cluster_local_address: ${_param:single_address}
+ cluster_local_address: ${_param:deploy_address}
# etcd stuff
cluster_node01_hostname: ${_param:kubernetes_control_node01_hostname}
- cluster_node01_address: ${_param:kubernetes_control_node01_address}
+ cluster_node01_address: ${_param:kubernetes_control_node01_deploy_address}
cluster_node01_port: 4001
cluster_node02_hostname: ${_param:kubernetes_control_node02_hostname}
- cluster_node02_address: ${_param:kubernetes_control_node02_address}
+ cluster_node02_address: ${_param:kubernetes_control_node02_deploy_address}
cluster_node02_port: 4001
cluster_node03_hostname: ${_param:kubernetes_control_node03_hostname}
- cluster_node03_address: ${_param:kubernetes_control_node03_address}
+ cluster_node03_address: ${_param:kubernetes_control_node03_deploy_address}
cluster_node03_port: 4001
# calico
calico_private_network: 192.168.0.0
calico_private_netmask: 16
+ # component docker images
+ kubernetes_externaldns_image: mirantis/external-dns:latest
+ kubernetes_externaldns_provider: coredns
+
+ # switches of addons
+ kubernetes_coredns_enabled: false
+ kubernetes_externaldns_enabled: false
+
linux:
network:
resolv:
diff --git a/classes/cluster/virtual-mcp11-k8s-calico/stacklight/init.yml b/classes/cluster/virtual-mcp11-k8s-calico/stacklight/init.yml
index 8f745af..23306db 100644
--- a/classes/cluster/virtual-mcp11-k8s-calico/stacklight/init.yml
+++ b/classes/cluster/virtual-mcp11-k8s-calico/stacklight/init.yml
@@ -1,10 +1,7 @@
-classes:
-- service.grafana.collector
-- system.linux.system.repo.mcp.extra
-- system.prometheus.collector
-- system.telegraf.agent
parameters:
_param:
+ openstack_version: pike
+
stacklight_monitor_address: 172.16.10.252
stacklight_node01_hostname: mon01
stacklight_node02_hostname: mon02
@@ -12,9 +9,6 @@
stacklight_node01_address: 172.16.10.107
stacklight_node02_address: 172.16.10.108
stacklight_node03_address: 172.16.10.109
-
- openstack_version: pike
-
# Prometheus
prometheus_control_address: ${_param:stacklight_monitor_address}
stacklight_log_address: ${_param:stacklight_monitor_address}
diff --git a/classes/cluster/virtual-offline-ssl/openstack/proxy.yml b/classes/cluster/virtual-offline-ssl/openstack/proxy.yml
index b1c9686..bea4384 100644
--- a/classes/cluster/virtual-offline-ssl/openstack/proxy.yml
+++ b/classes/cluster/virtual-offline-ssl/openstack/proxy.yml
@@ -7,6 +7,7 @@
- cluster.virtual-offline-ssl
parameters:
_param:
+ cluster_public_host: ${_param:openstack_proxy_address}
nginx_proxy_ssl:
enabled: true
authority: ${_param:salt_minion_ca_authority}
diff --git a/classes/system b/classes/system
index 971f832..4ea68a3 160000
--- a/classes/system
+++ b/classes/system
@@ -1 +1 @@
-Subproject commit 971f832efcbff3f56378e88149da31e3eeb558ff
+Subproject commit 4ea68a31a721de6e95d717a49a8f4855d142e436