summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitry Ilyin <dilyin@mirantis.com>2016-08-24 13:56:26 -0500
committerOleksiy Molchanov <omolchanov@mirantis.com>2017-01-30 13:31:09 +0000
commit53f41e528e4eb8340874d3fa25d32954be5eb0ce (patch)
tree26533437a3161c619428c1816502507a1470ef7d
parenta90d355a10369ffe6da65330af345446e550a9be (diff)
Add parameter auth_s3_keystone_ceph for storage
Notes
Notes (review): Verified+1: Fuel CI <fuel-ci-bot@mirantis.com> Code-Review+2: Dmitry Ilyin <dilyin@mirantis.com> Workflow+1: Dmitry Ilyin <dilyin@mirantis.com> Verified+2: Jenkins Submitted-by: Jenkins Submitted-at: Mon, 30 Jan 2017 14:10:11 +0000 Reviewed-on: https://review.openstack.org/426757 Project: openstack/fuel-noop-fixtures Branch: refs/heads/master
-rw-r--r--hiera/neut_tun.ceph.murano.sahara.ceil-ceph-osd.yaml1
-rw-r--r--hiera/neut_tun.ceph.murano.sahara.ceil-compute.yaml1
-rw-r--r--hiera/neut_tun.ceph.murano.sahara.ceil-controller.yaml1
-rw-r--r--hiera/neut_tun.ceph.murano.sahara.ceil-mongo.yaml1
-rw-r--r--hiera/neut_tun.ceph.murano.sahara.ceil-primary-controller.yaml1
-rw-r--r--hiera/neut_tun.ceph.murano.sahara.ceil-primary-mongo.yaml1
-rw-r--r--hiera/neut_tun.ironic-ironic.yaml1
-rw-r--r--hiera/neut_tun.ironic-primary-controller.yaml1
-rw-r--r--hiera/neut_tun.vms_conf-virt.yaml1
-rw-r--r--hiera/neut_vlan.ceph-ceph-osd.yaml1
-rw-r--r--hiera/neut_vlan.ceph-compute.yaml1
-rw-r--r--hiera/neut_vlan.ceph-primary-controller.yaml1
-rw-r--r--hiera/neut_vlan.dvr-primary-controller.yaml1
-rw-r--r--hiera/neut_vlan.vmware.cinder-vmware.compute-vmware-cinder-vmware.yaml1
-rw-r--r--hiera/neut_vlan.vmware.cinder-vmware.compute-vmware-compute-vmware.yaml1
-rw-r--r--hiera/neut_vlan.vmware.cinder-vmware.compute-vmware-primary-controller.yaml1
-rw-r--r--hiera/neut_vlan.vmware.glance-primary-controller.yaml1
17 files changed, 17 insertions, 0 deletions
diff --git a/hiera/neut_tun.ceph.murano.sahara.ceil-ceph-osd.yaml b/hiera/neut_tun.ceph.murano.sahara.ceil-ceph-osd.yaml
index ee7f62b..d79ac0d 100644
--- a/hiera/neut_tun.ceph.murano.sahara.ceil-ceph-osd.yaml
+++ b/hiera/neut_tun.ceph.murano.sahara.ceil-ceph-osd.yaml
@@ -3012,6 +3012,7 @@ storage:
3012 volumes_block_device: false 3012 volumes_block_device: false
3013 volumes_ceph: true 3013 volumes_ceph: true
3014 volumes_lvm: false 3014 volumes_lvm: false
3015 auth_s3_keystone_ceph: true
3015storage_network_range: 192.168.1.0/24 3016storage_network_range: 192.168.1.0/24
3016swift: 3017swift:
3017 user_password: 2g77TlSldIdjCozj7BsRbKYS 3018 user_password: 2g77TlSldIdjCozj7BsRbKYS
diff --git a/hiera/neut_tun.ceph.murano.sahara.ceil-compute.yaml b/hiera/neut_tun.ceph.murano.sahara.ceil-compute.yaml
index b6bb8e2..99abc25 100644
--- a/hiera/neut_tun.ceph.murano.sahara.ceil-compute.yaml
+++ b/hiera/neut_tun.ceph.murano.sahara.ceil-compute.yaml
@@ -2963,6 +2963,7 @@ storage:
2963 volumes_block_device: false 2963 volumes_block_device: false
2964 volumes_ceph: true 2964 volumes_ceph: true
2965 volumes_lvm: false 2965 volumes_lvm: false
2966 auth_s3_keystone_ceph: true
2966storage_network_range: 192.168.1.0/24 2967storage_network_range: 192.168.1.0/24
2967swift: 2968swift:
2968 user_password: 2g77TlSldIdjCozj7BsRbKYS 2969 user_password: 2g77TlSldIdjCozj7BsRbKYS
diff --git a/hiera/neut_tun.ceph.murano.sahara.ceil-controller.yaml b/hiera/neut_tun.ceph.murano.sahara.ceil-controller.yaml
index 5059847..78a24c0 100644
--- a/hiera/neut_tun.ceph.murano.sahara.ceil-controller.yaml
+++ b/hiera/neut_tun.ceph.murano.sahara.ceil-controller.yaml
@@ -3058,6 +3058,7 @@ storage:
3058 volumes_block_device: false 3058 volumes_block_device: false
3059 volumes_ceph: true 3059 volumes_ceph: true
3060 volumes_lvm: false 3060 volumes_lvm: false
3061 auth_s3_keystone_ceph: true
3061storage_network_range: 192.168.1.0/24 3062storage_network_range: 192.168.1.0/24
3062swift: 3063swift:
3063 user_password: 2g77TlSldIdjCozj7BsRbKYS 3064 user_password: 2g77TlSldIdjCozj7BsRbKYS
diff --git a/hiera/neut_tun.ceph.murano.sahara.ceil-mongo.yaml b/hiera/neut_tun.ceph.murano.sahara.ceil-mongo.yaml
index 777a490..f1d0ce2 100644
--- a/hiera/neut_tun.ceph.murano.sahara.ceil-mongo.yaml
+++ b/hiera/neut_tun.ceph.murano.sahara.ceil-mongo.yaml
@@ -2963,6 +2963,7 @@ storage:
2963 volumes_block_device: false 2963 volumes_block_device: false
2964 volumes_ceph: true 2964 volumes_ceph: true
2965 volumes_lvm: false 2965 volumes_lvm: false
2966 auth_s3_keystone_ceph: true
2966storage_network_range: 192.168.1.0/24 2967storage_network_range: 192.168.1.0/24
2967swift: 2968swift:
2968 user_password: 2g77TlSldIdjCozj7BsRbKYS 2969 user_password: 2g77TlSldIdjCozj7BsRbKYS
diff --git a/hiera/neut_tun.ceph.murano.sahara.ceil-primary-controller.yaml b/hiera/neut_tun.ceph.murano.sahara.ceil-primary-controller.yaml
index 34549fd..5679c47 100644
--- a/hiera/neut_tun.ceph.murano.sahara.ceil-primary-controller.yaml
+++ b/hiera/neut_tun.ceph.murano.sahara.ceil-primary-controller.yaml
@@ -3058,6 +3058,7 @@ storage:
3058 volumes_block_device: false 3058 volumes_block_device: false
3059 volumes_ceph: true 3059 volumes_ceph: true
3060 volumes_lvm: false 3060 volumes_lvm: false
3061 auth_s3_keystone_ceph: true
3061storage_network_range: 192.168.1.0/24 3062storage_network_range: 192.168.1.0/24
3062swift: 3063swift:
3063 user_password: 2g77TlSldIdjCozj7BsRbKYS 3064 user_password: 2g77TlSldIdjCozj7BsRbKYS
diff --git a/hiera/neut_tun.ceph.murano.sahara.ceil-primary-mongo.yaml b/hiera/neut_tun.ceph.murano.sahara.ceil-primary-mongo.yaml
index 61604c4..4e01360 100644
--- a/hiera/neut_tun.ceph.murano.sahara.ceil-primary-mongo.yaml
+++ b/hiera/neut_tun.ceph.murano.sahara.ceil-primary-mongo.yaml
@@ -2963,6 +2963,7 @@ storage:
2963 volumes_block_device: false 2963 volumes_block_device: false
2964 volumes_ceph: true 2964 volumes_ceph: true
2965 volumes_lvm: false 2965 volumes_lvm: false
2966 auth_s3_keystone_ceph: true
2966storage_network_range: 192.168.1.0/24 2967storage_network_range: 192.168.1.0/24
2967swift: 2968swift:
2968 user_password: 2g77TlSldIdjCozj7BsRbKYS 2969 user_password: 2g77TlSldIdjCozj7BsRbKYS
diff --git a/hiera/neut_tun.ironic-ironic.yaml b/hiera/neut_tun.ironic-ironic.yaml
index e8ba865..5633f6c 100644
--- a/hiera/neut_tun.ironic-ironic.yaml
+++ b/hiera/neut_tun.ironic-ironic.yaml
@@ -2730,6 +2730,7 @@ storage:
2730 volumes_block_device: false 2730 volumes_block_device: false
2731 volumes_ceph: false 2731 volumes_ceph: false
2732 volumes_lvm: true 2732 volumes_lvm: true
2733 auth_s3_keystone_ceph: true
2733storage_network_range: 192.168.1.0/24 2734storage_network_range: 192.168.1.0/24
2734swift: 2735swift:
2735 user_password: GSQibP0IGrKQkAfXr9INmFUU 2736 user_password: GSQibP0IGrKQkAfXr9INmFUU
diff --git a/hiera/neut_tun.ironic-primary-controller.yaml b/hiera/neut_tun.ironic-primary-controller.yaml
index 0213c86..b3d781d 100644
--- a/hiera/neut_tun.ironic-primary-controller.yaml
+++ b/hiera/neut_tun.ironic-primary-controller.yaml
@@ -2860,6 +2860,7 @@ storage:
2860 volumes_block_device: false 2860 volumes_block_device: false
2861 volumes_ceph: false 2861 volumes_ceph: false
2862 volumes_lvm: true 2862 volumes_lvm: true
2863 auth_s3_keystone_ceph: true
2863storage_network_range: 192.168.1.0/24 2864storage_network_range: 192.168.1.0/24
2864swift: 2865swift:
2865 user_password: GSQibP0IGrKQkAfXr9INmFUU 2866 user_password: GSQibP0IGrKQkAfXr9INmFUU
diff --git a/hiera/neut_tun.vms_conf-virt.yaml b/hiera/neut_tun.vms_conf-virt.yaml
index e279418..a36fcfa 100644
--- a/hiera/neut_tun.vms_conf-virt.yaml
+++ b/hiera/neut_tun.vms_conf-virt.yaml
@@ -2491,6 +2491,7 @@ storage:
2491 volumes_block_device: false 2491 volumes_block_device: false
2492 volumes_ceph: false 2492 volumes_ceph: false
2493 volumes_lvm: true 2493 volumes_lvm: true
2494 auth_s3_keystone_ceph: true
2494storage_network_range: 192.168.1.0/24 2495storage_network_range: 192.168.1.0/24
2495swift: 2496swift:
2496 user_password: DGgXDinU00vYeuvJA6FUE4uL 2497 user_password: DGgXDinU00vYeuvJA6FUE4uL
diff --git a/hiera/neut_vlan.ceph-ceph-osd.yaml b/hiera/neut_vlan.ceph-ceph-osd.yaml
index 4dad84b..18c7d4d 100644
--- a/hiera/neut_vlan.ceph-ceph-osd.yaml
+++ b/hiera/neut_vlan.ceph-ceph-osd.yaml
@@ -2957,6 +2957,7 @@ storage:
2957 volumes_block_device: false 2957 volumes_block_device: false
2958 volumes_ceph: true 2958 volumes_ceph: true
2959 volumes_lvm: false 2959 volumes_lvm: false
2960 auth_s3_keystone_ceph: true
2960storage_network_range: 192.168.1.0/24 2961storage_network_range: 192.168.1.0/24
2961swift: 2962swift:
2962 user_password: XMOMm8aUVEhegPjWozpuCiz0 2963 user_password: XMOMm8aUVEhegPjWozpuCiz0
diff --git a/hiera/neut_vlan.ceph-compute.yaml b/hiera/neut_vlan.ceph-compute.yaml
index 88ded71..5e7db3e 100644
--- a/hiera/neut_vlan.ceph-compute.yaml
+++ b/hiera/neut_vlan.ceph-compute.yaml
@@ -2908,6 +2908,7 @@ storage:
2908 volumes_block_device: false 2908 volumes_block_device: false
2909 volumes_ceph: true 2909 volumes_ceph: true
2910 volumes_lvm: false 2910 volumes_lvm: false
2911 auth_s3_keystone_ceph: true
2911storage_network_range: 192.168.1.0/24 2912storage_network_range: 192.168.1.0/24
2912swift: 2913swift:
2913 user_password: XMOMm8aUVEhegPjWozpuCiz0 2914 user_password: XMOMm8aUVEhegPjWozpuCiz0
diff --git a/hiera/neut_vlan.ceph-primary-controller.yaml b/hiera/neut_vlan.ceph-primary-controller.yaml
index c25d3a2..22451bb 100644
--- a/hiera/neut_vlan.ceph-primary-controller.yaml
+++ b/hiera/neut_vlan.ceph-primary-controller.yaml
@@ -3003,6 +3003,7 @@ storage:
3003 volumes_block_device: false 3003 volumes_block_device: false
3004 volumes_ceph: true 3004 volumes_ceph: true
3005 volumes_lvm: false 3005 volumes_lvm: false
3006 auth_s3_keystone_ceph: true
3006storage_network_range: 192.168.1.0/24 3007storage_network_range: 192.168.1.0/24
3007swift: 3008swift:
3008 user_password: XMOMm8aUVEhegPjWozpuCiz0 3009 user_password: XMOMm8aUVEhegPjWozpuCiz0
diff --git a/hiera/neut_vlan.dvr-primary-controller.yaml b/hiera/neut_vlan.dvr-primary-controller.yaml
index 2dbe06f..786c845 100644
--- a/hiera/neut_vlan.dvr-primary-controller.yaml
+++ b/hiera/neut_vlan.dvr-primary-controller.yaml
@@ -2867,6 +2867,7 @@ storage:
2867 volumes_block_device: false 2867 volumes_block_device: false
2868 volumes_ceph: false 2868 volumes_ceph: false
2869 volumes_lvm: true 2869 volumes_lvm: true
2870 auth_s3_keystone_ceph: true
2870storage_network_range: 192.168.1.0/24 2871storage_network_range: 192.168.1.0/24
2871swift: 2872swift:
2872 user_password: oZteugntx6IdeP40a6VOdzO0 2873 user_password: oZteugntx6IdeP40a6VOdzO0
diff --git a/hiera/neut_vlan.vmware.cinder-vmware.compute-vmware-cinder-vmware.yaml b/hiera/neut_vlan.vmware.cinder-vmware.compute-vmware-cinder-vmware.yaml
index 181cfac..6e29fd6 100644
--- a/hiera/neut_vlan.vmware.cinder-vmware.compute-vmware-cinder-vmware.yaml
+++ b/hiera/neut_vlan.vmware.cinder-vmware.compute-vmware-cinder-vmware.yaml
@@ -2665,6 +2665,7 @@ storage:
2665 volumes_block_device: false 2665 volumes_block_device: false
2666 volumes_ceph: false 2666 volumes_ceph: false
2667 volumes_lvm: true 2667 volumes_lvm: true
2668 auth_s3_keystone_ceph: true
2668storage_network_range: 10.109.2.0/24 2669storage_network_range: 10.109.2.0/24
2669swift: 2670swift:
2670 user_password: hq3RZjPwCzJXpl1jlPYGLjQw 2671 user_password: hq3RZjPwCzJXpl1jlPYGLjQw
diff --git a/hiera/neut_vlan.vmware.cinder-vmware.compute-vmware-compute-vmware.yaml b/hiera/neut_vlan.vmware.cinder-vmware.compute-vmware-compute-vmware.yaml
index abc3d0c..4a93519 100644
--- a/hiera/neut_vlan.vmware.cinder-vmware.compute-vmware-compute-vmware.yaml
+++ b/hiera/neut_vlan.vmware.cinder-vmware.compute-vmware-compute-vmware.yaml
@@ -2665,6 +2665,7 @@ storage:
2665 volumes_block_device: false 2665 volumes_block_device: false
2666 volumes_ceph: false 2666 volumes_ceph: false
2667 volumes_lvm: true 2667 volumes_lvm: true
2668 auth_s3_keystone_ceph: true
2668storage_network_range: 10.109.2.0/24 2669storage_network_range: 10.109.2.0/24
2669swift: 2670swift:
2670 user_password: hq3RZjPwCzJXpl1jlPYGLjQw 2671 user_password: hq3RZjPwCzJXpl1jlPYGLjQw
diff --git a/hiera/neut_vlan.vmware.cinder-vmware.compute-vmware-primary-controller.yaml b/hiera/neut_vlan.vmware.cinder-vmware.compute-vmware-primary-controller.yaml
index 7926de3..b1dcd20 100644
--- a/hiera/neut_vlan.vmware.cinder-vmware.compute-vmware-primary-controller.yaml
+++ b/hiera/neut_vlan.vmware.cinder-vmware.compute-vmware-primary-controller.yaml
@@ -2830,6 +2830,7 @@ storage:
2830 volumes_block_device: false 2830 volumes_block_device: false
2831 volumes_ceph: false 2831 volumes_ceph: false
2832 volumes_lvm: true 2832 volumes_lvm: true
2833 auth_s3_keystone_ceph: true
2833storage_network_range: 10.109.2.0/24 2834storage_network_range: 10.109.2.0/24
2834swift: 2835swift:
2835 user_password: hq3RZjPwCzJXpl1jlPYGLjQw 2836 user_password: hq3RZjPwCzJXpl1jlPYGLjQw
diff --git a/hiera/neut_vlan.vmware.glance-primary-controller.yaml b/hiera/neut_vlan.vmware.glance-primary-controller.yaml
index c53fe0b..ae8b6ec 100644
--- a/hiera/neut_vlan.vmware.glance-primary-controller.yaml
+++ b/hiera/neut_vlan.vmware.glance-primary-controller.yaml
@@ -2718,6 +2718,7 @@ storage:
2718 volumes_block_device: false 2718 volumes_block_device: false
2719 volumes_ceph: false 2719 volumes_ceph: false
2720 volumes_lvm: true 2720 volumes_lvm: true
2721 auth_s3_keystone_ceph: true
2721storage_network_range: 10.109.2.0/24 2722storage_network_range: 10.109.2.0/24
2722swift: 2723swift:
2723 user_password: uTfPoa9VBhQN3f2ypRvx9lrW 2724 user_password: uTfPoa9VBhQN3f2ypRvx9lrW