added new foundation nodes, billing, benchmark, telemetry
diff --git a/nginx/server/single.yml b/nginx/server/single.yml
index b77a76f..b35db14 100644
--- a/nginx/server/single.yml
+++ b/nginx/server/single.yml
@@ -1,4 +1,5 @@
classes:
+- service.keepalived.cluster.single
- service.nginx.server.single
- service.nginx.server.stats
parameters:
diff --git a/opencontrail/control/control.yml b/opencontrail/control/control.yml
index ea9f1ab..e7b045e 100644
--- a/opencontrail/control/control.yml
+++ b/opencontrail/control/control.yml
@@ -86,7 +86,7 @@
host: ${_param:cluster_vip_address}
cache:
engine: redis
- host: ${_param:cluster_local_address}
+ host: 127.0.0.1
port: 6379
identity:
engine: keystone
diff --git a/reclass/storage/system/openstack_billing_single.yml b/reclass/storage/system/openstack_billing_single.yml
new file mode 100644
index 0000000..c0e05c4
--- /dev/null
+++ b/reclass/storage/system/openstack_billing_single.yml
@@ -0,0 +1,13 @@
+parameters:
+ reclass:
+ storage:
+ node:
+ opencontrail_billing_node01:
+ name: bil01
+ domain: ${_param:cluster_domain}
+ classes:
+ - cluster.${_param:cluster_name}.openstack.billing
+ params:
+ salt_master_host: ${_param:reclass_config_master}
+ linux_system_codename: trusty
+ single_address: ${_param:openstack_billing_address}
diff --git a/reclass/storage/system/stacklight_telemetry_single.yml b/reclass/storage/system/stacklight_telemetry_single.yml
new file mode 100644
index 0000000..920c29d
--- /dev/null
+++ b/reclass/storage/system/stacklight_telemetry_single.yml
@@ -0,0 +1,14 @@
+parameters:
+ reclass:
+ storage:
+ node:
+ stacklight_telemetry_node01:
+ name: mtr01
+ domain: ${_param:cluster_domain}
+ classes:
+ - cluster.${_param:cluster_name}.stacklight.telemetry
+ params:
+ salt_master_host: ${_param:reclass_config_master}
+ linux_system_codename: xenial
+ single_address: ${_param:stacklight_telemetry_node01_address}
+ keepalived_vip_priority: 103
\ No newline at end of file
diff --git a/salt/control/cluster/foundation_integration_single.yml b/salt/control/cluster/foundation_integration_single.yml
new file mode 100644
index 0000000..fe8d1b1
--- /dev/null
+++ b/salt/control/cluster/foundation_integration_single.yml
@@ -0,0 +1,18 @@
+parameters:
+ salt:
+ control:
+ size:
+ foundation.integration:
+ cpu: 4
+ ram: 8192
+ disk_profile: small
+ net_profile: default
+ cluster:
+ internal:
+ domain: ${_param:cluster_domain}
+ engine: virt
+ node:
+ cid01:
+ provider: kvm02.${_param:cluster_domain}
+ image: ${_param:salt_control_xenial_image}
+ size: foundation.integration
\ No newline at end of file
diff --git a/salt/control/cluster/foundation_storage.yml b/salt/control/cluster/foundation_storage_single.yml
similarity index 100%
rename from salt/control/cluster/foundation_storage.yml
rename to salt/control/cluster/foundation_storage_single.yml
diff --git a/salt/control/cluster/foundation_version_control_single.yml b/salt/control/cluster/foundation_version_control_single.yml
new file mode 100644
index 0000000..2262eaf
--- /dev/null
+++ b/salt/control/cluster/foundation_version_control_single.yml
@@ -0,0 +1,18 @@
+parameters:
+ salt:
+ control:
+ size:
+ foundation.version_control:
+ cpu: 4
+ ram: 8192
+ disk_profile: small
+ net_profile: default
+ cluster:
+ internal:
+ domain: ${_param:cluster_domain}
+ engine: virt
+ node:
+ git01:
+ provider: kvm02.${_param:cluster_domain}
+ image: ${_param:salt_control_xenial_image}
+ size: foundation.version_control
\ No newline at end of file
diff --git a/salt/control/cluster/openstack_benchmark_single.yml b/salt/control/cluster/openstack_benchmark_single.yml
new file mode 100644
index 0000000..48971ef
--- /dev/null
+++ b/salt/control/cluster/openstack_benchmark_single.yml
@@ -0,0 +1,18 @@
+parameters:
+ salt:
+ control:
+ size:
+ openstack.benchmark:
+ cpu: 2
+ ram: 4096
+ disk_profile: small
+ net_profile: default
+ cluster:
+ internal:
+ domain: ${_param:cluster_domain}
+ engine: virt
+ node:
+ bmk01:
+ provider: kvm03.${_param:cluster_domain}
+ image: ${_param:salt_control_trusty_image}
+ size: openstack.benchmark
\ No newline at end of file
diff --git a/salt/control/cluster/openstack_billing_single.yml b/salt/control/cluster/openstack_billing_single.yml
new file mode 100644
index 0000000..1fb7a9b
--- /dev/null
+++ b/salt/control/cluster/openstack_billing_single.yml
@@ -0,0 +1,18 @@
+parameters:
+ salt:
+ control:
+ size:
+ openstack.billing:
+ cpu: 4
+ ram: 8192
+ disk_profile: large
+ net_profile: default
+ cluster:
+ internal:
+ domain: ${_param:cluster_domain}
+ engine: virt
+ node:
+ bil01:
+ provider: kvm03.${_param:cluster_domain}
+ image: ${_param:salt_control_trusty_image}
+ size: openstack.control
\ No newline at end of file
diff --git a/salt/control/cluster/stacklight_telemetry_single.yml b/salt/control/cluster/stacklight_telemetry_single.yml
new file mode 100644
index 0000000..4ab5ead
--- /dev/null
+++ b/salt/control/cluster/stacklight_telemetry_single.yml
@@ -0,0 +1,18 @@
+parameters:
+ salt:
+ control:
+ size:
+ stacklight.telemetry:
+ cpu: 32
+ ram: 65536
+ disk_profile: small
+ net_profile: default
+ cluster:
+ internal:
+ domain: ${_param:cluster_domain}
+ engine: virt
+ node:
+ mtr01:
+ provider: kvm01.${_param:cluster_domain}
+ image: ${_param:salt_control_xenial_image}
+ size: stacklight.telemetry
\ No newline at end of file