summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xmcp/config/states/networks2
-rwxr-xr-xmcp/config/states/openstack32
-rw-r--r--mcp/reclass/classes/cluster/virtual-mcp-ocata-odl/openstack/compute.yml4
-rw-r--r--mcp/reclass/classes/cluster/virtual-mcp-ocata-odl/openstack/control.yml1
-rw-r--r--mcp/reclass/classes/cluster/virtual-mcp-ocata-odl/openstack/init.yml2
-rw-r--r--mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/openstack/compute.yml4
-rw-r--r--mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/openstack/control.yml1
-rw-r--r--mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/openstack/init.yml12
m---------mcp/reclass/classes/system0
-rw-r--r--mcp/scripts/lib.sh2
10 files changed, 31 insertions, 29 deletions
diff --git a/mcp/config/states/networks b/mcp/config/states/networks
index 10f71c213..acb039e2a 100755
--- a/mcp/config/states/networks
+++ b/mcp/config/states/networks
@@ -1,3 +1,3 @@
-salt 'ctl01*' cmd.run ". /root/keystonercv3; openstack compute service list; openstack network agent list; openstack stack list; openstack volume list"
+salt 'ctl01*' cmd.run ". /root/keystonercv3; openstack compute service list; openstack network agent list; openstack stack list; openstack volume service list"
salt 'ctl01*' cmd.run ". /root/keystonercv3; openstack network create --share --external --provider-network-type flat --provider-physical-network physnet1 floating_net"
salt 'ctl01*' cmd.run ". /root/keystonercv3; openstack subnet create --gateway 10.16.0.1 --no-dhcp --allocation-pool start=10.16.0.130,end=10.16.0.254 --network floating_net --subnet-range 10.16.0.0/24 floating_subnet"
diff --git a/mcp/config/states/openstack b/mcp/config/states/openstack
index 3a15c2e51..1946af553 100755
--- a/mcp/config/states/openstack
+++ b/mcp/config/states/openstack
@@ -1,20 +1,22 @@
-salt -C 'I@rabbitmq:server' state.sls rabbitmq
-salt -C 'I@rabbitmq:server' cmd.run "rabbitmqctl status"
+salt -I 'rabbitmq:server' state.sls rabbitmq
+salt -I 'rabbitmq:server' cmd.run "rabbitmqctl status"
-salt -C 'I@mysql:server' state.sls mysql
-salt -C 'I@memcached:server' state.sls memcached
+salt -I 'mysql:server' state.sls mysql
+salt -I 'memcached:server' state.sls memcached
-salt -C 'I@keystone:server' state.sls keystone.server
-salt -C 'I@keystone:server' service.restart apache2
-salt -C 'I@keystone:server' state.sls keystone.client
-salt -C 'I@keystone:server' cmd.run ". /root/keystonercv3; openstack service list"
+salt -I 'keystone:server' state.sls keystone.server
+salt -I 'keystone:server' service.restart apache2
+salt -I 'keystone:server' state.sls keystone.client
+salt -I 'keystone:server' cmd.run ". /root/keystonercv3; openstack service list"
-salt -C 'I@glance:server' state.sls glance
-salt -C 'I@nova:controller' state.sls nova
-salt -C 'I@heat:server' state.sls heat
-salt -C 'I@cinder:controller' state.sls cinder
+salt -I 'glance:server' state.sls glance
+salt -I 'nova:controller' state.sls nova
+salt -I 'heat:server' state.sls heat
-salt -C 'I@neutron:server' state.sls neutron
-salt -C 'I@neutron:gateway' state.sls neutron
+salt -I 'cinder:controller' state.sls cinder
+salt -I 'cinder:volume' state.sls cinder
-salt -C 'I@nova:compute' state.sls nova
+salt -I 'neutron:server' state.sls neutron
+salt -I 'neutron:gateway' state.sls neutron
+
+salt -I 'nova:compute' state.sls nova
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:
diff --git a/mcp/reclass/classes/system b/mcp/reclass/classes/system
-Subproject 8a7dc2f6ae598cc95300fd404dfb8dd75185ecb
+Subproject 947500aa320e5d6ba26fa5fe18f4bd260015fd9
diff --git a/mcp/scripts/lib.sh b/mcp/scripts/lib.sh
index bf8e3c100..b3abd21c7 100644
--- a/mcp/scripts/lib.sh
+++ b/mcp/scripts/lib.sh
@@ -95,7 +95,7 @@ check_connection() {
# wait until ssh on Salt master is available
while (($attempt <= $total_attempts)); do
- ssh -i ${SSH_OPTS} ubuntu@${SALT_MASTER} uptime
+ ssh ${SSH_OPTS} ubuntu@${SALT_MASTER} uptime
case $? in
0) echo "${attempt}> Success"; break ;;
*) echo "${attempt}/${total_attempts}> ssh server ain't ready yet, waiting for ${sleep_time} seconds ..." ;;