Add parameter auth_s3_keystone_ceph for storage

Change-Id: I0b110c252c660db5b69d38c2ba9cde58b4264a32 Related-Bug: 1540426
2016-08-24 13:56:26 -05:00 · 2016-08-24 13:56:26 -05:00 · e3bb0df563
parent d1ff6f0509
commit e3bb0df563
26 changed files with 26 additions and 0 deletions
--- a/hiera/neut_tun.ceph.murano.sahara.ceil-ceph-osd.yaml
+++ b/hiera/neut_tun.ceph.murano.sahara.ceil-ceph-osd.yaml
@ -1130,6 +1130,7 @@ storage:
  volumes_block_device: false
  volumes_ceph: true
  volumes_lvm: false
+  auth_s3_keystone_ceph: true
 storage_network_range: 192.168.1.0/24
 swift:
  user_password: wfwNKTJbcj2v22BnO3tC6VoW
--- a/hiera/neut_tun.ceph.murano.sahara.ceil-compute.yaml
+++ b/hiera/neut_tun.ceph.murano.sahara.ceil-compute.yaml
@ -1111,6 +1111,7 @@ storage:
  volumes_block_device: false
  volumes_ceph: true
  volumes_lvm: false
+  auth_s3_keystone_ceph: true
 storage_network_range: 192.168.1.0/24
 swift:
  user_password: wfwNKTJbcj2v22BnO3tC6VoW
--- a/hiera/neut_tun.ceph.murano.sahara.ceil-controller.yaml
+++ b/hiera/neut_tun.ceph.murano.sahara.ceil-controller.yaml
@ -1182,6 +1182,7 @@ storage:
  volumes_block_device: false
  volumes_ceph: true
  volumes_lvm: false
+  auth_s3_keystone_ceph: true
 storage_network_range: 192.168.1.0/24
 swift:
  user_password: wfwNKTJbcj2v22BnO3tC6VoW
--- a/hiera/neut_tun.ceph.murano.sahara.ceil-mongo.yaml
+++ b/hiera/neut_tun.ceph.murano.sahara.ceil-mongo.yaml
@ -1111,6 +1111,7 @@ storage:
  volumes_block_device: false
  volumes_ceph: true
  volumes_lvm: false
+  auth_s3_keystone_ceph: true
 storage_network_range: 192.168.1.0/24
 swift:
  user_password: wfwNKTJbcj2v22BnO3tC6VoW
--- a/hiera/neut_tun.ceph.murano.sahara.ceil-primary-controller.yaml
+++ b/hiera/neut_tun.ceph.murano.sahara.ceil-primary-controller.yaml
@ -1182,6 +1182,7 @@ storage:
  volumes_block_device: false
  volumes_ceph: true
  volumes_lvm: false
+  auth_s3_keystone_ceph: true
 storage_network_range: 192.168.1.0/24
 swift:
  user_password: wfwNKTJbcj2v22BnO3tC6VoW
--- a/hiera/neut_tun.ceph.murano.sahara.ceil-primary-mongo.yaml
+++ b/hiera/neut_tun.ceph.murano.sahara.ceil-primary-mongo.yaml
@ -1111,6 +1111,7 @@ storage:
  volumes_block_device: false
  volumes_ceph: true
  volumes_lvm: false
+  auth_s3_keystone_ceph: true
 storage_network_range: 192.168.1.0/24
 swift:
  user_password: wfwNKTJbcj2v22BnO3tC6VoW
--- a/hiera/neut_tun.ironic-ironic.yaml
+++ b/hiera/neut_tun.ironic-ironic.yaml
@ -896,6 +896,7 @@ storage:
  volumes_block_device: false
  volumes_ceph: false
  volumes_lvm: true
+  auth_s3_keystone_ceph: true
 storage_network_range: 192.168.1.0/24
 swift:
  user_password: 93nH8n79jBPfZgUs7rldvJ6g
--- a/hiera/neut_tun.ironic-primary-controller.yaml
+++ b/hiera/neut_tun.ironic-primary-controller.yaml
@ -990,6 +990,7 @@ storage:
  volumes_block_device: false
  volumes_ceph: false
  volumes_lvm: true
+  auth_s3_keystone_ceph: true
 storage_network_range: 192.168.1.0/24
 swift:
  user_password: 93nH8n79jBPfZgUs7rldvJ6g
