From f129bdaa8fbbd73d0d6d8c6d5d13e49b33e5bc0f Mon Sep 17 00:00:00 2001 From: alexey-mr Date: Thu, 11 Aug 2016 12:01:05 +0300 Subject: [PATCH] Keep other glance storeages in config Add dependency for upload_cirros task to upload into cinder store. Change-Id: If60149d7b0c609ec41e493cfbcf32094109471a4 --- deployment_scripts/puppet/manifests/glance.pp | 20 +++++---- .../manifests/glance_create_test_image.pp | 29 ------------- .../manifests/glance_delete_test_image.pp | 24 ----------- deployment_tasks.yaml | 42 ++++--------------- 4 files changed, 20 insertions(+), 95 deletions(-) delete mode 100644 deployment_scripts/puppet/manifests/glance_create_test_image.pp delete mode 100644 deployment_scripts/puppet/manifests/glance_delete_test_image.pp diff --git a/deployment_scripts/puppet/manifests/glance.pp b/deployment_scripts/puppet/manifests/glance.pp index 310ba94..af768c5 100644 --- a/deployment_scripts/puppet/manifests/glance.pp +++ b/deployment_scripts/puppet/manifests/glance.pp @@ -3,18 +3,20 @@ define glance_config( $config_file, ) { - Ini_setting { - ensure => 'present', - section => 'glance_store', - path => $config_file, - } + ini_subsetting { "${config_file}: stores": + ensure => 'present', + path => $config_file, + section => 'glance_store', + setting => 'stores', + subsetting => 'glance.store.cinder.Store', + subsetting_separator => ',', + } -> ini_setting { "${config_file}: default_store": + ensure => 'present', + path => $config_file, + section => 'glance_store', setting => 'default_store', value => 'cinder', - } -> - ini_setting { "${config_file}: stores": - setting => 'stores', - value => 'glance.store.cinder.Store', } } diff --git a/deployment_scripts/puppet/manifests/glance_create_test_image.pp b/deployment_scripts/puppet/manifests/glance_create_test_image.pp deleted file mode 100644 index 47d5e56..0000000 --- a/deployment_scripts/puppet/manifests/glance_create_test_image.pp +++ /dev/null @@ -1,29 +0,0 @@ -# The puppet create new OpenStack Glance's test image. - -notice('MODULAR: scaleio: glance_create_test_image') - -$scaleio = hiera('scaleio') -if $scaleio['metadata']['enabled'] { - $all_nodes = hiera('nodes') - $nodes = filter_nodes($all_nodes, 'name', $::hostname) - if empty(filter_nodes($nodes, 'role', 'primary-controller')) { - fail("create test image task should be run only on primary-controller, but node ${::hostname} is not primary-controller") - } - if $scaleio['use_scaleio_for_glance'] { - $test_vm_image_cfg = hiera('test_vm_image') - if $test_vm_image_cfg { - $image_name = $test_vm_image_cfg['img_name'] - $local_path = $test_vm_image_cfg['img_path'] - $is_public_opts = $test_vm_image_cfg['public'] ? { - false => '--private', - 'false' => '--private', - default => '--public', - } - exec {"test image create": - command => "bash -c 'source /root/openrc && openstack image create ${is_public_opts} --file ${local_path} ${image_name}'", - unless => "bash -c 'source /root/openrc && openstack image list | grep -qi ${image_name}'", - path => '/bin:/usr/bin:/usr/local/bin', - } - } - } -} diff --git a/deployment_scripts/puppet/manifests/glance_delete_test_image.pp b/deployment_scripts/puppet/manifests/glance_delete_test_image.pp deleted file mode 100644 index 12c8b2b..0000000 --- a/deployment_scripts/puppet/manifests/glance_delete_test_image.pp +++ /dev/null @@ -1,24 +0,0 @@ -# The puppet removes OpenStack Glance's test image if it exists. -# It's needed to change default backend for images. - -notice('MODULAR: scaleio: glance_delete_test_image') - -$scaleio = hiera('scaleio') -if $scaleio['metadata']['enabled'] { - $all_nodes = hiera('nodes') - $nodes = filter_nodes($all_nodes, 'name', $::hostname) - if empty(filter_nodes($nodes, 'role', 'primary-controller')) { - fail("delete test image task should be run only on primary-controller, but node ${::hostname} is not primary-controller") - } - if $scaleio['use_scaleio_for_glance'] { - $test_vm_image_cfg = hiera('test_vm_image') - if $test_vm_image_cfg { - $test_image = $test_vm_image_cfg['img_name'] - exec {"test image delete": - command => "bash -c 'source /root/openrc && openstack image delete ${test_image}'", - onlyif => "bash -c 'source /root/openrc && openstack image list | grep -qi ${test_image}'", - path => '/bin:/usr/bin:/usr/local/bin', - } - } - } -} diff --git a/deployment_tasks.yaml b/deployment_tasks.yaml index cef4b15..e120252 100644 --- a/deployment_tasks.yaml +++ b/deployment_tasks.yaml @@ -1,6 +1,6 @@ ############################################################################## # ScaleIO task groups -############################################################################## +############################################################################## # for next version: # - id: scaleio-storage-tier1 # type: group @@ -11,7 +11,7 @@ # parameters: # strategy: # type: parallel -# +# # - id: scaleio-storage-tier2 # type: group # role: [scaleio-storage-tier2] @@ -39,7 +39,7 @@ ############################################################################## # ScaleIO prerequisites tasks -############################################################################## +############################################################################## - id: scaleio-environment # role: [scaleio-storage-tier1, scaleio-storage-tier2, primary-controller, controller, compute, cinder] role: [primary-controller, controller, compute, cinder] @@ -95,7 +95,7 @@ puppet_manifest: puppet/manifests/resize_cluster.pp puppet_modules: puppet/modules:/etc/puppet/modules timeout: 600 - + - id: scaleio-mdm-server role: [primary-controller, controller] required_for: [post_deployment_end] @@ -126,7 +126,7 @@ puppet_manifest: puppet/manifests/sds_server.pp puppet_modules: puppet/modules:/etc/puppet/modules timeout: 1800 - + - id: scaleio-sdc-server required_for: [post_deployment_end] requires: [scaleio-sds-server, scaleio-environment-existing-mdm-ips] @@ -188,39 +188,15 @@ puppet_modules: puppet/modules:/etc/puppet/modules timeout: 600 -- id: scaleio-glance-delete-test-image - required_for: [post_deployment_end] - requires: [scaleio-configure-cluster, upload_cirros] - cross-depends: - - name: scaleio-configure-cluster - - name: upload_cirros - role: [primary-controller] - type: puppet - parameters: - puppet_manifest: puppet/manifests/glance_delete_test_image.pp - puppet_modules: puppet/modules:/etc/puppet/modules - timeout: 600 - - id: scaleio-glance - required_for: [post_deployment_end] - requires: [scaleio-glance-delete-test-image] + required_for: [upload_cirros, post_deployment_end] + requires: [scaleio-cinder] cross-depends: - - name: scaleio-glance-delete-test-image + - name: scaleio-cinder + - name: upload_cirros role: [primary-controller, controller] type: puppet parameters: puppet_manifest: puppet/manifests/glance.pp puppet_modules: puppet/modules:/etc/puppet/modules timeout: 600 - -- id: scaleio-glance-create-test-image - required_for: [post_deployment_end] - requires: [scaleio-glance] - cross-depends: - - name: scaleio-glance - role: [primary-controller] - type: puppet - parameters: - puppet_manifest: puppet/manifests/glance_create_test_image.pp - puppet_modules: puppet/modules:/etc/puppet/modules - timeout: 600