Merge "Add new configuration of StackLight on virtual-mcp-newton-ovs model"
diff --git a/classes/cluster/k8s-aio-calico/kubernetes/init.yml b/classes/cluster/k8s-aio-calico/kubernetes/init.yml
index 38acf28..29467bc 100644
--- a/classes/cluster/k8s-aio-calico/kubernetes/init.yml
+++ b/classes/cluster/k8s-aio-calico/kubernetes/init.yml
@@ -25,8 +25,8 @@
kubernetes_hyperkube_image: docker-prod-virtual.docker.mirantis.net/mirantis/kubernetes/hyperkube-amd64:v1.8.6-5
kubernetes_virtlet_image: mirantis/virtlet:latest
- kubernetes_criproxy_version: v0.9.4
- kubernetes_criproxy_checksum: md5=f1a08e16e15f61240ea324f6b335e013
+ kubernetes_criproxy_version: v0.10.0
+ kubernetes_criproxy_checksum: md5=52717b1f70f15558ef4bdb0e4d4948da
kubernetes_netchecker_agent_image: mirantis/k8s-netchecker-agent:stable
kubernetes_netchecker_server_image: mirantis/k8s-netchecker-server:stable
kubernetes_netchecker_agent_probeurls: "http://ipinfo.io"
diff --git a/classes/cluster/k8s-compact/kubernetes/init.yml b/classes/cluster/k8s-compact/kubernetes/init.yml
index 5c62919..8bb4178 100644
--- a/classes/cluster/k8s-compact/kubernetes/init.yml
+++ b/classes/cluster/k8s-compact/kubernetes/init.yml
@@ -33,8 +33,8 @@
kubernetes_calico_policy_image: calico/kube-policy-controller:v0.5.4
kubernetes_hyperkube_image: docker-prod-local.docker.mirantis.net/mirantis/kubernetes/hyperkube-amd64:v1.8.6-5
kubernetes_virtlet_image: mirantis/virtlet:latest
- kubernetes_criproxy_version: v0.9.4
- kubernetes_criproxy_checksum: md5=f1a08e16e15f61240ea324f6b335e013
+ kubernetes_criproxy_version: v0.10.0
+ kubernetes_criproxy_checksum: md5=52717b1f70f15558ef4bdb0e4d4948da
kubernetes_netchecker_agent_image: mirantis/k8s-netchecker-agent:stable
kubernetes_netchecker_server_image: mirantis/k8s-netchecker-server:stable
kubernetes_netchecker_agent_probeurls: "http://ipinfo.io"
diff --git a/classes/cluster/k8s-ha-calico/kubernetes/init.yml b/classes/cluster/k8s-ha-calico/kubernetes/init.yml
index 67b29eb..8ec23c8 100644
--- a/classes/cluster/k8s-ha-calico/kubernetes/init.yml
+++ b/classes/cluster/k8s-ha-calico/kubernetes/init.yml
@@ -28,8 +28,8 @@
kubernetes_hyperkube_image: docker-prod-virtual.docker.mirantis.net/mirantis/kubernetes/hyperkube-amd64:v1.8.6-5
kubernetes_virtlet_image: mirantis/virtlet:latest
- kubernetes_criproxy_version: v0.9.4
- kubernetes_criproxy_checksum: md5=f1a08e16e15f61240ea324f6b335e013
+ kubernetes_criproxy_version: v0.10.0
+ kubernetes_criproxy_checksum: md5=52717b1f70f15558ef4bdb0e4d4948da
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
diff --git a/classes/cluster/k8s-ha-contrail/kubernetes/init.yml b/classes/cluster/k8s-ha-contrail/kubernetes/init.yml
index 67e7296..ded77f5 100644
--- a/classes/cluster/k8s-ha-contrail/kubernetes/init.yml
+++ b/classes/cluster/k8s-ha-contrail/kubernetes/init.yml
@@ -26,8 +26,8 @@
kubernetes_hyperkube_image: docker-prod-virtual.docker.mirantis.net/mirantis/kubernetes/hyperkube-amd64:v1.8.6-5
kubernetes_virtlet_image: mirantis/virtlet:latest
- kubernetes_criproxy_version: v0.9.4
- kubernetes_criproxy_checksum: md5=f1a08e16e15f61240ea324f6b335e013
+ kubernetes_criproxy_version: v0.10.0
+ kubernetes_criproxy_checksum: md5=52717b1f70f15558ef4bdb0e4d4948da
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
diff --git a/classes/cluster/os-ha-contrail-40/opencontrail/control.yml b/classes/cluster/os-ha-contrail-40/opencontrail/control.yml
index c3a531d..4a4fab2 100644
--- a/classes/cluster/os-ha-contrail-40/opencontrail/control.yml
+++ b/classes/cluster/os-ha-contrail-40/opencontrail/control.yml
@@ -20,6 +20,7 @@
- cluster.os-ha-contrail-40
parameters:
_param:
+ openstack_version: mitaka
keepalived_vip_interface: ${_param:opencontrail_control_interface_name}
cluster_vip_address: ${_param:opencontrail_control_address}
cluster_local_address: ${_param:single_address}
diff --git a/classes/cluster/sl-k8s-calico/kubernetes/init.yml b/classes/cluster/sl-k8s-calico/kubernetes/init.yml
index 4e03f24..9e16911 100644
--- a/classes/cluster/sl-k8s-calico/kubernetes/init.yml
+++ b/classes/cluster/sl-k8s-calico/kubernetes/init.yml
@@ -31,9 +31,9 @@
kubernetes_netchecker_agent_image: mirantis/k8s-netchecker-agent:stable
kubernetes_netchecker_server_image: mirantis/k8s-netchecker-server:stable
kubernetes_netchecker_agent_probeurls: "http://ipinfo.io"
- kubernetes_virtlet_image: mirantis/virtlet:stable
- kubernetes_criproxy_version: v0.9.4
- kubernetes_criproxy_checksum: md5=f1a08e16e15f61240ea324f6b335e013
+ kubernetes_virtlet_image: mirantis/virtlet:latest
+ kubernetes_criproxy_version: v0.10.0
+ kubernetes_criproxy_checksum: md5=52717b1f70f15558ef4bdb0e4d4948da
kubernetes_externaldns_image: mirantis/external-dns:latest
kubernetes_externaldns_provider: coredns
diff --git a/classes/cluster/virtual-mcp-pike-dvr-ceph-rgw/infra/config.yml b/classes/cluster/virtual-mcp-pike-dvr-ceph-rgw/infra/config.yml
index c42e143..f4ac726 100644
--- a/classes/cluster/virtual-mcp-pike-dvr-ceph-rgw/infra/config.yml
+++ b/classes/cluster/virtual-mcp-pike-dvr-ceph-rgw/infra/config.yml
@@ -175,7 +175,7 @@
ceph_rgw_node02_address:
value_template: <<node_control_ip>>
ceph_rgw_node03:
- expression: <<node_hostname>>__equals__cmn03
+ expression: <<node_hostname>>__equals__rgw03
cluster_param:
ceph_rgw_node03_address:
value_template: <<node_control_ip>>
diff --git a/classes/cluster/virtual-mcp-pike-dvr-ssl-barbican/.env b/classes/cluster/virtual-mcp-pike-dvr-ssl-barbican/.env
index 11849f2..ad9daba 100644
--- a/classes/cluster/virtual-mcp-pike-dvr-ssl-barbican/.env
+++ b/classes/cluster/virtual-mcp-pike-dvr-ssl-barbican/.env
@@ -1 +1 @@
-FORMULAS_SALT_MASTER+=(java openssh ntp nginx collectd sensu heka sphinx mysql galera grafana libvirt rsyslog glusterfs postfix xtrabackup freeipa prometheus telegraf elasticsearch kibana rundeck devops-portal libvirt rsyslog memcached rabbitmq apache keystone glance nova neutron cinder heat horizon ironic tftpd-hpa bind powerdns designate barbican iptables fluentd dogtag barbican)
+FORMULAS_SALT_MASTER+=(java openssh ntp nginx collectd sensu heka sphinx mysql galera grafana libvirt rsyslog glusterfs postfix xtrabackup freeipa prometheus telegraf elasticsearch kibana rundeck devops-portal libvirt rsyslog memcached rabbitmq apache keystone glance nova neutron cinder heat horizon ironic tftpd-hpa bind powerdns designate barbican iptables fluentd dogtag barbican runtest artifactory)
diff --git a/classes/cluster/virtual-mcp-pike-dvr-ssl-barbican/infra/config.yml b/classes/cluster/virtual-mcp-pike-dvr-ssl-barbican/infra/config.yml
index 368b52b..9e9d3be 100644
--- a/classes/cluster/virtual-mcp-pike-dvr-ssl-barbican/infra/config.yml
+++ b/classes/cluster/virtual-mcp-pike-dvr-ssl-barbican/infra/config.yml
@@ -35,6 +35,7 @@
- system.reclass.storage.system.openstack_share_single
- system.reclass.storage.system.openstack_telemetry_cluster
- cluster.virtual-mcp-pike-dvr-ssl-barbican
+- service.runtest.tempest
parameters:
_param:
reclass_data_repository: https://gerrit.mcp.mirantis.net/salt-models/mcp-virtual-lab
@@ -46,6 +47,10 @@
single_address: 172.16.10.100
salt_master_host: 127.0.0.1
salt_master_base_environment: prd
+ runtest_tempest_cfg_dir: /root/rally_reports/
+ runtest_tempest_cfg_name: tempest_generated.conf
+ artifactory_user: artifactory_user
+ artifactory_password: artifactory_password
linux:
network:
interface:
@@ -66,6 +71,9 @@
dogtag:
source: pkg
name: salt-formula-dogtag
+ neutron:
+ client:
+ enabled: true
reclass:
storage:
class_mapping:
@@ -212,3 +220,46 @@
openstack_telemetry_node03:
params:
redis_cluster_role: 'slave'
+ runtest:
+ enabled: True
+ test_target: gtw0*
+ keystonerc_node: ctl01*
+ tempest:
+ enabled: True
+ cfg_dir: ${_param:runtest_tempest_cfg_dir}
+ cfg_name: ${_param:runtest_tempest_cfg_name}
+ DEFAULT:
+ log_file: /home/rally/rally_reports/tempest.log
+ compute:
+ build_timeout: 600
+ min_microversion: 2.1
+ max_microversion: 2.42
+ orchestration:
+ max_template_size: 5440000
+ max_resources_per_stack: 20000
+ dns_feature_enabled:
+ # Switch this to designate_admin_api_enabled once [1] is promoted to stable packages
+ # [1] https://gerrit.mcp.mirantis.net/gitweb?p=salt-formulas/designate.git;a=commit;h=96a3f43f6cf1149559e54a00b5548bdf46333749
+ api_admin: false
+ api_v1: false
+ api_v2: true
+ api_v2_quotas: true
+ api_v2_root_recordsets: true
+ bug_1573141_fixed: true
+ volume-feature-enabled:
+ backup: false
+ artifact_collector:
+ enabled: true
+ artifactory:
+ enabled: true
+ user: ${_param:artifactory_user}
+ password: ${_param:artifactory_password}
+ host: artifactory.mcp.mirantis.net
+ port: 443
+ proto: https
+ endpoint: /oscore-local/${_param:cluster_domain}/${_param:infra_config_hostname}
+ artifacts:
+ sys_logs:
+ path: /var/log
+ etc:
+ path: /etc
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 778f57d..9385f96 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
@@ -10,10 +10,11 @@
- system.rabbitmq.server.vhost.openstack
- system.apache.server.site.manila
- system.apache.server.site.barbican
+- system.apache.server.site.nova-placement
+- system.apache.server.site.cinder
- system.nginx.server.single
- system.nginx.server.proxy.openstack_api
- system.nginx.server.proxy.openstack.designate
-- system.nginx.server.proxy.openstack.placement
- system.keystone.server.wsgi
- system.keystone.server.cluster
- system.glusterfs.client.cluster
@@ -66,12 +67,10 @@
nginx_proxy_openstack_api_address: ${_param:cluster_local_address}
nginx_proxy_openstack_keystone_host: 127.0.0.1
nginx_proxy_openstack_nova_host: 127.0.0.1
- nginx_proxy_openstack_cinder_host: 127.0.0.1
nginx_proxy_openstack_glance_host: 127.0.0.1
nginx_proxy_openstack_neutron_host: 127.0.0.1
nginx_proxy_openstack_heat_host: 127.0.0.1
nginx_proxy_openstack_designate_host: 127.0.0.1
- nginx_proxy_openstack_placement_host: 127.0.0.1
apache_manila_api_address: ${_param:single_address}
apache_manila_ssl: ${_param:nginx_proxy_ssl}
apache_keystone_api_host: ${_param:single_address}
@@ -79,8 +78,12 @@
apache_barbican_api_address: ${_param:cluster_local_address}
apache_barbican_api_host: ${_param:single_address}
apache_barbican_ssl: ${_param:nginx_proxy_ssl}
+ apache_nova_placement_api_address: ${_param:cluster_local_address}
+ apache_nova_placement_ssl: ${_param:nginx_proxy_ssl}
barbican_dogtag_nss_password: workshop
barbican_dogtag_host: ${_param:cluster_vip_address}
+ apache_cinder_api_address: ${_param:cluster_local_address}
+ apache_cinder_ssl: ${_param:nginx_proxy_ssl}
# dogtag listens on 8443 but there is no way to bind it to
# Specific IP, as on this setup dogtag installed on ctl nodes
# Change port on haproxy side to avoid binding conflict.
@@ -101,6 +104,8 @@
enabled: false
nginx_proxy_openstack_api_keystone_private:
enabled: false
+ nginx_proxy_openstack_api_cinder:
+ enabled: false
linux:
system:
package:
@@ -231,6 +236,8 @@
enabled: ${_param:barbican_integration_enabled}
metadata:
password: ${_param:metadata_password}
+ bind:
+ address: ${_param:cluster_local_address}
bind:
public_address: ${_param:cluster_vip_address}
novncproxy_port: 6080
diff --git a/classes/cluster/virtual-mcp-pike-dvr-ssl-barbican/openstack/init.yml b/classes/cluster/virtual-mcp-pike-dvr-ssl-barbican/openstack/init.yml
index 18ab132..77c4add 100644
--- a/classes/cluster/virtual-mcp-pike-dvr-ssl-barbican/openstack/init.yml
+++ b/classes/cluster/virtual-mcp-pike-dvr-ssl-barbican/openstack/init.yml
@@ -209,7 +209,7 @@
horizon_version: ${_param:openstack_version}
horizon_secret_key: opaesee8Que2yahJoh9fo0eefo1Aeyo6ahyei8zeiboh3aeth5loth7ieNa5xi5e
horizon_identity_host: ${_param:cluster_vip_address}
- horizon_identity_encryption: none
+ horizon_identity_encryption: ssl
horizon_identity_version: 2
ceilometer_secret_key: workshop
ceilometer_agent_default_polling_interval: 15
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 7c01446..2b1b0b8 100644
--- a/classes/cluster/virtual-mcp-pike-dvr-ssl/openstack/control.yml
+++ b/classes/cluster/virtual-mcp-pike-dvr-ssl/openstack/control.yml
@@ -9,10 +9,11 @@
- system.rabbitmq.server.cluster
- system.rabbitmq.server.vhost.openstack
- system.apache.server.site.manila
+- system.apache.server.site.nova-placement
+- system.apache.server.site.cinder
- system.nginx.server.single
- system.nginx.server.proxy.openstack_api
- system.nginx.server.proxy.openstack.designate
-- system.nginx.server.proxy.openstack.placement
- system.keystone.server.wsgi
- system.keystone.server.cluster
- system.glusterfs.client.cluster
@@ -62,16 +63,18 @@
nginx_proxy_openstack_api_address: ${_param:cluster_local_address}
nginx_proxy_openstack_keystone_host: 127.0.0.1
nginx_proxy_openstack_nova_host: 127.0.0.1
- nginx_proxy_openstack_cinder_host: 127.0.0.1
nginx_proxy_openstack_glance_host: 127.0.0.1
nginx_proxy_openstack_neutron_host: 127.0.0.1
nginx_proxy_openstack_heat_host: 127.0.0.1
nginx_proxy_openstack_designate_host: 127.0.0.1
- nginx_proxy_openstack_placement_host: 127.0.0.1
apache_manila_api_address: ${_param:single_address}
apache_manila_ssl: ${_param:nginx_proxy_ssl}
apache_keystone_api_host: ${_param:single_address}
apache_keystone_ssl: ${_param:nginx_proxy_ssl}
+ apache_nova_placement_api_address: ${_param:cluster_local_address}
+ apache_nova_placement_ssl: ${_param:nginx_proxy_ssl}
+ apache_cinder_api_address: ${_param:cluster_local_address}
+ apache_cinder_ssl: ${_param:nginx_proxy_ssl}
nginx:
server:
site:
@@ -79,6 +82,8 @@
enabled: false
nginx_proxy_openstack_api_keystone_private:
enabled: false
+ nginx_proxy_openstack_api_cinder:
+ enabled: false
linux:
system:
package:
@@ -171,6 +176,8 @@
cpu_allocation: 54
metadata:
password: ${_param:metadata_password}
+ bind:
+ address: ${_param:cluster_local_address}
bind:
public_address: ${_param:cluster_vip_address}
novncproxy_port: 6080
diff --git a/classes/cluster/virtual-mcp-pike-dvr-ssl/openstack/init.yml b/classes/cluster/virtual-mcp-pike-dvr-ssl/openstack/init.yml
index 35f71e8..e866362 100644
--- a/classes/cluster/virtual-mcp-pike-dvr-ssl/openstack/init.yml
+++ b/classes/cluster/virtual-mcp-pike-dvr-ssl/openstack/init.yml
@@ -206,7 +206,7 @@
horizon_version: ${_param:openstack_version}
horizon_secret_key: opaesee8Que2yahJoh9fo0eefo1Aeyo6ahyei8zeiboh3aeth5loth7ieNa5xi5e
horizon_identity_host: ${_param:cluster_vip_address}
- horizon_identity_encryption: none
+ horizon_identity_encryption: ssl
horizon_identity_version: 2
ceilometer_secret_key: workshop
ceilometer_agent_default_polling_interval: 15
diff --git a/classes/cluster/virtual-mcp11-k8s-calico/kubernetes/init.yml b/classes/cluster/virtual-mcp11-k8s-calico/kubernetes/init.yml
index 18599c4..f93ee90 100644
--- a/classes/cluster/virtual-mcp11-k8s-calico/kubernetes/init.yml
+++ b/classes/cluster/virtual-mcp11-k8s-calico/kubernetes/init.yml
@@ -31,9 +31,9 @@
kubernetes_netchecker_agent_image: mirantis/k8s-netchecker-agent:v1.1.0
kubernetes_netchecker_server_image: mirantis/k8s-netchecker-server:v1.1.0
kubernetes_netchecker_agent_probeurls: "http://ipinfo.io"
- kubernetes_virtlet_image: mirantis/virtlet:v0.7.0
- kubernetes_criproxy_version: v0.9.4
- kubernetes_criproxy_checksum: md5=f1a08e16e15f61240ea324f6b335e013
+ kubernetes_virtlet_image: mirantis/virtlet:latest
+ kubernetes_criproxy_version: v0.10.0
+ kubernetes_criproxy_checksum: md5=52717b1f70f15558ef4bdb0e4d4948da
kubernetes_externaldns_image: mirantis/external-dns:latest
kubernetes_externaldns_provider: coredns
diff --git a/classes/cluster/virtual-mcp11-k8s-contrail/infra/config.yml b/classes/cluster/virtual-mcp11-k8s-contrail/infra/config.yml
index f6604a7..422adc9 100644
--- a/classes/cluster/virtual-mcp11-k8s-contrail/infra/config.yml
+++ b/classes/cluster/virtual-mcp11-k8s-contrail/infra/config.yml
@@ -1,12 +1,15 @@
classes:
-- system.linux.system.repo.ubuntu
+- 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
- system.salt.master.api
-- system.reclass.storage.salt
- system.salt.minion.cert.k8s_server
+- system.mysql.client
+- system.mysql.client.database.grafana
+- system.reclass.storage.salt
- system.reclass.storage.system.kubernetes_control_cluster
- system.reclass.storage.system.opencontrail_control_cluster
- cluster.virtual-mcp11-k8s-contrail.infra
@@ -20,6 +23,7 @@
linux_system_codename: xenial
salt_api_password_hash: "$6$WV0P1shnoDh2gI/Z$22/Bcd7ffMv0jDlFpT63cAU4PiXHz9pjXwngToKwqAsgoeK4HNR3PiKaushjxp3JsQ8hNoJmAC6TxzVqfV8WH/"
salt_master_host: ${_param:infra_config_deploy_address}
+ openstack_version: pike
linux:
network:
interface:
@@ -169,4 +173,4 @@
params:
salt_master_host: ${_param:infra_config_deploy_address}
linux_system_codename: xenial
- single_address: ${_param:kubernetes_compute_node02_address}
\ No newline at end of file
+ single_address: ${_param:kubernetes_compute_node02_address}
diff --git a/classes/cluster/virtual-mcp11-k8s-contrail/infra/init.yml b/classes/cluster/virtual-mcp11-k8s-contrail/infra/init.yml
index 6594f9c..b5a73b2 100644
--- a/classes/cluster/virtual-mcp11-k8s-contrail/infra/init.yml
+++ b/classes/cluster/virtual-mcp11-k8s-contrail/infra/init.yml
@@ -3,11 +3,16 @@
- system.linux.system.single.debian
- system.linux.system.repo.mcp.extra
- system.linux.system.repo.mcp.salt
-- system.linux.system.repo.ubuntu
+- system.linux.system.repo.mcp.apt_mirantis.ubuntu
+- system.linux.system.repo.mcp.apt_mirantis.fluentd
+- system.linux.system.repo.mcp.apt_mirantis.openstack
- system.openssh.server.team.all
- system.rsyslog.client.single
-- system.heka.log_collector.single
-- system.heka.log_collector.output.telegraf
+- 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.telegraf.agent
- system.prometheus.collector
- service.grafana.collector
diff --git a/classes/cluster/virtual-mcp11-k8s-contrail/kubernetes/init.yml b/classes/cluster/virtual-mcp11-k8s-contrail/kubernetes/init.yml
index 0cc1a00..adfdfff 100644
--- a/classes/cluster/virtual-mcp11-k8s-contrail/kubernetes/init.yml
+++ b/classes/cluster/virtual-mcp11-k8s-contrail/kubernetes/init.yml
@@ -1,6 +1,8 @@
parameters:
_param:
+ openstack_version: pike
+
salt_minion_ca_host: ${_param:infra_config_hostname}.${_param:cluster_domain}
salt_minion_ca_authority: salt_master_ca
@@ -30,8 +32,8 @@
kubernetes_netchecker_agent_probeurls: "http://ipinfo.io"
kubernetes_externaldns_image: mirantis/external-dns:latest
kubernetes_externaldns_provider: coredns
- kubernetes_criproxy_version: v0.9.4
- kubernetes_criproxy_checksum: md5=f1a08e16e15f61240ea324f6b335e013
+ kubernetes_criproxy_version: v0.10.0
+ kubernetes_criproxy_checksum: md5=52717b1f70f15558ef4bdb0e4d4948da
# switches of addons
kubernetes_helm_enabled: true
diff --git a/classes/cluster/virtual-mcp11-k8s-contrail/opencontrail/control.yml b/classes/cluster/virtual-mcp11-k8s-contrail/opencontrail/control.yml
index 35cead0..d3dde42 100644
--- a/classes/cluster/virtual-mcp11-k8s-contrail/opencontrail/control.yml
+++ b/classes/cluster/virtual-mcp11-k8s-contrail/opencontrail/control.yml
@@ -18,6 +18,7 @@
- cluster.virtual-mcp11-k8s-contrail.infra
parameters:
_param:
+ openstack_version: mitaka
keepalived_vip_interface: eth1
cluster_vip_address: ${_param:opencontrail_control_address}
cluster_local_address: ${_param:single_address}
diff --git a/classes/cluster/virtual-mcp11-k8s-contrail/stacklight/init.yml b/classes/cluster/virtual-mcp11-k8s-contrail/stacklight/init.yml
index fbdcd1f..6d10dd1 100644
--- a/classes/cluster/virtual-mcp11-k8s-contrail/stacklight/init.yml
+++ b/classes/cluster/virtual-mcp11-k8s-contrail/stacklight/init.yml
@@ -1,5 +1,7 @@
parameters:
_param:
+ openstack_version: pike
+
stacklight_monitor_address: 172.16.10.251
stacklight_node01_hostname: mon01
stacklight_node02_hostname: mon02
@@ -9,6 +11,7 @@
stacklight_node03_address: 172.16.10.109
# Prometheus
prometheus_control_address: ${_param:stacklight_monitor_address}
+ stacklight_log_address: ${_param:stacklight_monitor_address}
mysql_admin_user: root
mysql_admin_password: workshop
@@ -24,9 +27,9 @@
galera_xtrabackup_parallel: 1
galera_error_log_enabled: true
- heka_elasticsearch_host: ${_param:stacklight_monitor_address}
elasticsearch_port: 9200
stacklight_environment: ${_param:cluster_domain}
+ fluentd_elasticsearch_host: ${_param:stacklight_log_address}
linux:
network:
host:
diff --git a/classes/cluster/virtual-mcp11-k8s-contrail/stacklight/server.yml b/classes/cluster/virtual-mcp11-k8s-contrail/stacklight/server.yml
index ef53609..603d3c7 100644
--- a/classes/cluster/virtual-mcp11-k8s-contrail/stacklight/server.yml
+++ b/classes/cluster/virtual-mcp11-k8s-contrail/stacklight/server.yml
@@ -44,7 +44,7 @@
keepalived_prometheus_vip_password: password
keepalived_prometheus_vip_interface: ens4
# Galera
- openstack_version: newton
+ openstack_version: pike
galera_innodb_buffer_pool_size: 1024M
galera_max_connections: 200
# Grafana
diff --git a/classes/cluster/virtual-pike-ovs-dpdk/infra/config.yml b/classes/cluster/virtual-pike-ovs-dpdk/infra/config.yml
deleted file mode 100644
index f895a17..0000000
--- a/classes/cluster/virtual-pike-ovs-dpdk/infra/config.yml
+++ /dev/null
@@ -1,191 +0,0 @@
-classes:
-- service.git.client
-- system.linux.system.single
-- system.linux.system.single.debian
-- 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.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.stacklight_server_cluster
-- system.reclass.storage.system.openstack_compute_multi
-- system.reclass.storage.system.openstack_dashboard_single
-- system.reclass.storage.system.openstack_gateway_single
-- cluster.virtual-pike-ovs-dpdk.openstack.proxy
-- cluster.virtual-pike-ovs-dpdk.stacklight.proxy
-- cluster.virtual-pike-ovs-dpdk
-parameters:
- _param:
- 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
- reclass_config_master: 192.168.10.90
- single_address: 172.16.10.100
- 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: prx
- 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.<<node_cluster>>.openstack.proxy
- 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: xenial
- openstack_control_node02:
- classes:
- - service.galera.slave.cluster
- params:
- mysql_cluster_role: slave
- linux_system_codename: xenial
- 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
- openstack_compute_node01:
- params:
- dpdk0_name: ens5
- dpdk0_pci: '"0000:00:05.0"'
- single_address: 172.16.10.105
- tenant_address: 10.1.0.105
- external_address: 10.16.0.105
- openstack_compute_node02:
- params:
- dpdk0_name: ens5
- dpdk0_pci: '"0000:00:05.0"'
- single_address: 172.16.10.106
- tenant_address: 10.1.0.106
- external_address: 10.16.0.106
- openstack_gateway_node01:
- params:
- tenant_address: 10.1.0.110
- external_address: 10.16.0.110
- openstack_proxy_node01:
- classes:
- - cluster.virtual-pike-ovs-dpdk.openstack.proxy
- params:
- linux_system_codename: xenial
diff --git a/classes/cluster/virtual-pike-ovs-dpdk/infra/init.yml b/classes/cluster/virtual-pike-ovs-dpdk/infra/init.yml
deleted file mode 100644
index b01723d..0000000
--- a/classes/cluster/virtual-pike-ovs-dpdk/infra/init.yml
+++ /dev/null
@@ -1,14 +0,0 @@
-parameters:
- 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-pike-ovs-dpdk/init.yml b/classes/cluster/virtual-pike-ovs-dpdk/init.yml
deleted file mode 100644
index 02c238c..0000000
--- a/classes/cluster/virtual-pike-ovs-dpdk/init.yml
+++ /dev/null
@@ -1,42 +0,0 @@
-classes:
-- system.linux.network.dynamic_hosts
-- system.linux.system.single
-- system.linux.system.single.debian
-- cluster.virtual-pike-ovs-dpdk.infra
-- cluster.virtual-pike-ovs-dpdk.openstack
-- system.openssh.server.team.lab
-- system.openssh.server.team.tcpcloud
-- system.openssh.server.team.stacklight
-- system.openssh.server.team.mcp_qa
-- cluster.virtual-pike-ovs-dpdk.stacklight
-- cluster.virtual-pike-ovs-dpdk.stacklight.client
-
-parameters:
- _param:
- cluster_domain: virtual-pike-ovs-dpdk.local
- cluster_name: virtual-pike-ovs-dpdk
- # infra service addresses
- infra_config_hostname: cfg01
- infra_config_address: 172.16.10.100
- # openstack service addresses
- openstack_proxy_address: 172.16.10.121
- openstack_proxy_node01_address: 172.16.10.121
- openstack_control_address: 172.16.10.254
- openstack_control_node01_address: 172.16.10.101
- openstack_control_node02_address: 172.16.10.102
- openstack_control_node03_address: 172.16.10.103
- 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}
- # stacklight service addresses
- stacklight_monitor_address: 172.16.10.253
- stacklight_monitor_node01_address: 172.16.10.107
- stacklight_monitor_node02_address: 172.16.10.108
- stacklight_monitor_node03_address: 172.16.10.109
- stacklight_telemetry_node01_address: ${_param:stacklight_monitor_node01_address}
- stacklight_log_address: ${_param:stacklight_monitor_address}
- openstack_gateway_address: 172.16.10.110
- openstack_gateway_node01_address: ${_param:openstack_gateway_address}
- stacklight_telemetry_address: ${_param:stacklight_monitor_address}
\ No newline at end of file
diff --git a/classes/cluster/virtual-pike-ovs-dpdk/openstack/compute.yml b/classes/cluster/virtual-pike-ovs-dpdk/openstack/compute.yml
deleted file mode 100644
index ace5f15..0000000
--- a/classes/cluster/virtual-pike-ovs-dpdk/openstack/compute.yml
+++ /dev/null
@@ -1,91 +0,0 @@
-classes:
-- system.linux.system.repo.mcp.apt_mirantis.openstack
-- system.linux.system.repo.mcp.extra
-- system.linux.system.repo.mcp.apt_mirantis.saltstack_2016_3
-- system.linux.network.hosts
-- system.nova.compute.cluster
-- system.neutron.compute.cluster
-- system.heka.alarm.openstack_compute
-- system.nova.compute.nfv.hugepages
-- system.nova.compute.nfv.cpu_pinning
-- system.neutron.compute.nfv.dpdk
-
-- cluster.virtual-pike-ovs-dpdk
-parameters:
- _param:
- primary_interface: ens4
- #tenant_interface: ens5
- external_interface: ens6
- interface_mtu: 9000
- linux_system_codename: xenial
- 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: ens3
- proto: dhcp
- type: eth
- mtu: ${_param:interface_mtu}
- primary_interface:
- enabled: true
- name: ${_param:primary_interface}
- mtu: ${_param:interface_mtu}
- proto: manual
- type: eth
- #tenant_interface:
- # enabled: 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}
-###
- # dpdkbond1:
- # enabled: true
- # bridge: br-prv
- # type: dpdk_ovs_bond
- # mode: active-backup
- dpdk0:
- name: ${_param:dpdk0_name}
- pci: ${_param:dpdk0_pci}
- driver: igb_uio
- bridge: br-prv
-# bond: dpdkbond1
- enabled: true
- type: dpdk_ovs_port
- n_rxq: 2
- br-prv:
- enabled: true
- type: dpdk_ovs_bridge
- address: ${_param:tenant_address}
- netmask: 255.255.255.0
\ No newline at end of file
diff --git a/classes/cluster/virtual-pike-ovs-dpdk/openstack/control.yml b/classes/cluster/virtual-pike-ovs-dpdk/openstack/control.yml
deleted file mode 100644
index 11a048c..0000000
--- a/classes/cluster/virtual-pike-ovs-dpdk/openstack/control.yml
+++ /dev/null
@@ -1,149 +0,0 @@
-classes:
-- system.linux.system.lowmem
-- system.linux.system.repo.mcp.apt_mirantis.glusterfs
-- system.linux.system.repo.mcp.apt_mirantis.openstack
-- system.linux.system.repo.mcp.extra
-- system.linux.system.repo.mcp.apt_mirantis.saltstack_2016_3
-- 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.alarm.openstack_control
-- system.nova.control.cluster
-- system.neutron.control.openvswitch.cluster
-- system.cinder.control.cluster
-- system.heat.server.cluster
-- system.designate.server.cluster
-- system.designate.server.backend.bind
-- 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-pike-ovs-dpdk
-parameters:
- _param:
- keepalived_vip_interface: ens4
- linux:
- system:
- package:
- python-msgpack:
- version: latest
- network:
- interface:
- ens4:
- enabled: true
- type: eth
- proto: static
- address: ${_param:single_address}
- netmask: 255.255.255.0
- keepalived:
- cluster:
- instance:
- VIP:
- virtual_router_id: 150
- 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
- keystone:
- server:
- admin_email: ${_param:admin_email}
- notification:
- driver: messagingv2
- topics: "notifications,${_param:stacklight_notification_topic}"
- 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
- worker:
- enabled: ${_param:designate_worker_enabled}
- 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}"
diff --git a/classes/cluster/virtual-pike-ovs-dpdk/openstack/dashboard.yml b/classes/cluster/virtual-pike-ovs-dpdk/openstack/dashboard.yml
deleted file mode 100644
index 73233a2..0000000
--- a/classes/cluster/virtual-pike-ovs-dpdk/openstack/dashboard.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-classes:
-- system.linux.system.repo.mcp.apt_mirantis.ubuntu
-- system.linux.system.repo.mcp.apt_mirantis.openstack
-- system.linux.system.repo.mcp.extra
-- system.linux.system.repo.mcp.apt_mirantis.saltstack_2016_3
-- system.horizon.server.single
-- system.horizon.server.plugin.theme
-- cluster.virtual-pike-ovs-dpdk
-parameters:
- _param:
- horizon_site_branding: OpenStack Dashboard
- linux:
- network:
- interface:
- ens4:
- enabled: true
- type: eth
- proto: static
- address: ${_param:single_address}
- netmask: 255.255.255.0
diff --git a/classes/cluster/virtual-pike-ovs-dpdk/openstack/gateway.yml b/classes/cluster/virtual-pike-ovs-dpdk/openstack/gateway.yml
deleted file mode 100644
index 65ad393..0000000
--- a/classes/cluster/virtual-pike-ovs-dpdk/openstack/gateway.yml
+++ /dev/null
@@ -1,88 +0,0 @@
-classes:
-- system.linux.system.repo.mcp.apt_mirantis.openstack
-- system.linux.system.repo.mcp.extra
-- system.linux.system.repo.mcp.apt_mirantis.saltstack_2016_3
-- system.neutron.gateway.cluster
-- cluster.virtual-pike-ovs-dpdk
-parameters:
- _param:
- primary_interface: ens4
- tenant_interface: ens5
- external_interface: ens6
- interface_mtu: 9000
- linux_system_codename: xenial
- linux:
- network:
- bridge: openvswitch
- interface:
- dhcp_int:
- enabled: true
- name: ens3
- 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
- # 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-prv:
- enabled: true
- type: ovs_bridge
- address: ${_param:tenant_address}
- netmask: 255.255.255.0
- floating-to-prv:
- enabled: true
- type: ovs_port
- port_type: patch
- bridge: br-floating
- peer: prv-to-floating
- prv-to-floating:
- enabled: true
- type: ovs_port
- port_type: patch
- bridge: br-prv
- peer: floating-to-prv
- 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-pike-ovs-dpdk/openstack/init.yml b/classes/cluster/virtual-pike-ovs-dpdk/openstack/init.yml
deleted file mode 100644
index 5c618c8..0000000
--- a/classes/cluster/virtual-pike-ovs-dpdk/openstack/init.yml
+++ /dev/null
@@ -1,188 +0,0 @@
-parameters:
- _param:
- openstack_version: pike
- apt_mk_version: nightly
- cinder_version: ${_param:openstack_version}
- 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"
- neutron_l3_ha: True
- 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
- galera_innodb_read_io_threads: 2
- galera_innodb_write_io_threads: 2
- galera_wsrep_slave_threads: 2
- galera_xtrabackup_parallel: 1
- galera_error_log_enabled: true
- cluster_vip_address: 172.16.10.254
- cluster_local_address: ${_param:single_address}
-
- nova_cpu_pinning: "3"
- compute_hugepages_size: 2M
- compute_hugepages_count: 600
- compute_hugepages_mount: /mnt/hugepages_2M
- compute_kernel_isolcpu: ${_param:nova_cpu_pinning}
- compute_dpdk_driver: uio
- compute_ovs_pmd_cpu_mask: "0x2"
- compute_ovs_dpdk_socket_mem: "1024"
- compute_ovs_dpdk_lcore_mask: "0x1"
- compute_ovs_memory_channels: "1"
-
- cluster_node01_hostname: ctl01
- cluster_node01_address: 172.16.10.101
- cluster_node02_hostname: ctl02
- cluster_node02_address: 172.16.10.102
- cluster_node03_hostname: ctl03
- cluster_node03_address: 172.16.10.103
- rabbitmq_secret_key: workshop
- rabbitmq_admin_password: workshop
- rabbitmq_openstack_password: workshop
- rabbitmq_cold_password: workshop
- designate_bind9_rndc_key: 4pc+X4PDqb2q+5o72dISm72LM1Ds9X2EYZjqg+nmsS7FhdTwzFFY8l/iEDmHxnyjkA33EQC8
- designate_domain_id: 5186883b-91fb-4891-bd49-e6769234a8fc
- 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: true
- 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: 172.16.10.108
- 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_designate_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
- 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
- linux:
- network:
- purge_hosts: true
- host:
- prx:
- address: ${_param:openstack_proxy_address}
- names:
- - prx
- - prx.${_param:cluster_domain}
- prx01:
- address: ${_param:openstack_proxy_node01_address}
- names:
- - prx01
- - prx01.${_param:cluster_domain}
- ctl:
- address: ${_param:openstack_control_address}
- names:
- - ctl
- - ctl.${_param:cluster_domain}
- ctl01:
- address: ${_param:openstack_control_node01_address}
- names:
- - ctl01
- - ctl01.${_param:cluster_domain}
- ctl02:
- address: ${_param:openstack_control_node02_address}
- names:
- - ctl02
- - ctl02.${_param:cluster_domain}
- ctl03:
- address: ${_param:openstack_control_node03_address}
- names:
- - ctl03
- - ctl03.${_param:cluster_domain}
- gtw01:
- address: ${_param:openstack_gateway_address}
- names:
- - gtw01
- - gtw01.${_param:cluster_domain}
- cmp01:
- address: 172.16.10.105
- names:
- - cmp01
- - cmp01.${_param:cluster_domain}
- cmp02:
- address: 172.16.10.106
- names:
- - cmp02
- - cmp02.${_param:cluster_domain}
- system:
- user:
- root:
- name: root
- password: false
diff --git a/classes/cluster/virtual-pike-ovs-dpdk/openstack/proxy.yml b/classes/cluster/virtual-pike-ovs-dpdk/openstack/proxy.yml
deleted file mode 100644
index 55c8561..0000000
--- a/classes/cluster/virtual-pike-ovs-dpdk/openstack/proxy.yml
+++ /dev/null
@@ -1,15 +0,0 @@
-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-pike-ovs-dpdk
-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-pike-ovs-dpdk/stacklight/client.yml b/classes/cluster/virtual-pike-ovs-dpdk/stacklight/client.yml
deleted file mode 100644
index a5d04ef..0000000
--- a/classes/cluster/virtual-pike-ovs-dpdk/stacklight/client.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-classes:
-- system.collectd.client.output.heka
-- system.heka.log_collector.single
-- system.heka.metric_collector.single
-- cluster.virtual-pike-ovs-dpdk.stacklight
-- service.grafana.collector
diff --git a/classes/cluster/virtual-pike-ovs-dpdk/stacklight/init.yml b/classes/cluster/virtual-pike-ovs-dpdk/stacklight/init.yml
deleted file mode 100644
index 48bffdc..0000000
--- a/classes/cluster/virtual-pike-ovs-dpdk/stacklight/init.yml
+++ /dev/null
@@ -1,48 +0,0 @@
-parameters:
- _param:
- heka_elasticsearch_host: ${_param:stacklight_monitor_address}
- heka_influxdb_host: ${_param:stacklight_monitor_node01_address}
- heka_aggregator_host: ${_param:stacklight_monitor_address}
- aggregator_port: 5565
- grafana_user: admin
- grafana_password: password
- grafana_influxdb_host: ${_param:stacklight_monitor_node01_address}
- elasticsearch_port: 9200
- influxdb_stacklight_password: lmapass
- influxdb_admin_password: password
- influxdb_port: 8086
- influxdb_database: lma
- influxdb_user: lma
- influxdb_password: lmapass
- nagios_host: ${_param:stacklight_monitor_address}
- nagios_status_port: 8001
- nagios_username: nagiosadmin
- nagios_password: secret
- nagios_notification_smtp_server: 127.0.0.1
- nagios_notification_from: 'nagios@localhost'
- nagios_notification_email: 'root@localhost'
- stacklight_environment: ${_param:cluster_domain}
- stacklight_notification_topic: stacklight_notifications
- 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-pike-ovs-dpdk/stacklight/proxy.yml b/classes/cluster/virtual-pike-ovs-dpdk/stacklight/proxy.yml
deleted file mode 100644
index ffec6cd..0000000
--- a/classes/cluster/virtual-pike-ovs-dpdk/stacklight/proxy.yml
+++ /dev/null
@@ -1,15 +0,0 @@
-classes:
-- system.nginx.server.single
-- system.nginx.server.proxy.grafana_web
-- system.nginx.server.proxy.kibana_web
-- system.nginx.server.proxy.nagios_web
-- system.salt.minion.cert.proxy
-- cluster.virtual-pike-ovs-dpdk
-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}
diff --git a/classes/cluster/virtual-pike-ovs-dpdk/stacklight/server.yml b/classes/cluster/virtual-pike-ovs-dpdk/stacklight/server.yml
deleted file mode 100644
index df7f95e..0000000
--- a/classes/cluster/virtual-pike-ovs-dpdk/stacklight/server.yml
+++ /dev/null
@@ -1,48 +0,0 @@
-classes:
-- system.collectd.remote_client.cluster
-- system.heka.remote_collector.cluster
-- system.linux.system.repo.mcp.apt_mirantis.influxdb
-- system.linux.system.repo.mcp.apt_mirantis.elastic
-- system.linux.system.repo.mcp.apt_mirantis.kibana
-- system.linux.system.repo.mcp.extra
-- system.linux.system.repo.mcp.apt_mirantis.docker
-- system.heka.remote_collector.input.amqp
-- system.heka.aggregator.cluster
-- system.elasticsearch.server.cluster
-- system.elasticsearch.server.curator
-- system.kibana.server.single
-- system.grafana.server.single
-- system.nagios.server.cluster
-- cluster.virtual-pike-ovs-dpdk
-- system.haproxy.proxy.listen.stacklight.elasticsearch
-- system.haproxy.proxy.listen.stacklight.kibana
-- system.haproxy.proxy.listen.stacklight.grafana
-- service.haproxy.proxy.single
-- system.keepalived.cluster.instance.stacklight_monitor_vip
-parameters:
- _param:
- collectd_remote_collector_host: ${_param:stacklight_monitor_address}
- heka_amqp_host: ${_param:openstack_control_address}
- kibana_elasticsearch_host: ${_param:stacklight_monitor_address}
- keepalived_stacklight_monitor_vip_address: ${_param:stacklight_monitor_address}
- keepalived_stacklight_monitor_vip_password: 'password'
- keepalived_stacklight_monitor_vip_interface: ens4
- cluster_vip_address: ${_param:stacklight_monitor_address}
- cluster_elasticsearch_port: 9200
- cluster_kibana_port: 5601
- cluster_grafana_port: 3000
- cluster_node01_name: mon01
- cluster_node01_address: ${_param:stacklight_monitor_node01_address}
- cluster_node02_name: mon02
- cluster_node02_address: ${_param:stacklight_monitor_node02_address}
- cluster_node03_name: mon03
- cluster_node03_address: ${_param:stacklight_monitor_node03_address}
- linux:
- network:
- interface:
- ens4:
- enabled: true
- type: eth
- proto: static
- address: ${_param:single_address}
- netmask: 255.255.255.0