--- a/hiera/neut_tun.l3ha-primary-controller.yaml
+++ b/hiera/neut_tun.l3ha-primary-controller.yaml
@ -994,6 +994,7 @@ storage:
  volumes_block_device: false
  volumes_ceph: false
  volumes_lvm: true
+  auth_s3_keystone_ceph: true
 storage_network_range: 192.168.1.0/24
 swift:
  user_password: GccUDKEvl9uwTTkLHrytHJMV
--- a/hiera/neut_tun.vms_conf-virt.yaml
+++ b/hiera/neut_tun.vms_conf-virt.yaml
@ -818,6 +818,7 @@ storage:
  volumes_block_device: false
  volumes_ceph: false
  volumes_lvm: true
+  auth_s3_keystone_ceph: true
 storage_network_range: 192.168.1.0/24
 swift:
  user_password: g8dYoajN7YGmfrTkW9OCXj8l
--- a/hiera/neut_vlan.ceph-ceph-osd.yaml
+++ b/hiera/neut_vlan.ceph-ceph-osd.yaml
@ -1079,6 +1079,7 @@ storage:
  volumes_block_device: false
  volumes_ceph: true
  volumes_lvm: false
+  auth_s3_keystone_ceph: true
 storage_network_range: 192.168.1.0/24
 swift:
  user_password: S7QuCoPJM1caQ35ro7e45L18
--- a/hiera/neut_vlan.ceph-compute.yaml
+++ b/hiera/neut_vlan.ceph-compute.yaml
@ -1060,6 +1060,7 @@ storage:
  volumes_block_device: false
  volumes_ceph: true
  volumes_lvm: false
+  auth_s3_keystone_ceph: true
 storage_network_range: 192.168.1.0/24
 swift:
  user_password: S7QuCoPJM1caQ35ro7e45L18
--- a/hiera/neut_vlan.ceph-primary-controller.yaml
+++ b/hiera/neut_vlan.ceph-primary-controller.yaml
@ -1131,6 +1131,7 @@ storage:
  volumes_block_device: false
  volumes_ceph: true
  volumes_lvm: false
+  auth_s3_keystone_ceph: true
 storage_network_range: 192.168.1.0/24
 swift:
  user_password: S7QuCoPJM1caQ35ro7e45L18
--- a/hiera/neut_vlan.dvr-primary-controller.yaml
+++ b/hiera/neut_vlan.dvr-primary-controller.yaml
@ -995,6 +995,7 @@ storage:
  volumes_block_device: false
  volumes_ceph: false
  volumes_lvm: true
+  auth_s3_keystone_ceph: true
 storage_network_range: 192.168.1.0/24
 swift:
  user_password: ANkLNgg5xKiXY8hmxk7YZWoG
--- a/hiera/neut_vlan.murano.sahara.ceil-cinder-block-device.yaml
+++ b/hiera/neut_vlan.murano.sahara.ceil-cinder-block-device.yaml
@ -1104,6 +1104,7 @@ storage:
  volumes_block_device: false
  volumes_ceph: false
  volumes_lvm: true
+  auth_s3_keystone_ceph: true
 storage_network_range: 192.168.1.0/24
 swift:
  user_password: Fl1z5x5aNiU81VLfeN8BKptj
--- a/hiera/neut_vlan.murano.sahara.ceil-cinder.yaml
+++ b/hiera/neut_vlan.murano.sahara.ceil-cinder.yaml
@ -1103,6 +1103,7 @@ storage:
  volumes_block_device: false
  volumes_ceph: false
  volumes_lvm: true
+  auth_s3_keystone_ceph: true
 storage_network_range: 192.168.1.0/24
 swift:
  user_password: Fl1z5x5aNiU81VLfeN8BKptj
--- a/hiera/neut_vlan.murano.sahara.ceil-compute.yaml
+++ b/hiera/neut_vlan.murano.sahara.ceil-compute.yaml
@ -1108,6 +1108,7 @@ storage:
  volumes_block_device: false
  volumes_ceph: false
  volumes_lvm: true
+  auth_s3_keystone_ceph: true
 storage_network_range: 192.168.1.0/24
 swift:
  user_password: Fl1z5x5aNiU81VLfeN8BKptj
--- a/hiera/neut_vlan.murano.sahara.ceil-controller.yaml
+++ b/hiera/neut_vlan.murano.sahara.ceil-controller.yaml
@ -1202,6 +1202,7 @@ storage:
  volumes_block_device: false
  volumes_ceph: false
  volumes_lvm: true
