Merge pull request #178 from Mirantis/cc
Cc
diff --git a/opencontrail/client/cluster.yml b/opencontrail/client/cluster.yml
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/opencontrail/client/cluster.yml
diff --git a/opencontrail/client/resource/analytics_node.yml b/opencontrail/client/resource/analytics_node.yml
index 424c88a..46e69eb 100644
--- a/opencontrail/client/resource/analytics_node.yml
+++ b/opencontrail/client/resource/analytics_node.yml
@@ -1,17 +1,17 @@
parameters:
_param:
- opencontrail_analytics_node01_hostname: nal01
- opencontrail_analytics_node02_hostname: nal02
- opencontrail_analytics_node03_hostname: nal03
+ cluster_node01_hostname: nal01
+ cluster_node02_hostname: nal02
+ cluster_node03_hostname: nal03
opencontrail:
client:
analytics_node:
member01:
- name: ${_param:opencontrail_analytics_node01_hostname}
+ name: ${_param:cluster_node01_hostname}
ip_address: ${_param:cluster_node01_address}
member02:
- name: ${_param:opencontrail_analytics_node02_hostname}
+ name: ${_param:cluster_node02_hostname}
ip_address: ${_param:cluster_node02_address}
member03:
- name: ${_param:opencontrail_analytics_node03_hostname}
+ name: ${_param:cluster_node03_hostname}
ip_address: ${_param:cluster_node03_address}
diff --git a/opencontrail/client/resource/config_node.yml b/opencontrail/client/resource/config_node.yml
index 2e6802c..85d08f8 100644
--- a/opencontrail/client/resource/config_node.yml
+++ b/opencontrail/client/resource/config_node.yml
@@ -1,17 +1,17 @@
parameters:
_param:
- opencontrail_control_node01_hostname: ntw01
- opencontrail_control_node02_hostname: ntw02
- opencontrail_control_node03_hostname: ntw03
+ cluster_node01_hostname: ntw01
+ cluster_node02_hostname: ntw02
+ cluster_node03_hostname: ntw03
opencontrail:
client:
config_node:
member01:
- name: ${_param:opencontrail_control_node01_hostname}
+ name: ${_param:cluster_node01_hostname}
ip_address: ${_param:cluster_node01_address}
member02:
- name: ${_param:opencontrail_control_node02_hostname}
+ name: ${_param:cluster_node02_hostname}
ip_address: ${_param:cluster_node02_address}
member03:
- name: ${_param:opencontrail_control_node03_hostname}
+ name: ${_param:cluster_node03_hostname}
ip_address: ${_param:cluster_node03_address}
diff --git a/opencontrail/client/resource/control_node.yml b/opencontrail/client/resource/control_node.yml
new file mode 100644
index 0000000..bc4abe7
--- /dev/null
+++ b/opencontrail/client/resource/control_node.yml
@@ -0,0 +1,17 @@
+parameters:
+ _param:
+ cluster_node01_hostname: ntw01
+ cluster_node02_hostname: ntw02
+ cluster_node03_hostname: ntw03
+ opencontrail:
+ client:
+ control_node:
+ member01:
+ name: ${_param:cluster_node01_hostname}
+ ip_address: ${_param:cluster_node01_address}
+ member02:
+ name: ${_param:cluster_node02_hostname}
+ ip_address: ${_param:cluster_node02_address}
+ member03:
+ name: ${_param:cluster_node03_hostname}
+ ip_address: ${_param:cluster_node03_address}
diff --git a/opencontrail/client/resource/database_node.yml b/opencontrail/client/resource/database_node.yml
index 508dff0..1dd6377 100644
--- a/opencontrail/client/resource/database_node.yml
+++ b/opencontrail/client/resource/database_node.yml
@@ -1,17 +1,17 @@
parameters:
_param:
- opencontrail_control_node01_hostname: ntw01
- opencontrail_control_node02_hostname: ntw02
- opencontrail_control_node03_hostname: ntw03
+ cluster_node01_hostname: ntw01
+ cluster_node02_hostname: ntw02
+ cluster_node03_hostname: ntw03
opencontrail:
client:
database_node:
member01:
- name: ${_param:opencontrail_control_node01_hostname}
+ name: ${_param:cluster_node01_hostname}
ip_address: ${_param:cluster_node01_address}
member02:
- name: ${_param:opencontrail_control_node02_hostname}
+ name: ${_param:cluster_node02_hostname}
ip_address: ${_param:cluster_node02_address}
member03:
- name: ${_param:opencontrail_control_node03_hostname}
+ name: ${_param:cluster_node03_hostname}
ip_address: ${_param:cluster_node03_address}
diff --git a/opencontrail/client/single.yml b/opencontrail/client/single.yml
index 4f92c86..8be67db 100644
--- a/opencontrail/client/single.yml
+++ b/opencontrail/client/single.yml
@@ -1,11 +1,2 @@
-parameters:
- opencontrail:
- client:
- identity:
- user: admin
- project: admin
- password: ${_param:keystone_admin_password}
- host: ${_param:openstack_control_address}
- config:
- host: ${_param:opencontrail_control_address}
- port: 8082
+classes:
+- service.opencontrail.client.single
\ No newline at end of file