diff options
Diffstat (limited to 'mcp')
| -rw-r--r-- | mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/openstack/control.yml | 7 | ||||
| m--------- | mcp/reclass/classes/system | 0 | ||||
| -rwxr-xr-x | mcp/reclass/scripts/infra.sh | 2 | ||||
| -rwxr-xr-x | mcp/reclass/scripts/openstack.sh | 9 |
4 files changed, 3 insertions, 15 deletions
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 15266f2ea..65fc1e474 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 @@ -1,6 +1,5 @@ classes: - system.linux.system.lowmem -- system.linux.system.repo.glusterfs - system.linux.system.repo.mcp.openstack - system.linux.system.repo.mcp.extra - system.linux.system.repo.saltstack.xenial @@ -10,12 +9,6 @@ classes: - system.rabbitmq.server.vhost.openstack - system.keystone.server.wsgi - system.keystone.server.cluster -- system.glusterfs.client.cluster -- system.glusterfs.client.volume.glance -- system.glusterfs.client.volume.keystone -- system.glusterfs.server.volume.glance -- system.glusterfs.server.volume.keystone -- system.glusterfs.server.cluster - system.glance.control.cluster - system.nova.control.cluster - system.neutron.control.openvswitch.cluster diff --git a/mcp/reclass/classes/system b/mcp/reclass/classes/system -Subproject 8c33e7f156c442781accedcb8ad73288633bac0 +Subproject 89b124ec180fa47d093acb38010dcf130016fef diff --git a/mcp/reclass/scripts/infra.sh b/mcp/reclass/scripts/infra.sh index 1f5e3e44f..72ad5aa5a 100755 --- a/mcp/reclass/scripts/infra.sh +++ b/mcp/reclass/scripts/infra.sh @@ -1,7 +1,7 @@ #!/bin/bash BASE_IMAGE=https://cloud-images.ubuntu.com/xenial/current/xenial-server-cloudimg-amd64-disk1.img -declare -A NODES=( [cfg01]=4096 [ctl01]=8192 [ctl02]=8192 [ctl03]=8192 [gtw01]=2048 [cmp01]=6144 ) +declare -A NODES=( [cfg01]=4096 [ctl01]=14336 [gtw01]=2048 [cmp01]=6144 [cmp02]=6144 ) # get required packages apt-get install -y mkisofs curl virtinst cpu-checker qemu-kvm diff --git a/mcp/reclass/scripts/openstack.sh b/mcp/reclass/scripts/openstack.sh index c3ffb0d7f..9dd4bd614 100755 --- a/mcp/reclass/scripts/openstack.sh +++ b/mcp/reclass/scripts/openstack.sh @@ -7,7 +7,7 @@ ssh $SSH_OPTS ubuntu@$SALT_MASTER bash -s << OPENSTACK_INSTALL_END sudo -i salt-call state.apply salt - salt '*' state.apply salt + salt '*' state.apply salt || salt '*' state.apply salt salt -C 'I@salt:master' state.sls linux salt -C '* and not cfg01*' state.sls linux @@ -19,12 +19,7 @@ ssh $SSH_OPTS ubuntu@$SALT_MASTER bash -s << OPENSTACK_INSTALL_END salt -C 'I@rabbitmq:server' state.sls rabbitmq salt -C 'I@rabbitmq:server' cmd.run "rabbitmqctl cluster_status" - salt -C 'I@glusterfs:server' state.sls glusterfs.server.service - salt -C 'I@glusterfs:server' state.sls glusterfs.server.setup -b 1 - salt -C 'I@glusterfs:server' cmd.run "gluster peer status; gluster volume status" -b 1 - salt -C 'I@galera:master' state.sls galera - salt -C 'I@galera:slave' state.sls galera salt -C 'I@galera:master' mysql.status | grep -A1 wsrep_cluster_size salt -C 'I@haproxy:proxy' state.sls haproxy @@ -32,7 +27,7 @@ ssh $SSH_OPTS ubuntu@$SALT_MASTER bash -s << OPENSTACK_INSTALL_END salt -C 'I@keystone:server' state.sls keystone.server -b 1 salt -C 'I@keystone:server' cmd.run "service apache2 restart" - salt -C 'I@keystone:client' state.sls keystone.client + while true; do salt -C 'I@keystone:client' state.sls keystone.client && break; done salt -C 'I@keystone:server' cmd.run ". /root/keystonercv3; openstack user list" salt -C 'I@glance:server' state.sls glance -b 1 |