aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>2017-12-03 02:58:11 +0100
committerAlexandru Avadanii <Alexandru.Avadanii@enea.com>2017-12-04 14:27:21 +0100
commit6641403cbe2aaaaf61c2aecef4ec251f327ebee0 (patch)
tree801e839c889c0750fd098205f9e9290ae81c0285
parent09dce2a2643223d66aa1ac3a0ad8feebc082f521 (diff)
baremetal: Use common database_init, control_init
While at it, delete unused haproxy_openstack_api. JIRA: FUEL-310 Change-Id: I01953b01624fe3e9da8074239d20056f3762efc7 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
-rw-r--r--mcp/reclass/classes/cluster/baremetal-mcp-ocata-common-ha/haproxy_openstack_api.yml174
-rw-r--r--mcp/reclass/classes/cluster/baremetal-mcp-ocata-common-ha/infra/config.yml2
-rw-r--r--mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/control_init.yml17
-rw-r--r--mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/database_init.yml10
-rw-r--r--mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/control_init.yml17
-rw-r--r--mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/database_init.yml10
-rw-r--r--mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/control_init.yml17
-rw-r--r--mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/database_init.yml10
8 files changed, 1 insertions, 256 deletions
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common-ha/haproxy_openstack_api.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common-ha/haproxy_openstack_api.yml
deleted file mode 100644
index 5b0d913..0000000
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common-ha/haproxy_openstack_api.yml
+++ /dev/null
@@ -1,174 +0,0 @@
-##############################################################################
-# Copyright (c) 2017 Mirantis Inc., Enea AB and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Apache License, Version 2.0
-# which accompanies this distribution, and is available at
-# http://www.apache.org/licenses/LICENSE-2.0
-##############################################################################
----
-parameters:
- _param:
- haproxy_check: check inter 15s fastinter 2s downinter 4s rise 3 fall 3
- haproxy:
- proxy:
- listen:
- cinder_api:
- type: openstack-service
- service_name: cinder
- binds:
- - address: ${_param:cluster_vip_address}
- port: 8776
- servers:
- - name: ctl01
- host: ${_param:cluster_node01_address}
- port: 8776
- params: ${_param:haproxy_check}
- glance_api:
- type: openstack-service
- service_name: glance
- binds:
- - address: ${_param:cluster_vip_address}
- port: 9292
- servers:
- - name: ctl01
- host: ${_param:cluster_node01_address}
- port: 9292
- params: ${_param:haproxy_check}
- glance_registry_api:
- type: general-service
- service_name: glance
- binds:
- - address: ${_param:cluster_vip_address}
- port: 9191
- servers:
- - name: ctl01
- host: ${_param:cluster_node01_address}
- port: 9191
- params: ${_param:haproxy_check}
- glare:
- type: general-service
- service_name: glare
- binds:
- - address: ${_param:cluster_vip_address}
- port: 9494
- servers:
- - name: ctl01
- host: ${_param:cluster_node01_address}
- port: 9494
- params: ${_param:haproxy_check}
- heat_cloudwatch_api:
- type: openstack-service
- service_name: heat
- binds:
- - address: ${_param:cluster_vip_address}
- port: 8003
- servers:
- - name: ctl01
- host: ${_param:cluster_node01_address}
- port: 8003
- params: ${_param:haproxy_check}
- heat_api:
- type: openstack-service
- service_name: heat
- binds:
- - address: ${_param:cluster_vip_address}
- port: 8004
- servers:
- - name: ctl01
- host: ${_param:cluster_node01_address}
- port: 8004
- params: ${_param:haproxy_check}
- heat_cfn_api:
- type: openstack-service
- service_name: heat
- binds:
- - address: ${_param:cluster_vip_address}
- port: 8000
- servers:
- - name: ctl01
- host: ${_param:cluster_node01_address}
- port: 8000
- params: ${_param:haproxy_check}
- keystone_public_api:
- type: openstack-service
- service_name: keystone
- binds:
- - address: ${_param:cluster_vip_address}
- port: 5000
- servers:
- - name: ctl01
- host: ${_param:cluster_node01_address}
- port: 5000
- params: ${_param:haproxy_check}
- keystone_admin_api:
- type: openstack-service
- service_name: keystone
- binds:
- - address: ${_param:cluster_vip_address}
- port: 35357
- servers:
- - name: ctl01
- host: ${_param:cluster_node01_address}
- port: 35357
- params: ${_param:haproxy_check}
- neutron_api:
- type: openstack-service
- service_name: neutron
- binds:
- - address: ${_param:cluster_vip_address}
- port: 9696
- servers:
- - name: ctl01
- host: ${_param:cluster_node01_address}
- port: 9696
- params: ${_param:haproxy_check}
- nova_placement_api:
- mode: http
- binds:
- - address: ${_param:cluster_vip_address}
- port: 8778
- options:
- - httpclose
- - httplog
- health-check:
- http:
- options:
- - expect status 401
- servers:
- - name: ctl01
- host: ${_param:cluster_node01_address}
- port: 8778
- params: ${_param:haproxy_check}
- nova_ec2_api:
- type: general-service
- service_name: nova
- check: false
- binds:
- - address: ${_param:cluster_vip_address}
- port: 8773
- servers:
- - name: ctl01
- host: ${_param:cluster_node01_address}
- port: 8773
- params: ${_param:haproxy_check}
- nova_api:
- type: openstack-service
- service_name: nova
- binds:
- - address: ${_param:cluster_vip_address}
- port: 8774
- servers:
- - name: ctl01
- host: ${_param:cluster_node01_address}
- port: 8774
- params: ${_param:haproxy_check}
- nova_metadata_api:
- type: openstack-service
- binds:
- - address: ${_param:cluster_vip_address}
- port: 8775
- servers:
- - name: ctl01
- host: ${_param:cluster_node01_address}
- port: 8775
- params: ${_param:haproxy_check}
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common-ha/infra/config.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common-ha/infra/config.yml
index 623eb34..f2a4dbe 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common-ha/infra/config.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common-ha/infra/config.yml
@@ -108,7 +108,7 @@ parameters:
linux_system_codename: xenial
openstack_database_node01:
classes:
- - cluster.${_param:cluster_name}.openstack.database_init
+ - cluster.baremetal-mcp-ocata-common-ha.openstack_database_init
params:
linux_system_codename: xenial
openstack_database_node02:
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/control_init.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/control_init.yml
deleted file mode 100644
index deb4cd7..0000000
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/control_init.yml
+++ /dev/null
@@ -1,17 +0,0 @@
-##############################################################################
-# Copyright (c) 2017 Mirantis Inc., Enea AB and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Apache License, Version 2.0
-# which accompanies this distribution, and is available at
-# http://www.apache.org/licenses/LICENSE-2.0
-##############################################################################
----
-classes:
- - system.keystone.client.single
- - system.keystone.client.service.aodh
- - system.keystone.client.service.ceilometer
- - system.keystone.client.service.nova21
- - system.keystone.client.service.nova-placement
- - system.keystone.client.service.glare
- - system.keystone.client.service.cinder3
- - system.keystone.client.service.designate
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/database_init.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/database_init.yml
deleted file mode 100644
index 731fe6e..0000000
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/database_init.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-##############################################################################
-# Copyright (c) 2017 Mirantis Inc., Enea AB and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Apache License, Version 2.0
-# which accompanies this distribution, and is available at
-# http://www.apache.org/licenses/LICENSE-2.0
-##############################################################################
----
-classes:
- - system.mysql.client.single
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/control_init.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/control_init.yml
deleted file mode 100644
index deb4cd7..0000000
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/control_init.yml
+++ /dev/null
@@ -1,17 +0,0 @@
-##############################################################################
-# Copyright (c) 2017 Mirantis Inc., Enea AB and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Apache License, Version 2.0
-# which accompanies this distribution, and is available at
-# http://www.apache.org/licenses/LICENSE-2.0
-##############################################################################
----
-classes:
- - system.keystone.client.single
- - system.keystone.client.service.aodh
- - system.keystone.client.service.ceilometer
- - system.keystone.client.service.nova21
- - system.keystone.client.service.nova-placement
- - system.keystone.client.service.glare
- - system.keystone.client.service.cinder3
- - system.keystone.client.service.designate
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/database_init.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/database_init.yml
deleted file mode 100644
index 731fe6e..0000000
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/database_init.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-##############################################################################
-# Copyright (c) 2017 Mirantis Inc., Enea AB and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Apache License, Version 2.0
-# which accompanies this distribution, and is available at
-# http://www.apache.org/licenses/LICENSE-2.0
-##############################################################################
----
-classes:
- - system.mysql.client.single
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/control_init.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/control_init.yml
deleted file mode 100644
index deb4cd7..0000000
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/control_init.yml
+++ /dev/null
@@ -1,17 +0,0 @@
-##############################################################################
-# Copyright (c) 2017 Mirantis Inc., Enea AB and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Apache License, Version 2.0
-# which accompanies this distribution, and is available at
-# http://www.apache.org/licenses/LICENSE-2.0
-##############################################################################
----
-classes:
- - system.keystone.client.single
- - system.keystone.client.service.aodh
- - system.keystone.client.service.ceilometer
- - system.keystone.client.service.nova21
- - system.keystone.client.service.nova-placement
- - system.keystone.client.service.glare
- - system.keystone.client.service.cinder3
- - system.keystone.client.service.designate
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/database_init.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/database_init.yml
deleted file mode 100644
index 731fe6e..0000000
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/database_init.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-##############################################################################
-# Copyright (c) 2017 Mirantis Inc., Enea AB and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Apache License, Version 2.0
-# which accompanies this distribution, and is available at
-# http://www.apache.org/licenses/LICENSE-2.0
-##############################################################################
----
-classes:
- - system.mysql.client.single