Update stor4nfv install scripts according to opensds aruba release

Since OpenSDS has published its aruba release and also supports
OpenStack scenario, this patch is designed for updating stor4nfv
code to prepare for integrating Compass4NFV and Apex installer on
OpenStack scenario.
Besides the large code changes, some tutorial docs are also added
or updated for better installing this project.

Change-Id: I1e4fec652c6c860028ef39448bc323839f3aa95c
Signed-off-by: leonwang <wanghui71@huawei.com>

1 files changed, 39 insertions, 12 deletions

diff --git a/ci/ansible/group_vars/ceph/all.yml b/ci/ansible/group_vars/ceph/all.yml
index 9594d33..b5f630a 100644
--- a/ci/ansible/group_vars/ceph/all.yml
+++ b/ci/ansible/group_vars/ceph/all.yml
@@ -1,3 +1,17 @@
+# Copyright (c) 2018 Huawei Technologies Co., Ltd. All Rights Reserved.

+#

+# Licensed under the Apache License, Version 2.0 (the "License");

+# you may not use this file except in compliance with the License.

+# You may obtain a copy of the License at

+#

+#     http://www.apache.org/licenses/LICENSE-2.0

+#

+# Unless required by applicable law or agreed to in writing, software

+# distributed under the License is distributed on an "AS IS" BASIS,

+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

+# See the License for the specific language governing permissions and

+# limitations under the License.

+

 ---

 # Variables here are applicable to all host groups NOT roles

 

@@ -9,6 +23,17 @@ dummy:
 

 # You can override vars by using host or group vars

 

+ceph_origin: repository

+ceph_repository: community

+ceph_stable_release: luminous

+public_network: "192.168.3.0/24"

+cluster_network: "{{ public_network }}"

+monitor_interface: eth1

+devices:

+  - '/dev/sda'

+  #- '/dev/sdb'

+osd_scenario: collocated

+

 ###########

 # GENERAL #

 ###########

@@ -125,8 +150,7 @@ dummy:
 #  - repository

 #  - distro

 #  - local

-ceph_origin: repository

-ceph_repository: community

+

 

 #ceph_repository: "{{ 'community' if ceph_stable else 'rhcs' if ceph_rhcs else 'dev' if ceph_dev else 'uca' if ceph_stable_uca else 'custom' if ceph_custom else 'dummy' }}" # backward compatibility with stable-2.2, will disappear in stable 3.1

 #valid_ceph_repository:

@@ -143,7 +167,7 @@ ceph_repository: community
 #

 #ceph_mirror: http://download.ceph.com

 #ceph_stable_key: https://download.ceph.com/keys/release.asc

-ceph_stable_release: luminous

+#ceph_stable_release: dummy

 #ceph_stable_repo: "{{ ceph_mirror }}/debian-{{ ceph_stable_release }}"

 

 #nfs_ganesha_stable: true # use stable repos for nfs-ganesha

@@ -313,8 +337,7 @@ ceph_stable_release: luminous
 # These variables must be defined at least in all.yml and overrided if needed (inventory host file or group_vars/*.yml).

 # Eg. If you want to specify for each monitor which address the monitor will bind to you can set it in your **inventory host file** by using 'monitor_address' variable.

 # Preference will go to monitor_address if both monitor_address and monitor_interface are defined.

-# To use an IPv6 address, use the monitor_address setting instead (and set ip_version to ipv6)

-monitor_interface: ens3

+#monitor_interface: "{{ ceph_mon_docker_interface if ceph_mon_docker_interface != 'interface' else 'interface' }}" # backward compatibility with stable-2.2, will disappear in stable 3.1

 #monitor_address: 0.0.0.0

 #monitor_address_block: subnet

 # set to either ipv4 or ipv6, whichever your network is using

@@ -323,9 +346,9 @@ monitor_interface: ens3
 

 ## OSD options

 #

-journal_size: 100 # OSD journal size in MB

-public_network: 100.64.128.40/24

-cluster_network: "{{ public_network }}"

+#journal_size: 5120 # OSD journal size in MB

+#public_network: "{{ ceph_mon_docker_subnet if ceph_mon_docker_subnet != '0.0.0.0/0' else '0.0.0.0/0' }}" # backward compatibility with stable-2.2, will disappear in stable 3.1

+#cluster_network: "{{ public_network | regex_replace(' ', '') }}"

 #osd_mkfs_type: xfs

 #osd_mkfs_options_xfs: -f -i size=2048

 #osd_mount_options_xfs: noatime,largeio,inode64,swalloc

@@ -358,11 +381,10 @@ cluster_network: "{{ public_network }}"
 # These variables must be defined at least in all.yml and overrided if needed (inventory host file or group_vars/*.yml).

 # Eg. If you want to specify for each radosgw node which address the radosgw will bind to you can set it in your **inventory host file** by using 'radosgw_address' variable.

 # Preference will go to radosgw_address if both radosgw_address and radosgw_interface are defined.

-# To use an IPv6 address, use the radosgw_address setting instead (and set ip_version to ipv6)

 #radosgw_interface: interface

 #radosgw_address: "{{ '0.0.0.0' if rgw_containerized_deployment else 'address' }}" # backward compatibility with stable-2.2, will disappear in stable 3.1

 #radosgw_address_block: subnet

-#radosgw_keystone: false # activate OpenStack Keystone options full detail here: http://ceph.com/docs/master/radosgw/keystone/

+#radosgw_keystone_ssl: false # activate this when using keystone PKI keys

 # Rados Gateway options

 #email_address: foo@bar.com

 

@@ -475,8 +497,8 @@ cluster_network: "{{ public_network }}"
 #ceph_docker_registry: docker.io

 #ceph_docker_enable_centos_extra_repo: false

 #ceph_docker_on_openstack: false

-#ceph_mon_docker_interface: "{{ monitor_interface }}" # backward compatibility with stable-2.2, will disappear in stable 3.1

-#ceph_mon_docker_subnet: "{{ public_network }}" # backward compatibility with stable-2.2, will disappear in stable 3.1

+#ceph_mon_docker_interface: "interface" # backward compatibility with stable-2.2, will disappear in stable 3.1

+#ceph_mon_docker_subnet: "0.0.0.0/0" # backward compatibility with stable-2.2, will disappear in stable 3.1

 #mon_containerized_deployment: False # backward compatibility with stable-2.2, will disappear in stable 3.1

 #osd_containerized_deployment: False # backward compatibility with stable-2.2, will disappear in stable 3.1

 #mds_containerized_deployment: False # backward compatibility with stable-2.2, will disappear in stable 3.1

@@ -499,3 +521,8 @@ cluster_network: "{{ public_network }}"
 #rolling_update: false

 

 

+#####################

+# Docker pull retry #

+#####################

+#docker_pull_retry: 3

+#docker_pull_timeout: "300s"