Remove nodes spec., deprecated in new way
Change-Id: I2677b0a5c5b564648ec3a1e8a0cd9bb9ad289080
diff --git a/classes/cluster/aaa-ha-freeipa/aaa/init.yml b/classes/cluster/aaa-ha-freeipa/aaa/init.yml
index c09e5b7..463b8d2 100644
--- a/classes/cluster/aaa-ha-freeipa/aaa/init.yml
+++ b/classes/cluster/aaa-ha-freeipa/aaa/init.yml
@@ -53,7 +53,7 @@
linux:
network:
resolv:
- domain: virtual-aaa-freeipa.local
+ domain: aaa-ha-freeipa.local
options:
- ndots:5
- timeout:2
diff --git a/classes/cluster/aaa-ha-freeipa/infra/init.yml b/classes/cluster/aaa-ha-freeipa/infra/init.yml
index fbe95d7..845ae33 100644
--- a/classes/cluster/aaa-ha-freeipa/infra/init.yml
+++ b/classes/cluster/aaa-ha-freeipa/infra/init.yml
@@ -15,8 +15,8 @@
infra_config_address: 172.16.10.100
infra_config_deploy_address: 192.168.10.90
- cluster_domain: virtual-aaa-freeipa.local
- cluster_name: virtual-aaa-freeipa
+ cluster_domain: aaa-ha-freeipa.local
+ cluster_name: aaa-ha-freeipa
apt_mk_version: nightly
primary_interface: ens3
linux:
diff --git a/classes/cluster/ceph-ha/infra/init.yml b/classes/cluster/ceph-ha/infra/init.yml
index 41a4387..8767fa2 100644
--- a/classes/cluster/ceph-ha/infra/init.yml
+++ b/classes/cluster/ceph-ha/infra/init.yml
@@ -13,11 +13,12 @@
salt_version: '2016.3'
# infra service addresses
infra_config_hostname: cfg01
-# infra_config_address: 172.16.10.100
-# infra_config_deploy_address: 192.168.10.90
+ infra_config_address: 172.16.10.100
+ infra_config_deploy_address: 192.168.10.90
cluster_domain: ceph-ha.local
cluster_name: ceph-ha
+ cluster_public_host: 172.16.10.254
apt_mk_version: nightly
primary_interface: ens3
linux:
diff --git a/classes/cluster/k8s-aio-contrail/infra/init.yml b/classes/cluster/k8s-aio-contrail/infra/init.yml
index ec7c359..812d237 100644
--- a/classes/cluster/k8s-aio-contrail/infra/init.yml
+++ b/classes/cluster/k8s-aio-contrail/infra/init.yml
@@ -16,7 +16,8 @@
infra_config_deploy_address: 192.168.10.90
cluster_domain: k8s-aio-contrail.local
- cluster_name: k8s-aio-contrail
+ # Commented out for temponarily disable test
+ # cluster_name: k8s-aio-contrail
apt_mk_version: nightly
linux:
network:
diff --git a/classes/cluster/k8s-aio-contrail/kubernetes/compute.yml b/classes/cluster/k8s-aio-contrail/kubernetes/compute.yml
index 599685a..badb177 100644
--- a/classes/cluster/k8s-aio-contrail/kubernetes/compute.yml
+++ b/classes/cluster/k8s-aio-contrail/kubernetes/compute.yml
@@ -4,6 +4,7 @@
- system.linux.network.hosts
- system.salt.minion.cert.k8s_client
- system.salt.minion.cert.etcd_client
+- cluster.k8s-aio-contrail.kubernetes
- cluster.k8s-aio-contrail.infra
- cluster.k8s-aio-contrail.opencontrail.compute
- cluster.overrides
diff --git a/classes/cluster/k8s-aio-contrail/kubernetes/control.yml b/classes/cluster/k8s-aio-contrail/kubernetes/control.yml
index e69ce70..c5735da 100644
--- a/classes/cluster/k8s-aio-contrail/kubernetes/control.yml
+++ b/classes/cluster/k8s-aio-contrail/kubernetes/control.yml
@@ -4,6 +4,7 @@
- system.linux.system.repo.docker
- system.salt.minion.cert.etcd_server
- system.kubernetes.master.cluster
+- cluster.k8s-aio-contrail.kubernetes
- cluster.k8s-aio-contrail.kubernetes.compute
- cluster.overrides
parameters:
diff --git a/classes/cluster/sl-k8s-contrail/infra/config.yml b/classes/cluster/sl-k8s-contrail/infra/config.yml
index c287f17..2a83d69 100644
--- a/classes/cluster/sl-k8s-contrail/infra/config.yml
+++ b/classes/cluster/sl-k8s-contrail/infra/config.yml
@@ -9,7 +9,7 @@
- system.reclass.storage.salt
- system.salt.minion.cert.k8s_server
- system.reclass.storage.system.kubernetes_control_cluster
-- system.reclass.storage.system.opencontrail_control_cluster
+#- system.reclass.storage.system.opencontrail_control_cluster
- cluster.sl-k8s-contrail
parameters:
_param:
@@ -19,6 +19,7 @@
reclass_config_master: ${_param:infra_config_deploy_address}
single_address: ${_param:infra_config_address}
linux_system_codename: xenial
+ opencontrail_control_system_codename: trusty
salt_api_password_hash: "$6$WV0P1shnoDh2gI/Z$22/Bcd7ffMv0jDlFpT63cAU4PiXHz9pjXwngToKwqAsgoeK4HNR3PiKaushjxp3JsQ8hNoJmAC6TxzVqfV8WH/"
salt_master_host: ${_param:infra_config_deploy_address}
salt:
@@ -152,11 +153,38 @@
keepalived_vip_priority: 102
mysql_cluster_role: slave
opencontrail_control_node01:
+ name: ${_param:opencontrail_control_node01_hostname}
+ domain: ${_param:cluster_domain}
+ classes:
+ - cluster.${_param:cluster_name}.opencontrail.control
params:
+ salt_master_host: ${_param:reclass_config_master}
+ linux_system_codename: ${_param:opencontrail_control_system_codename}
+ single_address: ${_param:opencontrail_control_node01_address}
+ keepalived_vip_priority: 103
+ opencontrail_database_id: 1
rabbitmq_cluster_role: master
opencontrail_control_node02:
+ name: ${_param:opencontrail_control_node02_hostname}
+ domain: ${_param:cluster_domain}
+ classes:
+ - cluster.${_param:cluster_name}.opencontrail.control
params:
+ salt_master_host: ${_param:reclass_config_master}
+ linux_system_codename: ${_param:opencontrail_control_system_codename}
+ single_address: ${_param:opencontrail_control_node02_address}
+ keepalived_vip_priority: 102
+ opencontrail_database_id: 2
rabbitmq_cluster_role: slave
opencontrail_control_node03:
+ name: ${_param:opencontrail_control_node03_hostname}
+ domain: ${_param:cluster_domain}
+ classes:
+ - cluster.${_param:cluster_name}.opencontrail.control
params:
+ salt_master_host: ${_param:reclass_config_master}
+ linux_system_codename: ${_param:opencontrail_control_system_codename}
+ single_address: ${_param:opencontrail_control_node03_address}
+ keepalived_vip_priority: 101
+ opencontrail_database_id: 3
rabbitmq_cluster_role: slave
diff --git a/classes/cluster/sl-k8s-contrail/infra/init.yml b/classes/cluster/sl-k8s-contrail/infra/init.yml
index 0b58654..6a22605 100644
--- a/classes/cluster/sl-k8s-contrail/infra/init.yml
+++ b/classes/cluster/sl-k8s-contrail/infra/init.yml
@@ -12,6 +12,7 @@
cluster_domain: sl-k8s-contrail.local
cluster_name: sl-k8s-contrail
+ cluster_public_host: 172.16.10.254
apt_mk_version: nightly
linux:
network:
diff --git a/classes/cluster/sl-k8s-contrail/stacklight/init.yml b/classes/cluster/sl-k8s-contrail/stacklight/init.yml
index 12a5c01..c8ed2df 100644
--- a/classes/cluster/sl-k8s-contrail/stacklight/init.yml
+++ b/classes/cluster/sl-k8s-contrail/stacklight/init.yml
@@ -8,12 +8,13 @@
parameters:
_param:
stacklight_monitor_address: 172.16.10.251
- stacklight_node01_hostname: mon01
- stacklight_node02_hostname: mon02
- stacklight_node03_hostname: mon03
- stacklight_node01_address: 172.16.10.107
- stacklight_node02_address: 172.16.10.108
- stacklight_node03_address: 172.16.10.109
+ stacklight_monitor_node01_hostname: mon01
+ stacklight_monitor_node02_hostname: mon02
+ stacklight_monitor_node03_hostname: mon03
+ stacklight_monitor_node01_address: 172.16.10.107
+ stacklight_monitor_node02_address: 172.16.10.108
+ stacklight_monitor_node03_address: 172.16.10.109
+
# Prometheus
prometheus_control_address: ${_param:stacklight_monitor_address}
@@ -38,20 +39,20 @@
- mon
- mon.${_param:cluster_domain}
mon01:
- address: ${_param:stacklight_node01_address}
+ address: ${_param:stacklight_monitor_node01_address}
names:
- - ${_param:stacklight_node01_hostname}
- - ${_param:stacklight_node01_hostname}.${_param:cluster_domain}
+ - ${_param:stacklight_monitor_node01_hostname}
+ - ${_param:stacklight_monitor_node01_hostname}.${_param:cluster_domain}
mon02:
- address: ${_param:stacklight_node02_address}
+ address: ${_param:stacklight_monitor_node02_address}
names:
- - ${_param:stacklight_node02_hostname}
- - ${_param:stacklight_node02_hostname}.${_param:cluster_domain}
+ - ${_param:stacklight_monitor_node02_hostname}
+ - ${_param:stacklight_monitor_node02_hostname}.${_param:cluster_domain}
mon03:
- address: ${_param:stacklight_node03_address}
+ address: ${_param:stacklight_monitor_node03_address}
names:
- - ${_param:stacklight_node03_hostname}
- - ${_param:stacklight_node03_hostname}.${_param:cluster_domain}
+ - ${_param:stacklight_monitor_node03_hostname}
+ - ${_param:stacklight_monitor_node03_hostname}.${_param:cluster_domain}
system:
name: ${_param:infra_config_hostname}
domain: ${_param:cluster_domain}
diff --git a/classes/cluster/sl-k8s-contrail/stacklight/server.yml b/classes/cluster/sl-k8s-contrail/stacklight/server.yml
index c33daf9..8dbe8d8 100644
--- a/classes/cluster/sl-k8s-contrail/stacklight/server.yml
+++ b/classes/cluster/sl-k8s-contrail/stacklight/server.yml
@@ -53,12 +53,12 @@
# Kibana
kibana_elasticsearch_host: ${_param:cluster_vip_address}
# Docker/Elasticsearch
- cluster_node01_hostname: ${_param:stacklight_node01_hostname}
- cluster_node01_address: ${_param:stacklight_node01_address}
- cluster_node02_hostname: ${_param:stacklight_node02_hostname}
- cluster_node02_address: ${_param:stacklight_node02_address}
- cluster_node03_hostname: ${_param:stacklight_node03_hostname}
- cluster_node03_address: ${_param:stacklight_node03_address}
+ cluster_node01_hostname: ${_param:stacklight_monitor_node01_hostname}
+ cluster_node01_address: ${_param:stacklight_monitor_node01_address}
+ cluster_node02_hostname: ${_param:stacklight_monitor_node02_hostname}
+ cluster_node02_address: ${_param:stacklight_monitor_node02_address}
+ cluster_node03_hostname: ${_param:stacklight_monitor_node03_hostname}
+ cluster_node03_address: ${_param:stacklight_monitor_node03_address}
influxdb_port: 8086
influxdb_admin_password: password
influxdb_stacklight_password: lmapass
diff --git a/classes/cluster/sl-os-ovs/stacklight/init.yml b/classes/cluster/sl-os-ovs/stacklight/init.yml
index 2449e44..72a6267 100644
--- a/classes/cluster/sl-os-ovs/stacklight/init.yml
+++ b/classes/cluster/sl-os-ovs/stacklight/init.yml
@@ -29,6 +29,8 @@
galera_server_maintenance_password: workshop
galera_server_admin_password: workshop
+
+ grafana_influxdb_host: ${_param:stacklight_monitor_node01_address}
heka_elasticsearch_host: ${_param:stacklight_monitor_address}
elasticsearch_port: 9200
stacklight_environment: ${_param:cluster_domain}
diff --git a/classes/cluster/virtual-mcp11-aio/.env b/classes/cluster/virtual-mcp11-aio/.env
index caca9ab..bdf599f 100644
--- a/classes/cluster/virtual-mcp11-aio/.env
+++ b/classes/cluster/virtual-mcp11-aio/.env
@@ -1,2 +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 mysql libvirt rsyslog memcached rabbitmq apache keystone glance nova neutron cinder heat horizon ironic tftpd-hpa bind powerdns designate)
-formula_services+=(${formula_services[@]} ${FORMULAS_SALT_MASTER[@]})
diff --git a/classes/cluster/virtual-mcp11-aio/bootstrap_vars b/classes/cluster/virtual-mcp11-aio/bootstrap_vars
deleted file mode 100644
index 5661577..0000000
--- a/classes/cluster/virtual-mcp11-aio/bootstrap_vars
+++ /dev/null
@@ -1 +0,0 @@
-FORMULAS_SALT_MASTER+=(mysql grafana libvirt rsyslog memcached rabbitmq apache keystone glance nova neutron cinder heat horizon ironic tftpd-hpa bind powerdns designate)