From 91a84330494b100ac9077652c910fb248f737717 Mon Sep 17 00:00:00 2001 From: leonwang Date: Tue, 7 Aug 2018 14:49:27 +0800 Subject: Update the latest version of ansible script This patch is proposed for merging the latest version of ansible code according to opensds-installer project. From the latest version code, we change the default installation way from source code to release, which means there is no need for golang environment prepare and long-time building work. Change-Id: I93d7d24f29e61979bc8fda7125ae753063eda423 Signed-off-by: leonwang --- ci/ansible/group_vars/common.yml | 32 ++++++++++++++++++++------------ ci/ansible/group_vars/osdsdb.yml | 3 +++ ci/ansible/group_vars/osdsdock.yml | 7 ------- ci/ansible/group_vars/osdslet.yml | 7 ------- 4 files changed, 23 insertions(+), 26 deletions(-) (limited to 'ci/ansible/group_vars') diff --git a/ci/ansible/group_vars/common.yml b/ci/ansible/group_vars/common.yml index 50749e6..dab13a7 100644 --- a/ci/ansible/group_vars/common.yml +++ b/ci/ansible/group_vars/common.yml @@ -24,11 +24,15 @@ dummy: # This field indicates which way user prefers to install, currently support # 'repository', 'release' and 'container' -install_from: repository +install_from: release + +# This field indicates which os family the system will be running, currently +# support 'Debian' and 'RedHat' +ansible_os_family: Debian # These fields are NOT suggested to be modifie -opensds_work_dir: /opt/opensds-linux-amd64 -nbp_work_dir: /opt/opensds-k8s-linux-amd64 +opensds_work_dir: /opt/opensds-hotpot-linux-amd64 +nbp_work_dir: /opt/opensds-sushi-linux-amd64 opensds_config_dir: /etc/opensds opensds_driver_config_dir: "{{ opensds_config_dir }}/driver" opensds_log_dir: /var/log/opensds @@ -40,8 +44,8 @@ opensds_log_dir: /var/log/opensds # If user specifies intalling from repository, then he can choose the specific # repository branch -opensds_repo_branch: master -nbp_repo_branch: master +opensds_repo_branch: stable/aruba +nbp_repo_branch: stable/aruba # These fields are NOT suggested to be modified opensds_remote_url: https://github.com/opensds/opensds.git @@ -53,21 +57,25 @@ nbp_remote_url: https://github.com/opensds/nbp.git ########### # If user specifies intalling from release,then he can choose the specific version -opensds_release: v0.2.0 # The version should be at least v0.2.0 -nbp_release: v0.2.0 # The version should be at least v0.2.0 +opensds_release: v0.2.1 # The version should be at least v0.2.1 +nbp_release: v0.2.1 # The version should be at least v0.2.1 # These fields are NOT suggested to be modified -opensds_download_url: https://github.com/opensds/opensds/releases/download/{{ opensds_release }}/opensds-{{ opensds_release }}-linux-amd64.tar.gz -opensds_tarball_dir: /tmp/opensds-{{ opensds_release }}-linux-amd64 -nbp_download_url: https://github.com/opensds/nbp/releases/download/{{ nbp_release }}/opensds-k8s-{{ nbp_release }}-linux-amd64.tar.gz -nbp_tarball_dir: /tmp/opensds-k8s-{{ nbp_release }}-linux-amd64 +opensds_download_url: https://github.com/opensds/opensds/releases/download/{{ opensds_release }}/opensds-hotpot-{{ opensds_release }}-linux-amd64.tar.gz +opensds_tarball_dir: /tmp/opensds-hotpot-{{ opensds_release }}-linux-amd64 +nbp_download_url: https://github.com/opensds/nbp/releases/download/{{ nbp_release }}/opensds-sushi-{{ nbp_release }}-linux-amd64.tar.gz +nbp_tarball_dir: /tmp/opensds-sushi-{{ nbp_release }}-linux-amd64 ############# # CONTAINER # ############# -container_enabled: false +opensds_image_tag: aruba + +# These fields are NOT suggested to be modified +controller_docker_image: opensdsio/opensds-controller:{{ opensds_image_tag }} +dock_docker_image: opensdsio/opensds-dock:{{ opensds_image_tag }} ########### diff --git a/ci/ansible/group_vars/osdsdb.yml b/ci/ansible/group_vars/osdsdb.yml index 1ad176e..9093a04 100644 --- a/ci/ansible/group_vars/osdsdb.yml +++ b/ci/ansible/group_vars/osdsdb.yml @@ -45,4 +45,7 @@ etcd_dir: /opt/etcd-{{ etcd_release }}-linux-amd64 # DOCKER # ########### +etcd_container_enabled: false + +# These fields are NOT suggested to be modified etcd_docker_image: quay.io/coreos/etcd:latest diff --git a/ci/ansible/group_vars/osdsdock.yml b/ci/ansible/group_vars/osdsdock.yml index c0f54f0..e23a546 100644 --- a/ci/ansible/group_vars/osdsdock.yml +++ b/ci/ansible/group_vars/osdsdock.yml @@ -90,10 +90,3 @@ cinder_name: cinder backend cinder_description: This is a cinder backend service cinder_driver_name: cinder cinder_config_path: "{{ opensds_driver_config_dir }}/cinder.yaml" - - -########### -# DOCKER # -########### - -dock_docker_image: opensdsio/opensds-dock:latest diff --git a/ci/ansible/group_vars/osdslet.yml b/ci/ansible/group_vars/osdslet.yml index 32c12fe..488ea75 100644 --- a/ci/ansible/group_vars/osdslet.yml +++ b/ci/ansible/group_vars/osdslet.yml @@ -25,10 +25,3 @@ dummy: # These fields are NOT suggested to be modified controller_endpoint: 0.0.0.0:50040 controller_log_file: "{{ opensds_log_dir }}/osdslet.log" - - -########### -# DOCKER # -########### - -controller_docker_image: opensdsio/opensds-controller:latest -- cgit 1.2.3-korg