+  auth_s3_keystone_ceph: true
 storage_network_range: 192.168.1.0/24
 swift:
  user_password: Fl1z5x5aNiU81VLfeN8BKptj
--- a/hiera/neut_vlan.murano.sahara.ceil-mongo.yaml
+++ b/hiera/neut_vlan.murano.sahara.ceil-mongo.yaml
@ -1108,6 +1108,7 @@ storage:
  volumes_block_device: false
  volumes_ceph: false
  volumes_lvm: true
+  auth_s3_keystone_ceph: true
 storage_network_range: 192.168.1.0/24
 swift:
  user_password: Fl1z5x5aNiU81VLfeN8BKptj
--- a/hiera/neut_vlan.murano.sahara.ceil-primary-controller.yaml
+++ b/hiera/neut_vlan.murano.sahara.ceil-primary-controller.yaml
@ -1202,6 +1202,7 @@ storage:
  volumes_block_device: false
  volumes_ceph: false
  volumes_lvm: true
+  auth_s3_keystone_ceph: true
 storage_network_range: 192.168.1.0/24
 swift:
  user_password: Fl1z5x5aNiU81VLfeN8BKptj
--- a/hiera/neut_vlan.murano.sahara.ceil-primary-mongo.yaml
+++ b/hiera/neut_vlan.murano.sahara.ceil-primary-mongo.yaml
@ -1108,6 +1108,7 @@ storage:
  volumes_block_device: false
  volumes_ceph: false
  volumes_lvm: true
+  auth_s3_keystone_ceph: true
 storage_network_range: 192.168.1.0/24
 swift:
  user_password: Fl1z5x5aNiU81VLfeN8BKptj
--- a/hiera/neut_vlan.vmware.cinder-vmware.compute-vmware-cinder-vmware.yaml
+++ b/hiera/neut_vlan.vmware.cinder-vmware.compute-vmware-cinder-vmware.yaml
@ -2616,6 +2616,7 @@ storage:
  volumes_block_device: false
  volumes_ceph: false
  volumes_lvm: true
+  auth_s3_keystone_ceph: true
 storage_network_range: 10.109.2.0/24
 swift:
  user_password: NSRHsAspBoarIr8LQoQVVeVG
--- a/hiera/neut_vlan.vmware.cinder-vmware.compute-vmware-compute-vmware.yaml
+++ b/hiera/neut_vlan.vmware.cinder-vmware.compute-vmware-compute-vmware.yaml
@ -2616,6 +2616,7 @@ storage:
  volumes_block_device: false
  volumes_ceph: false
  volumes_lvm: true
+  auth_s3_keystone_ceph: true
 storage_network_range: 10.109.2.0/24
 swift:
  user_password: NSRHsAspBoarIr8LQoQVVeVG
--- a/hiera/neut_vlan.vmware.cinder-vmware.compute-vmware-primary-controller.yaml
+++ b/hiera/neut_vlan.vmware.cinder-vmware.compute-vmware-primary-controller.yaml
@ -2733,6 +2733,7 @@ storage:
  volumes_block_device: false
  volumes_ceph: false
  volumes_lvm: true
+  auth_s3_keystone_ceph: true
 storage_network_range: 10.109.2.0/24
 swift:
  user_password: NSRHsAspBoarIr8LQoQVVeVG
--- a/hiera/neut_vlan.vmware.glance-primary-controller.yaml
+++ b/hiera/neut_vlan.vmware.glance-primary-controller.yaml
@ -2621,6 +2621,7 @@ storage:
  volumes_block_device: false
  volumes_ceph: false
  volumes_lvm: true
+  auth_s3_keystone_ceph: true
 storage_network_range: 10.109.2.0/24
 swift:
  user_password: JsunMNRgctcKrMteu2vGOVe8
--- a/utils/generate_yamls.sh
+++ b/utils/generate_yamls.sh
@ -63,6 +63,7 @@ function enable_ceph {
  attr["editable"]["storage"]["ephemeral_ceph"]["value"] = true
  attr["editable"]["storage"]["volumes_lvm"]["value"] = false
  attr["editable"]["storage"]["osd_pool_size"]["value"] = "2"
+  attr["editable"]["storage"]["auth_s3_keystone_ceph"]["value"] = true
  File.open(ARGV[0], "w").write(attr.to_yaml)' "cluster_$1/attributes.yaml"
  fuel env --attributes --env $1 --upload
 }