diff options
| author |   Michael Polenchuk <mpolenchuk@mirantis.com> | 2017-08-03 08:56:26 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2017-08-03 08:56:26 +0000 |
| commit | 447ba637bd160ef709f4cf65e7e765914eda83ca (patch) | |
| tree | 22598c208f937a11aaf4942854b65583f7832db0 /mcp/reclass | |
| parent | fffbe2cb567a5e367dbee7ce059050fde6372110 (diff) | |
| parent | 3a8442af52e106fe92b54af6b96fa3ae23e72a06 (diff) | |
Merge "Set ntp servers list"
Diffstat (limited to 'mcp/reclass')
5 files changed, 22 insertions, 56 deletions
diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/init_options.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/init_options.yml new file mode 100644 index 000000000..53e312787 --- /dev/null +++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/init_options.yml @@ -0,0 +1,18 @@ +parameters: + _param: + # infra service addresses + infra_config_address: 172.16.10.100 + # openstack service addresses + openstack_control_address: 172.16.10.101 + 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} + openstack_gateway_address: 172.16.10.110 + control_address: ${_param:openstack_control_address} + ntp_strata_host1: 1.se.pool.ntp.org + ntp_strata_host2: 0.se.pool.ntp.org diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/init.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/init.yml index 0698c644b..954a7a189 100644 --- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/init.yml +++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/init.yml @@ -1,5 +1,6 @@ classes: - system.linux.system.single +- cluster.virtual-mcp-ocata-common.init_options - cluster.virtual-mcp-ocata-odl-router.infra - cluster.virtual-mcp-ocata-odl-router.openstack @@ -7,18 +8,4 @@ parameters: _param: cluster_domain: virtual-mcp-ocata-odl-router.local cluster_name: virtual-mcp-ocata-odl-router - # infra service addresses - infra_config_address: 172.16.10.100 - # openstack service addresses - openstack_control_address: 172.16.10.101 - 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} - openstack_gateway_address: 172.16.10.110 opendaylight_service_host: 172.16.10.111 - control_address: ${_param:openstack_control_address} diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl/init.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl/init.yml index 868661363..dad16d69a 100644 --- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl/init.yml +++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl/init.yml @@ -1,5 +1,6 @@ classes: - system.linux.system.single +- cluster.virtual-mcp-ocata-common.init_options - cluster.virtual-mcp-ocata-odl.infra - cluster.virtual-mcp-ocata-odl.openstack @@ -7,18 +8,4 @@ parameters: _param: cluster_domain: virtual-mcp-ocata-odl.local cluster_name: virtual-mcp-ocata-odl - # infra service addresses - infra_config_address: 172.16.10.100 - # openstack service addresses - openstack_control_address: 172.16.10.101 - 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} - openstack_gateway_address: 172.16.10.110 opendaylight_service_host: 172.16.10.111 - control_address: ${_param:openstack_control_address} diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/init.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/init.yml index 0b6cce7c6..4626fd6c3 100644 --- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/init.yml +++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/init.yml @@ -1,5 +1,6 @@ classes: - system.linux.system.single +- cluster.virtual-mcp-ocata-common.init_options - cluster.virtual-mcp-ocata-ovs-dpdk.infra - cluster.virtual-mcp-ocata-ovs-dpdk.openstack @@ -7,17 +8,3 @@ parameters: _param: cluster_domain: virtual-mcp-ocata-ovs-dpdk.local cluster_name: virtual-mcp-ocata-ovs-dpdk - # infra service addresses - infra_config_address: 172.16.10.100 - # openstack service addresses - openstack_control_address: 172.16.10.101 - 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} - openstack_gateway_address: 172.16.10.110 - control_address: ${_param:openstack_control_address} diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/init.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/init.yml index 41dfda04a..86c0cf50d 100644 --- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/init.yml +++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/init.yml @@ -1,5 +1,6 @@ classes: - system.linux.system.single +- cluster.virtual-mcp-ocata-common.init_options - cluster.virtual-mcp-ocata-ovs.infra - cluster.virtual-mcp-ocata-ovs.openstack @@ -7,17 +8,3 @@ parameters: _param: cluster_domain: virtual-mcp-ocata-ovs.local cluster_name: virtual-mcp-ocata-ovs - # infra service addresses - infra_config_address: 172.16.10.100 - # openstack service addresses - openstack_control_address: 172.16.10.101 - 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} - openstack_gateway_address: 172.16.10.110 - control_address: ${_param:openstack_control_address} |