| commit | 1b8979dc9fc8ce8d926008bdfa7ae21ce55bb950 | [log] [tgz] |
|---|---|---|
| author | Dennis Dmitriev <ddmitriev@mirantis.com> | Fri Oct 19 19:53:02 2018 +0300 |
| committer | Dennis Dmitriev <dis.xcom@gmail.com> | Fri Oct 19 17:05:58 2018 +0000 |
| tree | 8896993c7d31b683eff07ea4b745ced7818b7be4 | |
| parent | 595d56c215dd21a316bec8314c1b722e31bcac97 [diff] [blame] |
Move 'cinder' LVM volumes from ctl to cmp nodes Based on changes: https://gerrit.mcp.mirantis.com/#/c/28650/ https://review.gerrithub.io/#/c/Mirantis/environment-template/+/430087/ Only cookied models are changed, static deployments left as is. - move 'cinder' volumes to cmp nodes in underlay.yml - remove 'cinder' volume from non-relevant nodes - rename 'cinder' volumes on CEPH configs to correct labels Change-Id: Iadfc153ecb80391a94efd872553c7a2e5219d426
diff --git a/tcp_tests/templates/cookied-model-generator/salt_cookied-cicd-pike-ovs-sl.yaml b/tcp_tests/templates/cookied-model-generator/salt_cookied-cicd-pike-ovs-sl.yaml index d189cce..bbcd091 100644 --- a/tcp_tests/templates/cookied-model-generator/salt_cookied-cicd-pike-ovs-sl.yaml +++ b/tcp_tests/templates/cookied-model-generator/salt_cookied-cicd-pike-ovs-sl.yaml
@@ -43,4 +43,12 @@ retry: {count: 1, delay: 5} skip_fail: false +- description: "Temporary workaround: remove cinder-volume from CTL nodes" + cmd: | + sed -i 's/\-\ system\.cinder\.volume\.single//g' /srv/salt/reclass/classes/cluster/{{ SHARED.CLUSTER_NAME }}/openstack/control.yml; + sed -i 's/\-\ system\.cinder\.volume\.notification\.messagingv2//g' /srv/salt/reclass/classes/cluster/{{ SHARED.CLUSTER_NAME }}/openstack/control.yml; + node_name: {{ HOSTNAME_CFG01 }} + retry: {count: 1, delay: 5} + skip_fail: true + {{ SHARED.MACRO_GENERATE_INVENTORY(RERUN_SALTMASTER_STATE=true) }}