diff options
Diffstat (limited to 'mcp/reclass/classes/cluster')
6 files changed, 12 insertions, 12 deletions
diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl/openstack/compute.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl/openstack/compute.yml index fdbff06b5..79a243d04 100644 --- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl/openstack/compute.yml +++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl/openstack/compute.yml @@ -2,8 +2,11 @@ classes: - system.linux.system.repo.mcp.openstack - system.linux.system.repo.mcp.extra - system.linux.system.repo.saltstack.xenial +- system.linux.storage.loopback - system.nova.compute.single - service.neutron.compute.single +- service.cinder.volume.single +- system.cinder.volume.backend.lvm - cluster.virtual-mcp-ocata-odl parameters: _param: @@ -12,6 +15,7 @@ parameters: external_interface: ens6 interface_mtu: 9000 linux_system_codename: xenial + loopback_device_size: 10 nova: compute: vncproxy_url: http://${_param:cluster_vip_address}:6080 diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl/openstack/control.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl/openstack/control.yml index 1918b87be..d8ab80d9e 100644 --- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl/openstack/control.yml +++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl/openstack/control.yml @@ -17,6 +17,7 @@ classes: - system.nova.control.single - system.neutron.control.opendaylight.single - system.cinder.control.single +- system.cinder.control.backend.lvm - system.heat.server.single - service.mysql.server.single - system.galera.server.database.cinder diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl/openstack/init.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl/openstack/init.yml index 9857b9a76..87d474ceb 100644 --- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl/openstack/init.yml +++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl/openstack/init.yml @@ -22,7 +22,7 @@ parameters: galera_server_maintenance_password: opnfv_secret galera_server_admin_password: opnfv_secret cluster_vip_address: ${_param:cluster_public_host} - cluster_local_address: ${_param:single_address} + cluster_local_address: ${_param:openstack_control_address} cluster_node01_hostname: ctl01 cluster_node01_address: 172.16.10.101 cluster_node02_hostname: ctl02 diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/openstack/compute.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/openstack/compute.yml index 72aee1bca..cec9e3561 100644 --- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/openstack/compute.yml +++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/openstack/compute.yml @@ -2,8 +2,11 @@ classes: - system.linux.system.repo.mcp.openstack - system.linux.system.repo.mcp.extra - system.linux.system.repo.saltstack.xenial +- system.linux.storage.loopback - system.nova.compute.single - service.neutron.compute.single +- service.cinder.volume.single +- system.cinder.volume.backend.lvm - cluster.virtual-mcp-ocata-ovs parameters: _param: @@ -12,6 +15,7 @@ parameters: external_interface: ens6 interface_mtu: 9000 linux_system_codename: xenial + loopback_device_size: 10 nova: compute: vncproxy_url: http://${_param:cluster_vip_address}:6080 diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/openstack/control.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/openstack/control.yml index 8f63000aa..b3f0ca751 100644 --- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/openstack/control.yml +++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/openstack/control.yml @@ -17,6 +17,7 @@ classes: - system.nova.control.single - system.neutron.control.openvswitch.single - system.cinder.control.single +- system.cinder.control.backend.lvm - system.heat.server.single - service.mysql.server.single - system.galera.server.database.cinder diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/openstack/init.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/openstack/init.yml index e4cf3bbac..77b6a5d80 100644 --- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/openstack/init.yml +++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/openstack/init.yml @@ -22,7 +22,7 @@ parameters: galera_server_maintenance_password: opnfv_secret galera_server_admin_password: opnfv_secret cluster_vip_address: ${_param:cluster_public_host} - cluster_local_address: ${_param:single_address} + cluster_local_address: ${_param:openstack_control_address} cluster_node01_hostname: ctl01 cluster_node01_address: 172.16.10.101 cluster_node02_hostname: ctl02 @@ -101,16 +101,6 @@ parameters: names: - ctl01 - ctl01.${_param:cluster_domain} - ctl02: - address: ${_param:openstack_control_node02_address} - names: - - ctl02 - - ctl02.${_param:cluster_domain} - ctl03: - address: ${_param:openstack_control_node03_address} - names: - - ctl03 - - ctl03.${_param:cluster_domain} gtw01: address: ${_param:openstack_gateway_address} names: |