ovs and oc aio lab fixes
Change-Id: I07bb37b17e049eb7cccf5900b64d70524ac3ab51
diff --git a/classes/cluster/os_aio_ovs/openstack/compute.yml b/classes/cluster/os_aio_ovs/openstack/compute.yml
index 64fc04d..7d66331 100644
--- a/classes/cluster/os_aio_ovs/openstack/compute.yml
+++ b/classes/cluster/os_aio_ovs/openstack/compute.yml
@@ -2,8 +2,8 @@
- system.linux.system.repo.mcp.openstack
- system.linux.system.repo.mcp.extra
- system.linux.system.repo.saltstack.xenial
-- system.nova.compute.cluster
-- system.neutron.compute.cluster
+- system.nova.compute.single
+- service.neutron.compute.single
- cluster.os_aio_ovs
parameters:
_param:
@@ -22,6 +22,14 @@
state_change: vm_and_task_state
message_queue:
host: ${_param:openstack_control_node01_address}
+ image:
+ engine: glance
+ host: ${_param:glance_service_host}
+ port: 9292
+ network:
+ engine: neutron
+ host: ${_param:neutron_service_host}
+ port: 9696
linux:
network:
bridge: openvswitch
diff --git a/classes/cluster/os_aio_ovs/openstack/control.yml b/classes/cluster/os_aio_ovs/openstack/control.yml
index 38ed2ba..d5ebcaa 100644
--- a/classes/cluster/os_aio_ovs/openstack/control.yml
+++ b/classes/cluster/os_aio_ovs/openstack/control.yml
@@ -21,34 +21,49 @@
- system.cinder.control.single
- system.heat.server.single
#- system.galera.server.cluster
-- system.galera.server.database.ceilometer
-- system.galera.server.database.cinder
-- system.galera.server.database.glance
-- system.galera.server.database.heat
-- system.galera.server.database.keystone
-- system.galera.server.database.nova
+# - system.galera.server.database.ceilometer
+# - system.galera.server.database.cinder
+# - system.galera.server.database.glance
+# - system.galera.server.database.heat
+# - system.galera.server.database.keystone
+# - system.galera.server.database.nova
+
+- system.mysql.client.database.keystone
+- system.mysql.client.database.glance
+- system.mysql.client.database.nova
+- system.mysql.client.database.nova_api
+- system.mysql.client.database.cinder
+- system.mysql.client.database.heat
+
+- service.mysql.server.single
+- system.mysql.client
+- cluster.os_aio_ovs.openstack.dashboard
- cluster.os_aio_ovs
parameters:
- _param:
- galera_server_cluster_name: galeracluster
- galera_server_bind_address: ${_param:cluster_local_address}
- galera_server_bind_port: 3306
- galera_server_admin_user: root
- galera:
- master:
- enabled: true
- name: ${_param:galera_server_cluster_name}
- bind:
- address: ${_param:galera_server_bind_address}
- port: ${_param:galera_server_bind_port}
- maintenance_password: ${_param:galera_server_maintenance_password}
- admin:
- user: ${_param:galera_server_admin_user}
- password: ${_param:galera_server_admin_password}
- members:
- - host: ${_param:openstack_control_node01_address}
- port: 4567
-##################
+# _param:
+# galera_server_cluster_name: galeracluster
+# galera_server_bind_address: ${_param:cluster_local_address}
+# galera_server_bind_port: 3306
+# galera_server_admin_user: root
+# galera:
+# master:
+# enabled: true
+# name: ${_param:galera_server_cluster_name}
+# bind:
+# address: ${_param:galera_server_bind_address}
+# port: ${_param:galera_server_bind_port}
+# maintenance_password: ${_param:galera_server_maintenance_password}
+# admin:
+# user: ${_param:galera_server_admin_user}
+# password: ${_param:galera_server_admin_password}
+# members:
+# - host: ${_param:openstack_control_node01_address}
+# port: 4567
+# ##################
+ mysql:
+ server:
+ version: '5.6'
+ max_connections: 20000
linux:
system:
package:
diff --git a/classes/cluster/os_aio_ovs/openstack/gateway.yml b/classes/cluster/os_aio_ovs/openstack/gateway.yml
index 7792236..37918a2 100644
--- a/classes/cluster/os_aio_ovs/openstack/gateway.yml
+++ b/classes/cluster/os_aio_ovs/openstack/gateway.yml
@@ -2,7 +2,7 @@
- system.linux.system.repo.mcp.openstack
- system.linux.system.repo.mcp.extra
- system.linux.system.repo.saltstack.xenial
-- system.neutron.gateway.cluster
+- service.neutron.gateway.single
- cluster.os_aio_ovs
parameters:
_param:
@@ -75,4 +75,11 @@
use_interfaces:
- ${_param:external_interface}
use_ovs_ports:
- - float-to-ex
\ No newline at end of file
+ - float-to-ex
+ neutron:
+ gateway:
+ dvr: ${_param:neutron_gateway_dvr}
+ qos: ${_param:neutron_enable_qos}
+ agent_mode: ${_param:neutron_gateway_agent_mode}
+ backend:
+ tenant_network_types: ${_param:neutron_tenant_network_types}"
\ No newline at end of file
diff --git a/classes/cluster/os_aio_ovs/openstack/init.yml b/classes/cluster/os_aio_ovs/openstack/init.yml
index b7f244c..58229ef 100644
--- a/classes/cluster/os_aio_ovs/openstack/init.yml
+++ b/classes/cluster/os_aio_ovs/openstack/init.yml
@@ -1,14 +1,14 @@
parameters:
_param:
openstack_control_address: ${_param:openstack_control_node01_address}
- openstack_control_node01_address: 172.16.10.101
+ openstack_control_node01_address: 172.16.10.91
openstack_database_address: ${_param:openstack_control_node01_address}
openstack_message_queue_address: ${_param:openstack_control_node01_address}
openstack_message_queue_node01_address: ${_param:openstack_control_node01_address}
openstack_gateway_address: ${_param:openstack_gateway_node01_address}
openstack_gateway_node01_hostname: gtw01
- openstack_gateway_node01_address: 172.16.10.110
+ openstack_gateway_node01_address: 172.16.10.92
openstack_version: ocata
@@ -35,7 +35,7 @@
cluster_vip_address: ${_param:openstack_control_node01_address}
cluster_local_address: ${_param:single_address}
cluster_node01_hostname: ctl01
- cluster_node01_address: 172.16.10.101
+ cluster_node01_address: ${_param:openstack_control_node01_address}
rabbitmq_secret_key: workshop
rabbitmq_admin_password: workshop
rabbitmq_openstack_password: workshop
@@ -104,12 +104,12 @@
- gtw01
- gtw01.${_param:cluster_domain}
cmp01:
- address: 172.16.10.105
+ address: 172.16.10.93
names:
- cmp01
- cmp01.${_param:cluster_domain}
cmp02:
- address: 172.16.10.106
+ address: 172.16.10.94
names:
- cmp02
- cmp02.${_param:cluster_domain}