diff --git a/CHANGELOG/CHANGELOG-v1.2.0.md b/CHANGELOG/CHANGELOG-v1.2.0.md index 7a6682e1d..9dd9979ef 100644 --- a/CHANGELOG/CHANGELOG-v1.2.0.md +++ b/CHANGELOG/CHANGELOG-v1.2.0.md @@ -6,7 +6,7 @@ **Closed issues:** -- Dashboard installation fails when opensds\_auth\_strategy is set to noauth [\#419](https://github.com/sodafoundation/installer/issues/419) +- Dashboard installation fails when soda\_auth\_strategy is set to noauth [\#419](https://github.com/sodafoundation/installer/issues/419) - Uninstalll of SODA fails because it cannot find srm-toolchain installation [\#417](https://github.com/sodafoundation/installer/issues/417) - Installation fails at Delfin installer with error "Could not get output from /usr/local/bin/virtualenv --help: AttributeError: module 'os' has no attribute 'PathLike'\n" [\#405](https://github.com/sodafoundation/installer/issues/405) diff --git a/Makefile b/Makefile index 9e9f08c36..ce564d102 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -# Copyright 2018 The OpenSDS Authors. +# Copyright 2018 The soda Authors. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/ansible/clean.yml b/ansible/clean.yml index f0dfaeca3..c20cba4ee 100644 --- a/ansible/clean.yml +++ b/ansible/clean.yml @@ -1,4 +1,4 @@ -# Copyright 2019 The OpenSDS Authors. +# Copyright 2019 The soda Authors. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -15,7 +15,7 @@ --- # Defines some clean processes when banishing the cluster. -- name: destory an opensds cluster +- name: destory an soda cluster hosts: - controllers - worker-nodes diff --git a/ansible/docs/OpenSDS Multi-nodes installation using Ansible.md b/ansible/docs/OpenSDS Multi-nodes installation using Ansible.md index 514e69cbb..acc52a6bf 100644 --- a/ansible/docs/OpenSDS Multi-nodes installation using Ansible.md +++ b/ansible/docs/OpenSDS Multi-nodes installation using Ansible.md @@ -1,9 +1,9 @@ -# OpenSDS Multi-nodes installation using Ansible # -This document explain steps for a sample OpenSDS multi-node installation with three nodes (Eg. node-1, node-2 and node-3). First node is configured as Controller and other two nodes are configured as dock backends. +# soda Multi-nodes installation using Ansible # +This document explain steps for a sample soda multi-node installation with three nodes (Eg. node-1, node-2 and node-3). First node is configured as Controller and other two nodes are configured as dock backends. ## 1. Installation ## -Installation steps for OpenSDS Multi-nodes is similar to wiki page 'OpenSDS Cluster Installation through Ansible' https://github.com/opensds/opensds/wiki/OpenSDS-Cluster-Installation-through-Ansible +Installation steps for soda Multi-nodes is similar to wiki page 'soda Cluster Installation through Ansible' https://github.com/soda/soda/wiki/soda-Cluster-Installation-through-Ansible -Difference in steps for OpenSDS multi-nodes will be documented here. +Difference in steps for soda multi-nodes will be documented here. ### Pre-config (Ubuntu 16.04) #### Setup SSH Connection (Needed on ALL Nodes) * Set password for root: @@ -84,12 +84,12 @@ If you are running all nodes inside VMware, you need to install this virtualizat ssh-copy-id node-3 ``` #### Install following packages (Needed on ALL Nodes): -Please refer OpenSDS Cluster installation steps in [wiki.](https://github.com/opensds/opensds/wiki/OpenSDS-Cluster-Installation-through-Ansible) +Please refer soda Cluster installation steps in [wiki.](https://github.com/soda/soda/wiki/soda-Cluster-Installation-through-Ansible) * docker & docker-compose * golang -* opensds-installer code +* soda-installer code * ansible tool -### Configure opensds install variables (On Controllers node ONLY): +### Configure soda install variables (On Controllers node ONLY): ##### System environment: Firstly you need to modify `host_ip` in `group_vars/common.yml`, and you can specify which project (hotpot or gelato) to be deployed: ```yaml @@ -100,7 +100,7 @@ host_ip: 127.0.0.1 # 'hotpot', 'gelato' or 'all' deploy_project: all ``` -If you want to integrate OpenSDS with k8s csi, please modify `nbp_plugin_type` to `csi` in `group_vars/sushi.yml`: +If you want to integrate soda with k8s csi, please modify `nbp_plugin_type` to `csi` in `group_vars/sushi.yml`: ```yaml # 'hotpot_only' is the default integration way, but you can change it to 'csi' # or 'flexvolume' @@ -173,11 +173,11 @@ Configure the auth and pool options to access cinder in `group_vars/cinder/cinde export HOST_IP={your_real_host_ip} ansible all -m ping -i local.hosts ``` -### Run opensds-ansible playbook to start deploy +### Run soda-ansible playbook to start deploy ```bash ansible-playbook site.yml -i local.hosts ``` -## 2. How to test opensds cluster -Please refer OpenSDS Cluster installation steps in [wiki.](https://github.com/opensds/opensds/wiki/OpenSDS-Cluster-Installation-through-Ansible) -## 3. How to purge and clean opensds cluster -Please refer OpenSDS Cluster installation steps in [wiki.](https://github.com/opensds/opensds/wiki/OpenSDS-Cluster-Installation-through-Ansible) \ No newline at end of file +## 2. How to test soda cluster +Please refer soda Cluster installation steps in [wiki.](https://github.com/soda/soda/wiki/soda-Cluster-Installation-through-Ansible) +## 3. How to purge and clean soda cluster +Please refer soda Cluster installation steps in [wiki.](https://github.com/soda/soda/wiki/soda-Cluster-Installation-through-Ansible) \ No newline at end of file diff --git a/ansible/group_vars/auth.yml b/ansible/group_vars/auth.yml index 475eb3e6f..16b4b6a69 100644 --- a/ansible/group_vars/auth.yml +++ b/ansible/group_vars/auth.yml @@ -1,4 +1,4 @@ -# Copyright 2019 The OpenSDS Authors. +# Copyright 2019 The soda Authors. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -22,8 +22,8 @@ dummy: # GENERAL # ########### -# OpenSDS authentication strategy, support 'noauth' and 'keystone'. -opensds_auth_strategy: keystone +# soda authentication strategy, support 'noauth' and 'keystone'. +soda_auth_strategy: keystone # Install keystone with docker install_keystone_with_docker: true @@ -35,4 +35,4 @@ keystone_os_auth_url: "http://{{ host_ip }}/identity" keystone_uninstall_purge: false # Certs dir -opensds_certs_dir: "/opt/opensds-security/" +soda_certs_dir: "/opt/soda-security/" diff --git a/ansible/group_vars/ceph/all.yml b/ansible/group_vars/ceph/all.yml index c0cc427c9..c412b6c5e 100644 --- a/ansible/group_vars/ceph/all.yml +++ b/ansible/group_vars/ceph/all.yml @@ -1,4 +1,4 @@ -# Copyright 2018 The OpenSDS Authors. +# Copyright 2018 The soda Authors. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/ansible/group_vars/ceph/ceph.hosts b/ansible/group_vars/ceph/ceph.hosts index be9eef0aa..516b571bb 100644 --- a/ansible/group_vars/ceph/ceph.hosts +++ b/ansible/group_vars/ceph/ceph.hosts @@ -1,4 +1,4 @@ -# Copyright 2018 The OpenSDS Authors. +# Copyright 2018 The soda Authors. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/ansible/group_vars/ceph/ceph.yaml b/ansible/group_vars/ceph/ceph.yaml index 254620938..117c18097 100644 --- a/ansible/group_vars/ceph/ceph.yaml +++ b/ansible/group_vars/ceph/ceph.yaml @@ -1,4 +1,4 @@ -# Copyright 2018 The OpenSDS Authors. +# Copyright 2018 The soda Authors. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/ansible/group_vars/ceph/conf.yml b/ansible/group_vars/ceph/conf.yml index dd92bcda3..00149d0f2 100644 --- a/ansible/group_vars/ceph/conf.yml +++ b/ansible/group_vars/ceph/conf.yml @@ -1,4 +1,4 @@ -# Copyright 2019 The OpenSDS Authors. +# Copyright 2019 The soda Authors. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/ansible/group_vars/cinder/cinder.yaml b/ansible/group_vars/cinder/cinder.yaml index 5f7c2eed9..4f9f453cd 100644 --- a/ansible/group_vars/cinder/cinder.yaml +++ b/ansible/group_vars/cinder/cinder.yaml @@ -1,4 +1,4 @@ -# Copyright 2018 The OpenSDS Authors. +# Copyright 2018 The soda Authors. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/ansible/group_vars/common.yml b/ansible/group_vars/common.yml index 1e4013090..436b08710 100644 --- a/ansible/group_vars/common.yml +++ b/ansible/group_vars/common.yml @@ -1,4 +1,4 @@ -# Copyright 2019 The OpenSDS Authors. +# Copyright 2019 The soda Authors. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -60,8 +60,8 @@ source_purge: true # delete database database_purge: true -# OpenSDS configuration file -opensds_conf_file: /etc/opensds/opensds.conf +# soda configuration file +soda_conf_file: /etc/soda/soda.conf ############### # Respective projects release versions diff --git a/ansible/group_vars/dashboard.yml b/ansible/group_vars/dashboard.yml index fd81a183d..7c8402d42 100644 --- a/ansible/group_vars/dashboard.yml +++ b/ansible/group_vars/dashboard.yml @@ -1,4 +1,4 @@ -# Copyright 2019 The OpenSDS Authors. +# Copyright 2019 The soda Authors. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -26,7 +26,7 @@ dummy: dashboard_installation_type: container # These fields are NOT suggested to be modified -dashboard_work_dir: /opt/opensds-dashboard-linux-amd64 +dashboard_work_dir: /opt/soda-dashboard-linux-amd64 #Dashboard Console Login Address console_login_url: "{{ host_ip }}:8088" @@ -49,4 +49,4 @@ dashboard_docker_image: sodafoundation/dashboard:{{ dashboard_release_version }} dashboard_repo_branch: "{{ repo_branch }}" # These fields are NOT suggested to be modified -dashboard_remote_url: https://github.com/opensds/opensds-dashboard.git +dashboard_remote_url: https://github.com/soda/soda-dashboard.git diff --git a/ansible/group_vars/gelato-ha.yml b/ansible/group_vars/gelato-ha.yml index 0990ebe5a..b3f07f196 100644 --- a/ansible/group_vars/gelato-ha.yml +++ b/ansible/group_vars/gelato-ha.yml @@ -37,7 +37,7 @@ gelato_ha_s3_ip: 0.0.0.0 gelato_ha_s3_port: 30090 # These fields are NOT suggested to be modifie -gelato_work_dir: /opt/opensds-gelato-linux-amd64 +gelato_work_dir: /opt/soda-gelato-linux-amd64 # The installation type of gelato-ha is container, both REPOSITORY and RELEASE will # use gelato image to deploy. diff --git a/ansible/group_vars/gelato.yml b/ansible/group_vars/gelato.yml index a6b5febf9..68c3b9d66 100644 --- a/ansible/group_vars/gelato.yml +++ b/ansible/group_vars/gelato.yml @@ -1,4 +1,4 @@ -# Copyright 2019 The OpenSDS Authors. +# Copyright 2019 The soda Authors. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -23,7 +23,7 @@ dummy: ########### # These fields are NOT suggested to be modifie -gelato_work_dir: /opt/opensds-gelato-linux-amd64 +gelato_work_dir: /opt/soda-gelato-linux-amd64 # The installation type of gelato is container, both REPOSITORY and RELEASE will # use gelato image to deploy. diff --git a/ansible/group_vars/hotpot.yml b/ansible/group_vars/hotpot.yml index 21fa2985e..2e2d663d5 100644 --- a/ansible/group_vars/hotpot.yml +++ b/ansible/group_vars/hotpot.yml @@ -1,4 +1,4 @@ -# Copyright 2018 The OpenSDS Authors. +# Copyright 2018 The soda Authors. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -27,13 +27,13 @@ controller_endpoint: "{{ host_ip }}:50049" # These fields are NOT suggested to be modified -hotpot_work_dir: /opt/opensds-hotpot-linux-amd64 -opensds_config_dir: /etc/opensds -opensds_driver_config_dir: "{{ opensds_config_dir }}/driver" -opensds_log_dir: /var/log/opensds -apiserver_log_file: "{{ opensds_log_dir }}/osdsapiserver.log" -controller_log_file: "{{ opensds_log_dir }}/osdslet.log" -dock_log_file: "{{ opensds_log_dir }}/osdsdock.log" +hotpot_work_dir: /opt/soda-hotpot-linux-amd64 +soda_config_dir: /etc/soda +soda_driver_config_dir: "{{ soda_config_dir }}/driver" +soda_log_dir: /var/log/soda +apiserver_log_file: "{{ soda_log_dir }}/osdsapiserver.log" +controller_log_file: "{{ soda_log_dir }}/osdslet.log" +dock_log_file: "{{ soda_log_dir }}/osdsdock.log" ############## diff --git a/ansible/group_vars/lvm/lvm.yaml b/ansible/group_vars/lvm/lvm.yaml index 4e99f1f10..7fcca03ca 100644 --- a/ansible/group_vars/lvm/lvm.yaml +++ b/ansible/group_vars/lvm/lvm.yaml @@ -1,4 +1,4 @@ -# Copyright 2018 The OpenSDS Authors. +# Copyright 2018 The soda Authors. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -15,7 +15,7 @@ tgtBindIp: 127.0.0.1 # change tgtBindIp to your real host ip, run 'ifconfig' to check tgtConfDir: /etc/tgt/conf.d pool: - opensds-volumes: # change pool name same to vg_name, but don't change it if you choose ceph backend + soda-volumes: # change pool name same to vg_name, but don't change it if you choose ceph backend storageType: block availabilityZone: default extras: diff --git a/ansible/group_vars/netapp/ontap/ontap.yaml b/ansible/group_vars/netapp/ontap/ontap.yaml index 825f98287..cc39a794b 100644 --- a/ansible/group_vars/netapp/ontap/ontap.yaml +++ b/ansible/group_vars/netapp/ontap/ontap.yaml @@ -6,7 +6,7 @@ backendOptions: managementLIF: "127.0.0.1" dataLIF: "127.0.0.1" svm: "vserver" - igroupName: "opensds" + igroupName: "soda" pool: ontap-pool: storageType: block diff --git a/ansible/group_vars/nfs/nfs.yaml b/ansible/group_vars/nfs/nfs.yaml index 05f902041..dab11220b 100644 --- a/ansible/group_vars/nfs/nfs.yaml +++ b/ansible/group_vars/nfs/nfs.yaml @@ -1,4 +1,4 @@ -# Copyright 2019 The OpenSDS Authors. +# Copyright 2019 The soda Authors. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -15,7 +15,7 @@ tgtBindIp: 127.0.0.1 # change tgtBindIp to your real host ip, run 'ifconfig' to check tgtConfDir: /etc/tgt/conf.d pool: - opensds-nfs: + soda-nfs: storageType: file availabilityZone: default extras: diff --git a/ansible/group_vars/orchestration.yml b/ansible/group_vars/orchestration.yml index 08d1e76dd..d82f62ed7 100644 --- a/ansible/group_vars/orchestration.yml +++ b/ansible/group_vars/orchestration.yml @@ -1,4 +1,4 @@ -# Copyright 2019 The OpenSDS Authors. +# Copyright 2019 The soda Authors. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -69,4 +69,4 @@ orchestration_release: "{{ orchestration_release_version }}" #The version should # These fields are NOT suggested to be modified orchestration_download_url: https://github.com/sodafoundation/orchestration/archive/{{ orchestration_release }}.tar.gz -orchestration_tarball_dir: /tmp/opensds-orchestration-{{ orchestration_release }}-linux-amd64 +orchestration_tarball_dir: /tmp/soda-orchestration-{{ orchestration_release }}-linux-amd64 diff --git a/ansible/group_vars/osdsdb.yml b/ansible/group_vars/osdsdb.yml index a9b21b8b7..686dd979e 100644 --- a/ansible/group_vars/osdsdb.yml +++ b/ansible/group_vars/osdsdb.yml @@ -1,4 +1,4 @@ -# Copyright 2019 The OpenSDS Authors. +# Copyright 2019 The soda Authors. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/ansible/group_vars/osdsdock.yml b/ansible/group_vars/osdsdock.yml index 81c31dd6f..4713ddeac 100644 --- a/ansible/group_vars/osdsdock.yml +++ b/ansible/group_vars/osdsdock.yml @@ -1,4 +1,4 @@ -# Copyright 2019 The OpenSDS Authors. +# Copyright 2019 The soda Authors. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -43,11 +43,11 @@ dock_type: provisioner lvm_name: lvm backend lvm_description: This is a lvm backend service lvm_driver_name: lvm -lvm_config_path: "{{ opensds_driver_config_dir }}/lvm.yaml" +lvm_config_path: "{{ soda_driver_config_dir }}/lvm.yaml" lvm_nvme_device: "/dev/nvme0n1" -opensds_volume_group: opensds-volumes -opensds_volume_group_nvme: opensds-volumes-nvme -opensds_volume_group_nvme_size: 10G +soda_volume_group: soda-volumes +soda_volume_group_nvme: soda-volumes-nvme +soda_volume_group_nvme_size: 10G ########### @@ -63,7 +63,7 @@ ceph_pools: # Specify pool name randomly ceph_name: ceph backend ceph_description: This is a ceph backend service ceph_driver_name: ceph -ceph_config_path: "{{ opensds_driver_config_dir }}/ceph.yaml" +ceph_config_path: "{{ soda_driver_config_dir }}/ceph.yaml" # ceph-ansible playbook branch to be checked out from: # https://github.com/ceph/ceph-ansible @@ -100,7 +100,7 @@ cinder_data_dir: "/opt/cinder_data_dir" 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" +cinder_config_path: "{{ soda_driver_config_dir }}/cinder.yaml" ########### @@ -111,8 +111,8 @@ cinder_config_path: "{{ opensds_driver_config_dir }}/cinder.yaml" nfs_name: nfs backend nfs_description: This is a nfs backend service nfs_driver_name: nfs -nfs_config_path: "{{ opensds_driver_config_dir }}/nfs.yaml" -opensds_nfs_group: opensds-nfs +nfs_config_path: "{{ soda_driver_config_dir }}/nfs.yaml" +soda_nfs_group: soda-nfs ###################### # NetApp ONTAP SAN # @@ -123,7 +123,7 @@ opensds_nfs_group: opensds-nfs ontap_name: netapp ontap backend ontap_description: This is a netapp ontap san backend service ontap_driver_name: netapp_ontap_san -ontap_config_path: "{{ opensds_driver_config_dir }}/netapp_ontap_san.yaml" +ontap_config_path: "{{ soda_driver_config_dir }}/netapp_ontap_san.yaml" ##################### @@ -135,4 +135,4 @@ ontap_config_path: "{{ opensds_driver_config_dir }}/netapp_ontap_san.yaml" ontap_nas_name: netapp ontap backend ontap_nas_description: This is a netapp ontap nas backend service ontap_nas_driver_name: netapp_ontap_nas -ontap_nas_config_path: "{{ opensds_driver_config_dir }}/netapp_ontap_nas.yaml" +ontap_nas_config_path: "{{ soda_driver_config_dir }}/netapp_ontap_nas.yaml" diff --git a/ansible/group_vars/sushi.yml b/ansible/group_vars/sushi.yml index 1d05c4bd1..637668be2 100644 --- a/ansible/group_vars/sushi.yml +++ b/ansible/group_vars/sushi.yml @@ -1,4 +1,4 @@ -# Copyright 2019 The OpenSDS Authors. +# Copyright 2019 The soda Authors. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -25,13 +25,13 @@ dummy: # 'hotpot_only' is the default integration way, but you can change it to 'csi' # or 'flexvolume' sushi_plugin_type: hotpot_only -# The IP (127.0.0.1) should be replaced with the opensds actual endpoint IP +# The IP (127.0.0.1) should be replaced with the soda actual endpoint IP hotpot_endpoint: "http://{{ host_ip }}:50040" # These fields are NOT suggested to be modifie -sushi_work_dir: /opt/opensds-sushi-linux-amd64 +sushi_work_dir: /opt/soda-sushi-linux-amd64 -flexvolume_plugin_dir: /usr/libexec/kubernetes/kubelet-plugins/volume/exec/opensds.io~opensds +flexvolume_plugin_dir: /usr/libexec/kubernetes/kubelet-plugins/volume/exec/soda.io~soda ############## @@ -43,7 +43,7 @@ flexvolume_plugin_dir: /usr/libexec/kubernetes/kubelet-plugins/volume/exec/opens sushi_repo_branch: "{{ repo_branch }}" # These fields are NOT suggested to be modified -sushi_remote_url: https://github.com/opensds/nbp.git +sushi_remote_url: https://github.com/soda/nbp.git ########### # RELEASE # @@ -53,5 +53,5 @@ sushi_remote_url: https://github.com/opensds/nbp.git sushi_release: "{{ sushi_release_version }}" # The version should be at least v0.2.1 # These fields are NOT suggested to be modified -sushi_download_url: https://github.com/opensds/nbp/releases/download/{{ sushi_release }}/opensds-sushi-{{ sushi_release }}-linux-amd64.tar.gz -sushi_tarball_dir: /tmp/opensds-sushi-{{ sushi_release }}-linux-amd64 +sushi_download_url: https://github.com/soda/nbp/releases/download/{{ sushi_release }}/soda-sushi-{{ sushi_release }}-linux-amd64.tar.gz +sushi_tarball_dir: /tmp/soda-sushi-{{ sushi_release }}-linux-amd64 diff --git a/ansible/group_vars/telemetry.yml b/ansible/group_vars/telemetry.yml index 64bfd1e3c..3b7afd960 100644 --- a/ansible/group_vars/telemetry.yml +++ b/ansible/group_vars/telemetry.yml @@ -1,4 +1,4 @@ -# Copyright 2019 The OpenSDS Authors. +# Copyright 2019 The soda Authors. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -28,7 +28,7 @@ enable_telemetry_tools: false grafana_repositroy: "deb https://packages.grafana.com/oss/deb stable main" grafana_gpg_key: https://packages.grafana.com/gpg.key -# Telementry configs to be updated in opensds.conf +# Telementry configs to be updated in soda.conf prometheus_conf_home: /etc/prometheus/ prometheus_conf_file: prometheus.yml prometheus_url: 'http://{{ host_ip }}:9090' @@ -49,5 +49,5 @@ lvm_exporter_port: '9601' kafka_endpoint: '{{ host_ip }}:9092' kafka_topic: metrics -opensds_conf_file: /etc/opensds/opensds.conf -telemetry_work_dir: /opt/opensds-telemetry-linux-amd64 +soda_conf_file: /etc/soda/soda.conf +telemetry_work_dir: /opt/soda-telemetry-linux-amd64 diff --git a/ansible/install_ansible.sh b/ansible/install_ansible.sh index 262d994ec..b0df4a497 100755 --- a/ansible/install_ansible.sh +++ b/ansible/install_ansible.sh @@ -1,6 +1,6 @@ #!/bin/bash -# Copyright 2018 The OpenSDS Authors. +# Copyright 2018 The soda Authors. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/ansible/local.hosts b/ansible/local.hosts index 0b23adc4f..a6f757db9 100644 --- a/ansible/local.hosts +++ b/ansible/local.hosts @@ -1,4 +1,4 @@ -# Copyright 2018 The OpenSDS Authors. +# Copyright 2018 The soda Authors. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/ansible/roles/auth-installer/tasks/main.yml b/ansible/roles/auth-installer/tasks/main.yml index 9285d9349..76b2101dc 100644 --- a/ansible/roles/auth-installer/tasks/main.yml +++ b/ansible/roles/auth-installer/tasks/main.yml @@ -1,4 +1,4 @@ -# Copyright 2018 The OpenSDS Authors. +# Copyright 2018 The soda Authors. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -27,12 +27,12 @@ shell: "{{ item }}" with_items: - bash ./script/keystone.sh install script - when: opensds_auth_strategy == "keystone" and install_keystone_with_docker != true + when: soda_auth_strategy == "keystone" and install_keystone_with_docker != true become: yes - name: install keystone with the docker shell: "{{ item }}" with_items: - bash ./script/keystone.sh install docker - when: opensds_auth_strategy == "keystone" and install_keystone_with_docker == true + when: soda_auth_strategy == "keystone" and install_keystone_with_docker == true become: yes diff --git a/ansible/roles/cleaner/scenarios/auth-keystone.yml b/ansible/roles/cleaner/scenarios/auth-keystone.yml index 2dfa3c96d..59b137a91 100644 --- a/ansible/roles/cleaner/scenarios/auth-keystone.yml +++ b/ansible/roles/cleaner/scenarios/auth-keystone.yml @@ -1,4 +1,4 @@ -# Copyright 2019 The OpenSDS Authors. +# Copyright 2019 The soda Authors. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -13,7 +13,7 @@ # limitations under the License. --- -- name: uninstall opensds keystone with the script +- name: uninstall soda keystone with the script shell: "{{ item }}" with_items: - bash ./script/keystone.sh uninstall script @@ -23,7 +23,7 @@ become: yes tags: keystone -- name: uninstall opensds keystone with the docker +- name: uninstall soda keystone with the docker shell: "{{ item }}" with_items: - bash ./script/keystone.sh uninstall docker @@ -33,7 +33,7 @@ become: yes tags: keystone -- name: cleanup opensds keystone +- name: cleanup soda keystone shell: "{{ item }}" with_items: - bash ./script/keystone.sh uninstall_purge diff --git a/ansible/roles/cleaner/scenarios/backend.yml b/ansible/roles/cleaner/scenarios/backend.yml index e9fae05ef..0b1a36a1a 100644 --- a/ansible/roles/cleaner/scenarios/backend.yml +++ b/ansible/roles/cleaner/scenarios/backend.yml @@ -1,4 +1,4 @@ -# Copyright 2018 The OpenSDS Authors. +# Copyright 2018 The soda Authors. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -71,17 +71,17 @@ fi } - clean_lvm_volume_group {{opensds_volume_group}} + clean_lvm_volume_group {{soda_volume_group}} - if [[ `sudo vgs --noheadings -o vg_name {{ opensds_volume_group_nvme }} 2>/dev/null | grep {{ opensds_volume_group_nvme }}` ]]; then + if [[ `sudo vgs --noheadings -o vg_name {{ soda_volume_group_nvme }} 2>/dev/null | grep {{ soda_volume_group_nvme }}` ]]; then # delete nvme volume group and prepare kernel module - _clean_lvm_volume_group {{ opensds_volume_group_nvme }} - _remove_lvm_volume_group {{ opensds_volume_group_nvme }} - if [[ -z "$(sudo lvs --noheadings -o lv_name {{ opensds_volume_group_nvme }} 2>/dev/null)" ]]; then - _clean_lvm_backing_file {{ hotpot_work_dir }}/volumegroups/{{ opensds_volume_group_nvme }}/{{ opensds_volume_group_nvme }}.img + _clean_lvm_volume_group {{ soda_volume_group_nvme }} + _remove_lvm_volume_group {{ soda_volume_group_nvme }} + if [[ -z "$(sudo lvs --noheadings -o lv_name {{ soda_volume_group_nvme }} 2>/dev/null)" ]]; then + _clean_lvm_backing_file {{ hotpot_work_dir }}/volumegroups/{{ soda_volume_group_nvme }}/{{ soda_volume_group_nvme }}.img fi - sudo umount {{ hotpot_work_dir }}/volumegroups/{{ opensds_volume_group_nvme }} - sudo rmdir {{ hotpot_work_dir }}/volumegroups/{{ opensds_volume_group_nvme }}/ + sudo umount {{ hotpot_work_dir }}/volumegroups/{{ soda_volume_group_nvme }} + sudo rmdir {{ hotpot_work_dir }}/volumegroups/{{ soda_volume_group_nvme }}/ fi args: @@ -223,7 +223,7 @@ fi } - clean_lvm_volume_group {{opensds_nfs_group}} + clean_lvm_volume_group {{soda_nfs_group}} args: executable: /bin/bash diff --git a/ansible/roles/cleaner/scenarios/orchestration.yml b/ansible/roles/cleaner/scenarios/orchestration.yml index 3fc89ad66..6e1677595 100644 --- a/ansible/roles/cleaner/scenarios/orchestration.yml +++ b/ansible/roles/cleaner/scenarios/orchestration.yml @@ -1,4 +1,4 @@ -# Copyright 2019 The OpenSDS Authors. +# Copyright 2019 The soda Authors. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -13,7 +13,7 @@ # limitations under the License. --- -- name: uninstall opensds orchestration manager +- name: uninstall soda orchestration manager shell: "{{ item }}" with_items: - kill -9 `lsof -i :5000 | grep 5000 | awk '{print $2}'` diff --git a/ansible/roles/cleaner/scenarios/release.yml b/ansible/roles/cleaner/scenarios/release.yml index 1c5d11ddb..04b0aa5ba 100644 --- a/ansible/roles/cleaner/scenarios/release.yml +++ b/ansible/roles/cleaner/scenarios/release.yml @@ -1,4 +1,4 @@ -# Copyright 2018 The OpenSDS Authors. +# Copyright 2018 The soda Authors. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/ansible/roles/cleaner/scenarios/repository.yml b/ansible/roles/cleaner/scenarios/repository.yml index 42b9a480f..61a46b2cb 100644 --- a/ansible/roles/cleaner/scenarios/repository.yml +++ b/ansible/roles/cleaner/scenarios/repository.yml @@ -1,4 +1,4 @@ -# Copyright 2018 The OpenSDS Authors. +# Copyright 2018 The soda Authors. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/ansible/roles/cleaner/tasks/main.yml b/ansible/roles/cleaner/tasks/main.yml index d28add895..f17f2af58 100644 --- a/ansible/roles/cleaner/tasks/main.yml +++ b/ansible/roles/cleaner/tasks/main.yml @@ -1,4 +1,4 @@ -# Copyright 2019 The OpenSDS Authors. +# Copyright 2019 The soda Authors. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -99,7 +99,7 @@ ignore_errors: yes tags: gelato -- name: clean opensds flexvolume plugins binary file if flexvolume specified +- name: clean soda flexvolume plugins binary file if flexvolume specified file: path: "{{ flexvolume_plugin_dir }}" state: absent @@ -108,7 +108,7 @@ when: sushi_plugin_type == "flexvolume" tags: sushi -- name: clean opensds external provisioner plugin if flexvolume specified +- name: clean soda external provisioner plugin if flexvolume specified shell: | . /etc/profile kubectl delete -f deploy/ @@ -118,7 +118,7 @@ when: sushi_plugin_type == "flexvolume" tags: sushi -- name: clean opensds csi plugin if csi plugin specified +- name: clean soda csi plugin if csi plugin specified shell: | . /etc/profile kubectl delete -f deploy/kubernetes/block @@ -131,7 +131,7 @@ - name: include scenarios/auth-keystone.yml when keystone specified include_tasks: scenarios/auth-keystone.yml - when: opensds_auth_strategy == "keystone" + when: soda_auth_strategy == "keystone" tags: keystone - name: include scenarios/repository.yml if installed from repository @@ -167,9 +167,9 @@ state: absent force: yes with_items: - - "{{ opensds_config_dir }}" - - "{{ opensds_log_dir }}" - - "{{ opensds_certs_dir }}" + - "{{ soda_config_dir }}" + - "{{ soda_log_dir }}" + - "{{ soda_certs_dir }}" - "{{ delfin_config_dir }}" ignore_errors: yes diff --git a/ansible/roles/common/scenarios/release.yml b/ansible/roles/common/scenarios/release.yml index 1a6887dff..62c9ce2a1 100644 --- a/ansible/roles/common/scenarios/release.yml +++ b/ansible/roles/common/scenarios/release.yml @@ -1,4 +1,4 @@ -# Copyright 2018 The OpenSDS Authors. +# Copyright 2018 The soda Authors. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/ansible/roles/common/scenarios/repository.yml b/ansible/roles/common/scenarios/repository.yml index 67eae753f..7a623a8e6 100644 --- a/ansible/roles/common/scenarios/repository.yml +++ b/ansible/roles/common/scenarios/repository.yml @@ -1,4 +1,4 @@ -# Copyright 2018 The OpenSDS Authors. +# Copyright 2018 The soda Authors. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/ansible/roles/common/tasks/main.yml b/ansible/roles/common/tasks/main.yml index d71cd9339..be4298312 100644 --- a/ansible/roles/common/tasks/main.yml +++ b/ansible/roles/common/tasks/main.yml @@ -1,4 +1,4 @@ -# Copyright 2018 The OpenSDS Authors. +# Copyright 2018 The soda Authors. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -65,16 +65,16 @@ - librbd-dev when: ansible_distribution == "Ubuntu" and (ansible_lsb.major_release|int >=16 and ansible_lsb.major_release|int <=18) -- name: create opensds work directory if it doesn't exist +- name: create soda work directory if it doesn't exist file: path: "{{ item }}" state: directory mode: 0755 with_items: - "{{ hotpot_work_dir }}" - - "{{ opensds_config_dir }}" - - "{{ opensds_driver_config_dir }}" - - "{{ opensds_log_dir }}" + - "{{ soda_config_dir }}" + - "{{ soda_driver_config_dir }}" + - "{{ soda_log_dir }}" when: deploy_project != "gelato" - name: include scenarios/repository.yml when installing from repository @@ -85,10 +85,10 @@ include: scenarios/release.yml when: install_from == "release" and deploy_project != "gelato" -- name: copy config templates into opensds global config folder +- name: copy config templates into soda global config folder copy: src: ../../../../conf/ - dest: "{{ opensds_config_dir }}" + dest: "{{ soda_config_dir }}" when: deploy_project != "gelato" diff --git a/ansible/roles/dashboard-installer/scenarios/container.yml b/ansible/roles/dashboard-installer/scenarios/container.yml index 423843eab..6b949f458 100644 --- a/ansible/roles/dashboard-installer/scenarios/container.yml +++ b/ansible/roles/dashboard-installer/scenarios/container.yml @@ -1,4 +1,4 @@ -# Copyright 2018 The OpenSDS Authors. +# Copyright 2018 The soda Authors. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -25,14 +25,14 @@ network_mode: host restart_policy: always env: - OPENSDS_AUTH_URL: "http://{{ host_ip }}/identity" - OPENSDS_HOTPOT_URL: "http://{{ host_ip }}:50040" - OPENSDS_GELATO_URL: "http://{{ host_ip }}:8089" + soda_AUTH_URL: "http://{{ host_ip }}/identity" + soda_HOTPOT_URL: "http://{{ host_ip }}:50040" + soda_GELATO_URL: "http://{{ host_ip }}:8089" SODA_DELFIN_URL: "{{ soda_delfin_url }}" - OPENSDS_ORCHESTRATION_URL: "http://{{ host_ip }}:5000" - OPENSDS_S3_URL: "http://{{ host_ip }}:8090" - OPENSDS_S3_HOST: "{{ host_ip }}" - OPENSDS_S3_PORT: "8090" + soda_ORCHESTRATION_URL: "http://{{ host_ip }}:5000" + soda_S3_URL: "http://{{ host_ip }}:8090" + soda_S3_HOST: "{{ host_ip }}" + soda_S3_PORT: "8090" SODA_PROMETHEUS_PORT: "{{ prometheus_port }}" SODA_ALERTMANAGER_PORT: "{{ alertmanager_port }}" SODA_GRAFANA_PORT: "{{ grafana_port }}" @@ -48,14 +48,14 @@ network_mode: host restart_policy: always env: - OPENSDS_AUTH_URL: "http://{{ host_ip }}/identity" - OPENSDS_HOTPOT_URL: "http://{{ host_ip }}:50040" - OPENSDS_GELATO_URL: "http://{{ gelato_ha_api_ip }}:{{ gelato_ha_api_port }}" + soda_AUTH_URL: "http://{{ host_ip }}/identity" + soda_HOTPOT_URL: "http://{{ host_ip }}:50040" + soda_GELATO_URL: "http://{{ gelato_ha_api_ip }}:{{ gelato_ha_api_port }}" SODA_DELFIN_URL: "{{ soda_delfin_url }}" - OPENSDS_ORCHESTRATION_URL: "http://{{ host_ip }}:5000" - OPENSDS_S3_URL: "http://{{ gelato_ha_s3_ip }}:{{ gelato_ha_s3_port }}" - OPENSDS_S3_HOST: "{{ gelato_ha_s3_ip }}" - OPENSDS_S3_PORT: "{{ gelato_ha_s3_port }}" + soda_ORCHESTRATION_URL: "http://{{ host_ip }}:5000" + soda_S3_URL: "http://{{ gelato_ha_s3_ip }}:{{ gelato_ha_s3_port }}" + soda_S3_HOST: "{{ gelato_ha_s3_ip }}" + soda_S3_PORT: "{{ gelato_ha_s3_port }}" SODA_PROMETHEUS_PORT: "{{ prometheus_port }}" SODA_ALERTMANAGER_PORT: "{{ alertmanager_port }}" SODA_GRAFANA_PORT: "{{ grafana_port }}" diff --git a/ansible/roles/dashboard-installer/scenarios/source-code.yml b/ansible/roles/dashboard-installer/scenarios/source-code.yml index 437c5c3af..5813523e6 100644 --- a/ansible/roles/dashboard-installer/scenarios/source-code.yml +++ b/ansible/roles/dashboard-installer/scenarios/source-code.yml @@ -1,4 +1,4 @@ -# Copyright 2018 The OpenSDS Authors. +# Copyright 2018 The soda Authors. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -13,20 +13,20 @@ # limitations under the License. --- -- name: check for opensds-dashboard source code existed +- name: check for soda-dashboard source code existed stat: path: "{{ dashboard_work_dir }}" - register: opensdsexisted + register: sodaexisted -- name: download opensds-dashboard source code if not exists +- name: download soda-dashboard source code if not exists git: repo: "{{ dashboard_remote_url }}" dest: "{{ dashboard_work_dir }}" version: "{{ dashboard_repo_branch }}" when: - - opensdsexisted.stat.exists is undefined or opensdsexisted.stat.exists == false + - sodaexisted.stat.exists is undefined or sodaexisted.stat.exists == false -- name: build and configure opensds dashboard +- name: build and configure soda dashboard shell: "{{ item }}" with_items: - service apache2 stop diff --git a/ansible/roles/dashboard-installer/tasks/main.yml b/ansible/roles/dashboard-installer/tasks/main.yml index 51b82fe1d..fa5ee77a9 100644 --- a/ansible/roles/dashboard-installer/tasks/main.yml +++ b/ansible/roles/dashboard-installer/tasks/main.yml @@ -1,4 +1,4 @@ -# Copyright 2018 The OpenSDS Authors. +# Copyright 2018 The soda Authors. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -17,16 +17,16 @@ include_tasks: scenarios/container.yml when: - dashboard_installation_type == "container" - - opensds_auth_strategy == "keystone" + - soda_auth_strategy == "keystone" - name: use source code to install dashboard include_tasks: scenarios/source-code.yml when: - dashboard_installation_type == "source_code" - - opensds_auth_strategy == "keystone" + - soda_auth_strategy == "keystone" - name: login console debug: msg="please use '{{ console_login_url }}' login console" when: - dashboard_installation_type == "container" or dashboard_installation_type == "source_code" - - opensds_auth_strategy == "keystone" + - soda_auth_strategy == "keystone" diff --git a/ansible/roles/delfin-installer/scenarios/container.yml b/ansible/roles/delfin-installer/scenarios/container.yml index 6893c22be..fdf8176ba 100644 --- a/ansible/roles/delfin-installer/scenarios/container.yml +++ b/ansible/roles/delfin-installer/scenarios/container.yml @@ -1,4 +1,4 @@ -# Copyright 2021 The OpenSDS Authors. +# Copyright 2021 The soda Authors. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/ansible/roles/gelato-ha-uninstaller/scenarios/clean_gelato_ha.yml b/ansible/roles/gelato-ha-uninstaller/scenarios/clean_gelato_ha.yml index cef188262..4e8ede5bd 100644 --- a/ansible/roles/gelato-ha-uninstaller/scenarios/clean_gelato_ha.yml +++ b/ansible/roles/gelato-ha-uninstaller/scenarios/clean_gelato_ha.yml @@ -87,8 +87,8 @@ pause: seconds=2 -# ---------delete the multi-cloud folder in /opt/opensds-gelato --------- -- name: Clean artifact path ub /opt/opensds-gelato... +# ---------delete the multi-cloud folder in /opt/soda-gelato --------- +- name: Clean artifact path ub /opt/soda-gelato... file: state: absent path: "{{ gelato_work_dir }}/multi-cloud/" diff --git a/ansible/roles/gelato-installer/scenarios/release.yml b/ansible/roles/gelato-installer/scenarios/release.yml index be2518e1a..7180a743f 100644 --- a/ansible/roles/gelato-installer/scenarios/release.yml +++ b/ansible/roles/gelato-installer/scenarios/release.yml @@ -1,4 +1,4 @@ -# Copyright 2019 The OpenSDS Authors. +# Copyright 2019 The soda Authors. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/ansible/roles/gelato-installer/scenarios/repository.yml b/ansible/roles/gelato-installer/scenarios/repository.yml index b78274288..b2c19e8ff 100644 --- a/ansible/roles/gelato-installer/scenarios/repository.yml +++ b/ansible/roles/gelato-installer/scenarios/repository.yml @@ -1,4 +1,4 @@ -# Copyright 2018 The OpenSDS Authors. +# Copyright 2018 The soda Authors. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/ansible/roles/gelato-installer/tasks/main.yml b/ansible/roles/gelato-installer/tasks/main.yml index 076f7aca8..55b03aa54 100644 --- a/ansible/roles/gelato-installer/tasks/main.yml +++ b/ansible/roles/gelato-installer/tasks/main.yml @@ -1,4 +1,4 @@ -# Copyright 2018 The OpenSDS Authors. +# Copyright 2018 The soda Authors. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -46,14 +46,14 @@ shell: "{{ item }}" with_items: - bash ./script/keystone.sh config gelato script - when: opensds_auth_strategy == "keystone" and install_keystone_with_docker != true + when: soda_auth_strategy == "keystone" and install_keystone_with_docker != true become: yes - name: gelato keystone configuration when keystone is installed by docker shell: "{{ item }}" with_items: - bash ./script/keystone.sh config gelato docker - when: opensds_auth_strategy == "keystone" and install_keystone_with_docker == true + when: soda_auth_strategy == "keystone" and install_keystone_with_docker == true become: yes - name: set auth variables for docker-compose configuration @@ -62,7 +62,7 @@ regexp: "{{ item.regexp }}" replace: "{{ item.replace }}" with_items: - - { regexp: 'OS_AUTH_AUTHSTRATEGY=.*$', replace: 'OS_AUTH_AUTHSTRATEGY={{ opensds_auth_strategy }}'} + - { regexp: 'OS_AUTH_AUTHSTRATEGY=.*$', replace: 'OS_AUTH_AUTHSTRATEGY={{ soda_auth_strategy }}'} - name: set image tags for docker-compose configuration replace: diff --git a/ansible/roles/hotpot-installer/scenarios/container.yml b/ansible/roles/hotpot-installer/scenarios/container.yml index 4be6c0224..1b7e500bc 100644 --- a/ansible/roles/hotpot-installer/scenarios/container.yml +++ b/ansible/roles/hotpot-installer/scenarios/container.yml @@ -1,4 +1,4 @@ -# Copyright 2018 The OpenSDS Authors. +# Copyright 2018 The soda Authors. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -25,7 +25,7 @@ network_mode: host restart_policy: always volumes: - - "/etc/opensds/:/etc/opensds" + - "/etc/soda/:/etc/soda" - name: run osdsapiserver containerized service docker_container: @@ -35,4 +35,4 @@ network_mode: host restart_policy: always volumes: - - "/etc/opensds/:/etc/opensds" + - "/etc/soda/:/etc/soda" diff --git a/ansible/roles/hotpot-installer/scenarios/source-code.yml b/ansible/roles/hotpot-installer/scenarios/source-code.yml index 6509d112f..0d2766057 100644 --- a/ansible/roles/hotpot-installer/scenarios/source-code.yml +++ b/ansible/roles/hotpot-installer/scenarios/source-code.yml @@ -1,4 +1,4 @@ -# Copyright 2019 The OpenSDS Authors. +# Copyright 2019 The soda Authors. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/ansible/roles/hotpot-installer/tasks/main.yml b/ansible/roles/hotpot-installer/tasks/main.yml index 0e0753189..fb40f1d58 100644 --- a/ansible/roles/hotpot-installer/tasks/main.yml +++ b/ansible/roles/hotpot-installer/tasks/main.yml @@ -1,4 +1,4 @@ -# Copyright 2018 The OpenSDS Authors. +# Copyright 2018 The soda Authors. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -16,34 +16,34 @@ - name: generate certificates shell: "{{ item }}" with_items: - - bash ./script/create_cert.sh "{{ opensds_certs_dir }}" + - bash ./script/create_cert.sh "{{ soda_certs_dir }}" become: yes - name: hotpot keystone configuration when keystone is installed by script shell: "{{ item }}" with_items: - bash ./script/keystone.sh config hotpot script - when: opensds_auth_strategy == "keystone" and install_keystone_with_docker != true + when: soda_auth_strategy == "keystone" and install_keystone_with_docker != true become: yes - name: hotpot keystone configuration when keystone is installed by docker shell: "{{ item }}" with_items: - bash ./script/keystone.sh config hotpot docker - when: opensds_auth_strategy == "keystone" and install_keystone_with_docker == true + when: soda_auth_strategy == "keystone" and install_keystone_with_docker == true become: yes - name: configure openapi specification copy: src: "{{ hotpot_work_dir }}/swagger.yaml" - dest: "{{ opensds_config_dir }}" + dest: "{{ soda_config_dir }}" become: yes ignore_errors: true -# ---------update opensds config file with opensds global info--------- -- name: configure opensds global info osdslet +# ---------update soda config file with soda global info--------- +- name: configure soda global info osdslet ini_file: - path: "{{ opensds_conf_file }}" + path: "{{ soda_conf_file }}" section: osdslet option: "{{ item.option }}" value: "{{ item.value }}" @@ -52,26 +52,26 @@ - { option: log_file, value: "{{ controller_log_file }}" } become: yes -- name: configure opensds global info osdsapiserver +- name: configure soda global info osdsapiserver ini_file: create: no - path: "{{ opensds_conf_file }}" + path: "{{ soda_conf_file }}" section: osdsapiserver option: "{{ item.option }}" value: "{{ item.value }}" with_items: - { option: api_endpoint, value: "{{ apiserver_endpoint }}" } - { option: log_file, value: "{{ apiserver_log_file }}" } - - { option: auth_strategy, value: "{{ opensds_auth_strategy }}" } + - { option: auth_strategy, value: "{{ soda_auth_strategy }}" } - { option: https_enabled, value: False } - { option: beego_https_cert_file, value: "" } - { option: beego_https_key_file, value: "" } become: yes -- name: configure opensds global info database +- name: configure soda global info database ini_file: create: no - path: "{{ opensds_conf_file }}" + path: "{{ soda_conf_file }}" section: database option: "{{ item.option }}" value: "{{ item.value }}" @@ -80,11 +80,11 @@ - { option: driver, value: "{{ db_driver }}" } become: yes -# ---------update opensds config file with telemtetry configs--------- -- name: Set opensds.conf with telemetry options in osdsapiserver +# ---------update soda config file with telemtetry configs--------- +- name: Set soda.conf with telemetry options in osdsapiserver ini_file: create: no - path: "{{ opensds_conf_file }}" + path: "{{ soda_conf_file }}" section: osdsapiserver option: "{{ item.option }}" value: "{{ item.value }}" @@ -104,10 +104,10 @@ tags: telemetry_conf when: - enable_telemetry_tools == true -- name: Set opensds.conf with telemetry options in osdslet +- name: Set soda.conf with telemetry options in osdslet ini_file: create: no - path: "{{ opensds_conf_file }}" + path: "{{ soda_conf_file }}" section: osdslet option: "{{ item.option }}" value: "{{ item.value }}" @@ -125,7 +125,7 @@ - name: Set push mechanism when NodeExporter is selected ini_file: create: no - path: "{{ opensds_conf_file }}" + path: "{{ soda_conf_file }}" section: osdslet option: "{{ item.option }}" value: "{{ item.value }}" @@ -138,7 +138,7 @@ - name: Set push mechanism when PushGateway is selected ini_file: create: no - path: "{{ opensds_conf_file }}" + path: "{{ soda_conf_file }}" section: osdslet option: "{{ item.option }}" value: "{{ item.value }}" diff --git a/ansible/roles/orchestration-installer/scenarios/source-code.yml b/ansible/roles/orchestration-installer/scenarios/source-code.yml index 1fcab53ad..844b3e151 100644 --- a/ansible/roles/orchestration-installer/scenarios/source-code.yml +++ b/ansible/roles/orchestration-installer/scenarios/source-code.yml @@ -1,4 +1,4 @@ -# Copyright 2019 The OpenSDS Authors. +# Copyright 2019 The soda Authors. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -13,13 +13,13 @@ # limitations under the License. --- -# Install and start OpenSDS Workflow Manager -- name: Check for opensds-orchestration source code existed +# Install and start soda Workflow Manager +- name: Check for soda-orchestration source code existed stat: path: "{{ orchestration_work_dir }}" register: orchestrationexisted -- name: Download opensds-orchestration source code if not exists +- name: Download soda-orchestration source code if not exists git: repo: "{{ orchestration_remote_url }}" dest: "{{ orchestration_work_dir }}" diff --git a/ansible/roles/orchestration-installer/scenarios/stackstorm.yml b/ansible/roles/orchestration-installer/scenarios/stackstorm.yml index d3ca1c970..34a37cbe7 100644 --- a/ansible/roles/orchestration-installer/scenarios/stackstorm.yml +++ b/ansible/roles/orchestration-installer/scenarios/stackstorm.yml @@ -1,4 +1,4 @@ -# Copyright 2019 The OpenSDS Authors. +# Copyright 2019 The soda Authors. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -68,10 +68,10 @@ register: mistral_status failed_when: mistral_status.rc == 0 -- name: Copy and register opensds packs to stackstorm container +- name: Copy and register soda packs to stackstorm container shell: "{{ item }}" with_items: - - docker cp contrib/st2/opensds {{ container_id.stdout }}:/opt/stackstorm/packs/ + - docker cp contrib/st2/soda {{ container_id.stdout }}:/opt/stackstorm/packs/ - docker exec -i {{ container_id.stdout }} st2ctl reload --register-all args: chdir: "{{ orchestration_work_dir }}" @@ -79,8 +79,8 @@ become: yes ignore_errors: yes -- name: Install virtualenv for opensds packs [This task is known failure] - shell: docker exec -i {{ container_id.stdout }} st2 run packs.setup_virtualenv packs=opensds +- name: Install virtualenv for soda packs [This task is known failure] + shell: docker exec -i {{ container_id.stdout }} st2 run packs.setup_virtualenv packs=soda args: chdir: "{{ orchestration_work_dir }}" warn: false diff --git a/ansible/roles/orchestration-installer/scenarios/start-orchestration.yml b/ansible/roles/orchestration-installer/scenarios/start-orchestration.yml index 1793a1bf2..1077cdea4 100644 --- a/ansible/roles/orchestration-installer/scenarios/start-orchestration.yml +++ b/ansible/roles/orchestration-installer/scenarios/start-orchestration.yml @@ -1,4 +1,4 @@ -# Copyright 2019 The OpenSDS Authors. +# Copyright 2019 The soda Authors. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -13,7 +13,7 @@ # limitations under the License. --- -# Start OpenSDS Workflow Manager +# Start soda Workflow Manager - name: Get stackstorm password shell: cat conf/stackstorm.env | grep ST2_PASSWORD | cut -d '=' -f 2 args: diff --git a/ansible/roles/orchestration-installer/tasks/main.yml b/ansible/roles/orchestration-installer/tasks/main.yml index 2100e5433..e7466361c 100644 --- a/ansible/roles/orchestration-installer/tasks/main.yml +++ b/ansible/roles/orchestration-installer/tasks/main.yml @@ -1,4 +1,4 @@ -# Copyright 2019 The OpenSDS Authors. +# Copyright 2019 The soda Authors. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/ansible/roles/osdsdb/scenarios/container.yml b/ansible/roles/osdsdb/scenarios/container.yml index e0f65c8ae..973611df2 100644 --- a/ansible/roles/osdsdb/scenarios/container.yml +++ b/ansible/roles/osdsdb/scenarios/container.yml @@ -1,4 +1,4 @@ -# Copyright 2018 The OpenSDS Authors. +# Copyright 2018 The soda Authors. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/ansible/roles/osdsdb/scenarios/etcd.yml b/ansible/roles/osdsdb/scenarios/etcd.yml index b0f113cbe..78653ab31 100644 --- a/ansible/roles/osdsdb/scenarios/etcd.yml +++ b/ansible/roles/osdsdb/scenarios/etcd.yml @@ -1,4 +1,4 @@ -# Copyright 2018 The OpenSDS Authors. +# Copyright 2018 The soda Authors. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/ansible/roles/osdsdb/scenarios/etcd_aarch64.yml b/ansible/roles/osdsdb/scenarios/etcd_aarch64.yml index 73b7ed9e4..00b616e74 100644 --- a/ansible/roles/osdsdb/scenarios/etcd_aarch64.yml +++ b/ansible/roles/osdsdb/scenarios/etcd_aarch64.yml @@ -1,4 +1,4 @@ -# Copyright 2019 The OpenSDS Authors. +# Copyright 2019 The soda Authors. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/ansible/roles/osdsdb/tasks/main.yml b/ansible/roles/osdsdb/tasks/main.yml index ac14bd15a..cd5f48861 100644 --- a/ansible/roles/osdsdb/tasks/main.yml +++ b/ansible/roles/osdsdb/tasks/main.yml @@ -1,4 +1,4 @@ -# Copyright 2019 The OpenSDS Authors. +# Copyright 2019 The soda Authors. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/ansible/roles/osdsdock/scenarios/ceph.yml b/ansible/roles/osdsdock/scenarios/ceph.yml index 061411a7d..3017ec938 100644 --- a/ansible/roles/osdsdock/scenarios/ceph.yml +++ b/ansible/roles/osdsdock/scenarios/ceph.yml @@ -1,4 +1,4 @@ -# Copyright 2018 The OpenSDS Authors. +# Copyright 2018 The soda Authors. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -166,11 +166,11 @@ with_items: - notario # -# configure opensds.conf ceph section +# configure soda.conf ceph section # -- name: configure opensds global info osdsdock ceph +- name: configure soda global info osdsdock ceph ini_file: - path: "{{ opensds_conf_file }}" + path: "{{ soda_conf_file }}" section: ceph option: "{{ item.option }}" value: "{{ item.value }}" @@ -182,7 +182,7 @@ become: yes ignore_errors: yes -- name: copy opensds ceph backend file to ceph config file if specify ceph backend +- name: copy soda ceph backend file to ceph config file if specify ceph backend copy: src: ../../../group_vars/ceph/ceph.yaml dest: "{{ ceph_config_path }}" @@ -207,7 +207,7 @@ # 3. ceph installed, and configured properly # 3-a. HEALTH_OK, and cluster member status is healthy # -> do version check, -# 3-a-1 if version OK, just configure opensds ceph backend +# 3-a-1 if version OK, just configure soda ceph backend # 3-a-2 if version NG, abort # case: 3-a-2 diff --git a/ansible/roles/osdsdock/scenarios/ceph_install.yml b/ansible/roles/osdsdock/scenarios/ceph_install.yml index 4f2dff207..96c5a5885 100644 --- a/ansible/roles/osdsdock/scenarios/ceph_install.yml +++ b/ansible/roles/osdsdock/scenarios/ceph_install.yml @@ -1,4 +1,4 @@ -# Copyright 2019 The OpenSDS Authors. +# Copyright 2019 The soda Authors. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/ansible/roles/osdsdock/scenarios/ceph_pool_check.yml b/ansible/roles/osdsdock/scenarios/ceph_pool_check.yml index fa4bfbccf..1e982edfd 100644 --- a/ansible/roles/osdsdock/scenarios/ceph_pool_check.yml +++ b/ansible/roles/osdsdock/scenarios/ceph_pool_check.yml @@ -1,4 +1,4 @@ -# Copyright 2019 The OpenSDS Authors. +# Copyright 2019 The soda Authors. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/ansible/roles/osdsdock/scenarios/ceph_preflight_check.yml b/ansible/roles/osdsdock/scenarios/ceph_preflight_check.yml index d923f3451..da5969046 100644 --- a/ansible/roles/osdsdock/scenarios/ceph_preflight_check.yml +++ b/ansible/roles/osdsdock/scenarios/ceph_preflight_check.yml @@ -1,4 +1,4 @@ -# Copyright 2019 The OpenSDS Authors. +# Copyright 2019 The soda Authors. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/ansible/roles/osdsdock/scenarios/ceph_stabilize.yml b/ansible/roles/osdsdock/scenarios/ceph_stabilize.yml index 1324b3331..de8978410 100644 --- a/ansible/roles/osdsdock/scenarios/ceph_stabilize.yml +++ b/ansible/roles/osdsdock/scenarios/ceph_stabilize.yml @@ -1,4 +1,4 @@ -# Copyright 2019 The OpenSDS Authors. +# Copyright 2019 The soda Authors. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/ansible/roles/osdsdock/scenarios/ceph_uninstall.yml b/ansible/roles/osdsdock/scenarios/ceph_uninstall.yml index c735b4343..1061dd919 100644 --- a/ansible/roles/osdsdock/scenarios/ceph_uninstall.yml +++ b/ansible/roles/osdsdock/scenarios/ceph_uninstall.yml @@ -1,4 +1,4 @@ -# Copyright 2019 The OpenSDS Authors. +# Copyright 2019 The soda Authors. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/ansible/roles/osdsdock/scenarios/cinder.yml b/ansible/roles/osdsdock/scenarios/cinder.yml index 59ad8d6cc..6eed420d2 100644 --- a/ansible/roles/osdsdock/scenarios/cinder.yml +++ b/ansible/roles/osdsdock/scenarios/cinder.yml @@ -1,4 +1,4 @@ -# Copyright 2018 The OpenSDS Authors. +# Copyright 2018 The soda Authors. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -13,9 +13,9 @@ # limitations under the License. --- -- name: configure cinder section in opensds global info if specify cinder backend +- name: configure cinder section in soda global info if specify cinder backend shell: | - cat >> opensds.conf <> soda.conf <> opensds.conf <> soda.conf < "$OPENSDS_CONFIG_DIR/opensds.conf" << OPENSDS_GLOBAL_CONFIG_DOC +mkdir -p $soda_CONFIG_DIR +cat > "$soda_CONFIG_DIR/soda.conf" << soda_GLOBAL_CONFIG_DOC [keystone_authtoken] memcached_servers = $HOST_IP:11211 -signing_dir = /var/cache/opensds +signing_dir = /var/cache/soda cafile = /opt/stack/data/ca-bundle.pem auth_uri = http://$HOST_IP/identity project_domain_name = Default @@ -79,17 +79,17 @@ password = $STACK_PASSWORD enable_encrypted = False # Encryption and decryption tool. Default value is aes. The decryption tool can only decrypt the corresponding ciphertext. pwd_encrypter = aes -username = $OPENSDS_SERVER_NAME +username = $soda_SERVER_NAME auth_url = http://$HOST_IP/identity auth_type = password -OPENSDS_GLOBAL_CONFIG_DOC +soda_GLOBAL_CONFIG_DOC -cp "$TOP_DIR/../../conf/policy.json" "$OPENSDS_CONFIG_DIR" +cp "$TOP_DIR/../../conf/policy.json" "$soda_CONFIG_DIR" } gelato_conf() { - local compose_file=/opt/opensds-gelato-linux-amd64/docker-compose.yml + local compose_file=/opt/soda-gelato-linux-amd64/docker-compose.yml sed -i "s,OS_AUTH_AUTHSTRATEGY=.*$,OS_AUTH_AUTHSTRATEGY=keystone," $compose_file sed -i "s,OS_AUTH_URL=.*$,OS_AUTH_URL=http://$HOST_IP/identity," $compose_file sed -i "s,OS_USERNAME=.*$,OS_USERNAME=$MULTICLOUD_SERVER_NAME," $compose_file @@ -131,20 +131,20 @@ wait_for_keystone () { create_user_and_endpoint_for_hotpot(){ . "$DEV_STACK_DIR/openrc" admin admin - if openstack user show $OPENSDS_SERVER_NAME &>/dev/null; then + if openstack user show $soda_SERVER_NAME &>/dev/null; then return fi - openstack user create --domain default --password "$STACK_PASSWORD" "$OPENSDS_SERVER_NAME" - openstack role add --project service --user "$OPENSDS_SERVER_NAME" admin + openstack user create --domain default --password "$STACK_PASSWORD" "$soda_SERVER_NAME" + openstack role add --project service --user "$soda_SERVER_NAME" admin openstack group create service - openstack group add user service "$OPENSDS_SERVER_NAME" + openstack group add user service "$soda_SERVER_NAME" openstack role add service --project service --group service openstack group add user admins admin - openstack service create --name "opensds$OPENSDS_VERSION" --description "OpenSDS Block Storage" "opensds$OPENSDS_VERSION" - openstack endpoint create --region RegionOne "opensds$OPENSDS_VERSION" public "http://$HOST_IP:50040/$OPENSDS_VERSION/%(tenant_id)s" - openstack endpoint create --region RegionOne "opensds$OPENSDS_VERSION" internal "http://$HOST_IP:50040/$OPENSDS_VERSION/%(tenant_id)s" - openstack endpoint create --region RegionOne "opensds$OPENSDS_VERSION" admin "http://$HOST_IP:50040/$OPENSDS_VERSION/%(tenant_id)s" + openstack service create --name "soda$soda_VERSION" --description "soda Block Storage" "soda$soda_VERSION" + openstack endpoint create --region RegionOne "soda$soda_VERSION" public "http://$HOST_IP:50040/$soda_VERSION/%(tenant_id)s" + openstack endpoint create --region RegionOne "soda$soda_VERSION" internal "http://$HOST_IP:50040/$soda_VERSION/%(tenant_id)s" + openstack endpoint create --region RegionOne "soda$soda_VERSION" admin "http://$HOST_IP:50040/$soda_VERSION/%(tenant_id)s" } create_user_and_endpoint_for_gelato(){ @@ -183,9 +183,9 @@ download_code(){ install(){ if [ "docker" == "$1" ] then - docker pull opensdsio/opensds-authchecker:latest - docker run -d --privileged=true --restart=always --net=host --name=opensds-authchecker opensdsio/opensds-authchecker:latest - docker cp "$TOP_DIR/../../conf/keystone.policy.json" opensds-authchecker:/etc/keystone/policy.json + docker pull sodaio/soda-authchecker:latest + docker run -d --privileged=true --restart=always --net=host --name=soda-authchecker sodaio/soda-authchecker:latest + docker cp "$TOP_DIR/../../conf/keystone.policy.json" soda-authchecker:/etc/keystone/policy.json keystone_credentials wait_for_keystone python ${TOP_DIR}/ministone.py endpoint_bulk_update keystone "http://${HOST_IP}/identity" @@ -207,8 +207,8 @@ install(){ uninstall(){ if [ "docker" == "$1" ] then - docker stop opensds-authchecker - docker rm opensds-authchecker + docker stop soda-authchecker + docker rm soda-authchecker else su "$STACK_USER_NAME" -c "${DEV_STACK_DIR}/clean.sh" >/dev/null su "$STACK_USER_NAME" -c "${DEV_STACK_DIR}/unstack.sh" >/dev/null @@ -227,7 +227,7 @@ config_hotpot() { create_user_and_endpoint_for_hotpot else keystone_credentials - python ${TOP_DIR}/ministone.py endpoint_bulk_update "opensds$OPENSDS_VERSION" "http://${HOST_IP}:50040/$OPENSDS_VERSION/%(tenant_id)s" + python ${TOP_DIR}/ministone.py endpoint_bulk_update "soda$soda_VERSION" "http://${HOST_IP}:50040/$soda_VERSION/%(tenant_id)s" fi } @@ -244,8 +244,8 @@ config_gelato() { # *************************** TOP_DIR=$(cd $(dirname "$0") && pwd) -# OpenSDS configuration directory -OPENSDS_CONFIG_DIR=${OPENSDS_CONFIG_DIR:-/etc/opensds} +# soda configuration directory +soda_CONFIG_DIR=${soda_CONFIG_DIR:-/etc/soda} # Keystone configuration directory KEYSTONE_CONFIG_DIR=${KEYSTONE_CONFIG_DIR:-/etc/keystone} if [[ -e $TOP_DIR/local.conf ]];then diff --git a/ansible/script/ministone.py b/ansible/script/ministone.py index b0bb9c7bc..3812da495 100755 --- a/ansible/script/ministone.py +++ b/ansible/script/ministone.py @@ -1,6 +1,6 @@ #!/usr/bin/env python -# Copyright 2019 The OpenSDS Authors. +# Copyright 2019 The soda Authors. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/ansible/script/mod_prometheus_config_for_alertmanager.sh b/ansible/script/mod_prometheus_config_for_alertmanager.sh index 5d350c355..1deb13455 100644 --- a/ansible/script/mod_prometheus_config_for_alertmanager.sh +++ b/ansible/script/mod_prometheus_config_for_alertmanager.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash -# Copyright 2019 The OpenSDS Authors. +# Copyright 2019 The soda Authors. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/ansible/script/mod_prometheus_config_for_lvm_exporter.sh b/ansible/script/mod_prometheus_config_for_lvm_exporter.sh index 2c8760545..aa6e148a8 100644 --- a/ansible/script/mod_prometheus_config_for_lvm_exporter.sh +++ b/ansible/script/mod_prometheus_config_for_lvm_exporter.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash -# Copyright 2019 The OpenSDS Authors. +# Copyright 2019 The soda Authors. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/ansible/script/mod_prometheus_config_for_node_exporter.sh b/ansible/script/mod_prometheus_config_for_node_exporter.sh index e7a3c6cc3..eccbda88c 100644 --- a/ansible/script/mod_prometheus_config_for_node_exporter.sh +++ b/ansible/script/mod_prometheus_config_for_node_exporter.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash -# Copyright 2019 The OpenSDS Authors. +# Copyright 2019 The soda Authors. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/ansible/script/mod_prometheus_config_for_pushgateway.sh b/ansible/script/mod_prometheus_config_for_pushgateway.sh index bd8c750af..c51ebd59d 100644 --- a/ansible/script/mod_prometheus_config_for_pushgateway.sh +++ b/ansible/script/mod_prometheus_config_for_pushgateway.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash -# Copyright 2019 The OpenSDS Authors. +# Copyright 2019 The soda Authors. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/ansible/script/orchestration_addservices.py b/ansible/script/orchestration_addservices.py index 54d72403d..f11c04182 100755 --- a/ansible/script/orchestration_addservices.py +++ b/ansible/script/orchestration_addservices.py @@ -1,6 +1,6 @@ #!/usr/bin/env python -# Copyright 2019 The OpenSDS Authors. +# Copyright 2019 The soda Authors. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -21,7 +21,7 @@ import time -def get_opensds_token(ip): +def get_soda_token(ip): url = "http://" + ip + "/identity/v3/auth/tokens" headers = { 'content-type': 'application/json' @@ -34,7 +34,7 @@ def get_opensds_token(ip): "user": { "name": "admin", "domain": {"id": "default"}, - "password": "opensds@123" + "password": "soda@123" } } }, @@ -51,8 +51,8 @@ def get_opensds_token(ip): resp = requests.post( url=url, data=json.dumps(data), headers=headers, verify=False) if resp.status_code != 201: - print("Request for OpenSDS Token failed ", resp.status_code) - raise Exception('Request for OpenSDS Token failed') + print("Request for soda Token failed ", resp.status_code) + raise Exception('Request for soda Token failed') return resp.headers['X-Subject-Token'] @@ -111,11 +111,11 @@ def add_services(ip, port, pid, uid): "group": "provisioning", "workflows": [ { - "definition_source": "opensds.provision-volume", + "definition_source": "soda.provision-volume", "wfe_type": "st2" }, { - "definition_source": "opensds.snapshot-volume", + "definition_source": "soda.snapshot-volume", "wfe_type": "st2" } @@ -132,7 +132,7 @@ def add_services(ip, port, pid, uid): "group": "migration", "workflows": [ { - "definition_source": "opensds.migration-bucket", + "definition_source": "soda.migration-bucket", "wfe_type": "st2" } ] @@ -160,14 +160,14 @@ def add_services(ip, port, pid, uid): # Start # Args : ip, orc_ip, orc_port if len(sys.argv) != 4: - print("Usage: CMD ") + print("Usage: CMD ") raise Exception("Invalid argument") ip = sys.argv[1] orc_ip = sys.argv[2] orc_port = sys.argv[3] - token = get_opensds_token(ip) + token = get_soda_token(ip) pid = get_project_id(ip, token) uid = get_user_id(ip, token) diff --git a/ansible/script/sdsrc b/ansible/script/sdsrc index ea608808f..d90422b41 100755 --- a/ansible/script/sdsrc +++ b/ansible/script/sdsrc @@ -1,6 +1,6 @@ #!/usr/bin/env bash -# Copyright 2018 The OpenSDS Authors. +# Copyright 2018 The soda Authors. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -21,25 +21,25 @@ if [ "$HOST_IP" == "" ]; then die $LINENO "Could not determine host ip address. See local.conf for suggestions on setting HOST_IP." fi -# OpenSDS configuration. -OPENSDS_VERSION=${OPENSDS_VERSION:-v1beta} +# soda configuration. +soda_VERSION=${soda_VERSION:-v1beta} # Multi-cloud MULTICLOUD_VERSION=${MULTICLOUD_VERSION:-v1} -# OpenSDS service name in keystone. -OPENSDS_SERVER_NAME=${OPENSDS_SERVER_NAME:-opensds} +# soda service name in keystone. +soda_SERVER_NAME=${soda_SERVER_NAME:-soda} # Multi-Cloud service name in keystone -MULTICLOUD_SERVER_NAME=${MULTICLOUD_SERVER_NAME:-opensds} +MULTICLOUD_SERVER_NAME=${MULTICLOUD_SERVER_NAME:-soda} # devstack keystone configuration STACK_GIT_BASE=${STACK_GIT_BASE:-https://git.openstack.org} STACK_USER_NAME=${STACK_USER_NAME:-stack} -STACK_PASSWORD=${STACK_PASSWORD:-opensds@123} +STACK_PASSWORD=${STACK_PASSWORD:-soda@123} STACK_HOME=${STACK_HOME:-/opt/stack} STACK_BRANCH=${STACK_BRANCH:-stable/queens} DEV_STACK_DIR=$STACK_HOME/devstack GOPATH=${GOPATH:-$HOME/gopath} -OPENSDS_DIR=${GOPATH}/src/github.com/opensds/opensds +soda_DIR=${GOPATH}/src/github.com/soda/soda diff --git a/ansible/script/set_alertmanager_service.sh b/ansible/script/set_alertmanager_service.sh index bd6b96561..7718b1a05 100644 --- a/ansible/script/set_alertmanager_service.sh +++ b/ansible/script/set_alertmanager_service.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash -# Copyright 2019 The OpenSDS Authors. +# Copyright 2019 The soda Authors. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/ansible/script/set_lvm_exporter_service.sh b/ansible/script/set_lvm_exporter_service.sh index fa6cfcade..7a7d81a3c 100644 --- a/ansible/script/set_lvm_exporter_service.sh +++ b/ansible/script/set_lvm_exporter_service.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash -# Copyright 2019 The OpenSDS Authors. +# Copyright 2019 The soda Authors. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/ansible/script/set_nginx_config.sh b/ansible/script/set_nginx_config.sh index bf97a8ee3..db688d6cd 100755 --- a/ansible/script/set_nginx_config.sh +++ b/ansible/script/set_nginx_config.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash -# Copyright 2018 The OpenSDS Authors. +# Copyright 2018 The soda Authors. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -17,7 +17,7 @@ TOP_DIR=$(cd $(dirname "$0") && pwd) source "$TOP_DIR/util.sh" source "$TOP_DIR/sdsrc" -#FIXME The /orchestration/ changes are to fix Issue #106 in opensds/opensds-dashboard. +#FIXME The /orchestration/ changes are to fix Issue #106 in soda/soda-dashboard. #This is a temporary fix for the API not being reachable. The Orchestration API endpoint will be changed and this fix will be removed. cat > /etc/nginx/sites-available/default < /etc/nginx/sites-available/default < /etc/opensds/opensds.conf < /etc/soda/soda.conf < /etc/opensds/driver/lvm.yaml < /etc/soda/driver/lvm.yaml < /etc/opensds/driver/ceph.yaml < /etc/soda/driver/ceph.yaml < ``` -### OpenSDS UI -OpenSDS UI dashboard is available at `http://{your_host_ip}:31975`, please login the dashboard using the default admin credentials: `admin/opensds@123`. Create `tenant`, `user`, and `profiles` as admin. Multi-Cloud service is also supported by dashboard. +### soda UI +soda UI dashboard is available at `http://{your_host_ip}:31975`, please login the dashboard using the default admin credentials: `admin/soda@123`. Create `tenant`, `user`, and `profiles` as admin. Multi-Cloud service is also supported by dashboard. Logout of the dashboard as admin and login the dashboard again as a non-admin user to manage storage resource: #### For CSI Plugin ``` -wget https://github.com/sodafoundation/nbp/releases/download/v1.4.0/opensds-sushi-v1.4.0-linux-amd64.tar.gz -tar zxvf opensds-sushi-v1.4.0-linux-amd64.tar.gz -cd /opensds-sushi-linux-amd64 +wget https://github.com/sodafoundation/nbp/releases/download/v1.4.0/soda-sushi-v1.4.0-linux-amd64.tar.gz +tar zxvf soda-sushi-v1.4.0-linux-amd64.tar.gz +cd /soda-sushi-linux-amd64 ``` * To create example nginx application using csi block plugin, use below command @@ -352,11 +352,11 @@ kubectl create -f csi/examples/kubernetes/file/nginx.yaml ``` -This example will mount a opensds volume into `/var/lib/www/html`. +This example will mount a soda volume into `/var/lib/www/html`. ## Clean up steps -Clean up example nginx application and opensds CSI pods by the following commands: +Clean up example nginx application and soda CSI pods by the following commands: ```bash kubectl delete -f csi/examples/kubernetes/block/nginx.yaml kubectl delete -f csi/examples/kubernetes/file/nginx.yaml @@ -365,7 +365,7 @@ kubectl delete -f csi/examples/kubernetes/file/nginx.yaml If you want to remove the existing cluster, please run the command below: ```bash helm delete { csiplugin_service_name } --purge -helm delete { opensds_service_name } --purge +helm delete { soda_service_name } --purge ``` diff --git a/charts/README.md b/charts/README.md index 101cfc3aa..883232825 100644 --- a/charts/README.md +++ b/charts/README.md @@ -1,29 +1,29 @@ -# opensds-helm -This is an installation tool for opensds using [helm](https://github.com/kubernetes/helm). +# soda-helm +This is an installation tool for soda using [helm](https://github.com/kubernetes/helm). With different charts folder shown below, we provide a simplified and flexible way to -deploy OpenSDS cluster. +deploy soda cluster. -## opensds -`opensds` charts is designed for deploying opensds controller and dock modules in one +## soda +`soda` charts is designed for deploying soda controller and dock modules in one command: ```shell -helm install opensds/ --name={ service_name } --namespace={ kubernetes_namespace } +helm install soda/ --name={ service_name } --namespace={ kubernetes_namespace } ``` ## csiplugin-block -`csiplugin-block` charts is designed for deploying opensds csi block plugin module in one command: +`csiplugin-block` charts is designed for deploying soda csi block plugin module in one command: ```shell helm install csiplugin-block/ --name={ service_name } --namespace={ kubernetes_namespace } ``` ## csiplugin-file -`csiplugin-file` charts is designed for deploying opensds csi file plugin module in one command: +`csiplugin-file` charts is designed for deploying soda csi file plugin module in one command: ```shell helm install csiplugin-file/ --name={ service_name } --namespace={ kubernetes_namespace } ``` ## servicebroker -`servicebroker` charts is designed for deploying opensds servicebroker module in one +`servicebroker` charts is designed for deploying soda servicebroker module in one command: ```shell helm install servicebroker/ --name={ service_name } --namespace={ kubernetes_namespace } diff --git a/charts/csiplugin-block/Chart.yaml b/charts/csiplugin-block/Chart.yaml index 093a3b0d7..db485473d 100644 --- a/charts/csiplugin-block/Chart.yaml +++ b/charts/csiplugin-block/Chart.yaml @@ -1,3 +1,3 @@ name: csiplugin-block -description: OpenSDS csi block plugin deployment Helm Chart. +description: soda csi block plugin deployment Helm Chart. version: 0.6.1 diff --git a/charts/csiplugin-block/templates/csi-attacher-opensdsplugin.yaml b/charts/csiplugin-block/templates/csi-attacher-opensdsplugin.yaml index 7e7fccdfc..05f4e9eaa 100644 --- a/charts/csiplugin-block/templates/csi-attacher-opensdsplugin.yaml +++ b/charts/csiplugin-block/templates/csi-attacher-opensdsplugin.yaml @@ -1,5 +1,5 @@ # This YAML file contains attacher & csi driver API objects, -# which are necessary to run external csi attacher for opensds. +# which are necessary to run external csi attacher for soda. kind: Service apiVersion: v1 @@ -77,71 +77,71 @@ spec: image: {{ .Values.image }} args : - "--csiEndpoint=$(CSI_ENDPOINT)" - - "--opensdsEndpoint=$(OPENSDS_ENDPOINT)" - - "--opensdsAuthStrategy=$(OPENSDS_AUTH_STRATEGY)" + - "--sodaEndpoint=$(soda_ENDPOINT)" + - "--sodaAuthStrategy=$(soda_AUTH_STRATEGY)" - "--v=8" env: - name: CSI_ENDPOINT value: unix://csi/csi.sock - - name: OPENSDS_ENDPOINT + - name: soda_ENDPOINT valueFrom: configMapKeyRef: - name: csi-configmap-opensdsplugin-block - key: opensdsendpoint - - name: OPENSDS_AUTH_STRATEGY + name: csi-configmap-sodaplugin-block + key: sodaendpoint + - name: soda_AUTH_STRATEGY valueFrom: configMapKeyRef: - name: csi-configmap-opensdsplugin-block - key: opensdsauthstrategy + name: csi-configmap-sodaplugin-block + key: sodaauthstrategy - name: OS_AUTH_URL valueFrom: configMapKeyRef: - name: csi-configmap-opensdsplugin-block + name: csi-configmap-sodaplugin-block key: osauthurl - name: OS_USERNAME valueFrom: configMapKeyRef: - name: csi-configmap-opensdsplugin-block + name: csi-configmap-sodaplugin-block key: osusername - name: PASSWORD_ENCRYPTER valueFrom: configMapKeyRef: - name: csi-configmap-opensdsplugin-block + name: csi-configmap-sodaplugin-block key: passwordencrypter - name: ENABLE_ENCRYPTED valueFrom: configMapKeyRef: - name: csi-configmap-opensdsplugin-block + name: csi-configmap-sodaplugin-block key: enableEncrypted - name: OS_PASSWORD valueFrom: configMapKeyRef: - name: csi-configmap-opensdsplugin-block + name: csi-configmap-sodaplugin-block key: ospassword - name: PASSWORD_ENCRYPTER valueFrom: configMapKeyRef: - name: csi-configmap-opensdsplugin-block + name: csi-configmap-sodaplugin-block key: passwordencrypter - name: ENABLE_ENCRYPTED valueFrom: configMapKeyRef: - name: csi-configmap-opensdsplugin-block + name: csi-configmap-sodaplugin-block key: enableEncrypted - name: OS_TENANT_NAME valueFrom: configMapKeyRef: - name: csi-configmap-opensdsplugin-block + name: csi-configmap-sodaplugin-block key: ostenantname - name: OS_PROJECT_NAME valueFrom: configMapKeyRef: - name: csi-configmap-opensdsplugin-block + name: csi-configmap-sodaplugin-block key: osprojectname - name: OS_USER_DOMAIN_ID valueFrom: configMapKeyRef: - name: csi-configmap-opensdsplugin-block + name: csi-configmap-sodaplugin-block key: osuserdomainid imagePullPolicy: {{ .Values.imagePullPolicy }} volumeMounts: @@ -152,7 +152,7 @@ spec: - name: ceph-dir mountPath: /etc/ceph/ - name: certificate-path - mountPath: /opt/opensds-security + mountPath: /opt/soda-security volumes: - name: socket-dir emptyDir: @@ -166,5 +166,5 @@ spec: type: DirectoryOrCreate - name: certificate-path hostPath: - path: /opt/opensds-security + path: /opt/soda-security type: DirectoryOrCreate diff --git a/charts/csiplugin-block/templates/csi-attacher-rbac.yaml b/charts/csiplugin-block/templates/csi-attacher-rbac.yaml index dba8361d3..b78769eb4 100644 --- a/charts/csiplugin-block/templates/csi-attacher-rbac.yaml +++ b/charts/csiplugin-block/templates/csi-attacher-rbac.yaml @@ -1,5 +1,5 @@ # This YAML file contains RBAC API objects, -# which are necessary to run external csi attacher for opensds. +# which are necessary to run external csi attacher for soda. apiVersion: v1 kind: ServiceAccount diff --git a/charts/csiplugin-block/templates/csi-configmap-opensdsplugin.yaml b/charts/csiplugin-block/templates/csi-configmap-opensdsplugin.yaml index 5c3341805..d5d9136a6 100644 --- a/charts/csiplugin-block/templates/csi-configmap-opensdsplugin.yaml +++ b/charts/csiplugin-block/templates/csi-configmap-opensdsplugin.yaml @@ -1,13 +1,13 @@ # This YAML file contains configmap objects, -# which are necessary to run csi opensds plugin. +# which are necessary to run csi soda plugin. kind: ConfigMap apiVersion: v1 metadata: - name: csi-configmap-opensdsplugin-block + name: csi-configmap-sodaplugin-block data: - opensdsendpoint: {{ .Values.data.opensdsEndpoint }} - opensdsauthstrategy: {{ .Values.data.opensdsAuthStrategy }} + sodaendpoint: {{ .Values.data.sodaEndpoint }} + sodaauthstrategy: {{ .Values.data.sodaAuthStrategy }} osauthurl: {{ .Values.data.osAuthURL }} osusername: {{ .Values.data.osUsername }} ospassword: {{ .Values.data.osPassword }} diff --git a/charts/csiplugin-block/templates/csi-nodeplugin-opensdsplugin.yaml b/charts/csiplugin-block/templates/csi-nodeplugin-opensdsplugin.yaml index 44b948044..895cc62c8 100644 --- a/charts/csiplugin-block/templates/csi-nodeplugin-opensdsplugin.yaml +++ b/charts/csiplugin-block/templates/csi-nodeplugin-opensdsplugin.yaml @@ -1,5 +1,5 @@ # This YAML file contains driver-registrar & csi driver nodeplugin API objects, -# which are necessary to run csi nodeplugin for opensds. +# which are necessary to run csi nodeplugin for soda. kind: DaemonSet apiVersion: apps/v1 @@ -38,7 +38,7 @@ spec: - "--kubelet-registration-path=$(ADDRESS)" env: - name: ADDRESS - value: /var/lib/kubelet/plugins/csi-opensdsplugin-block/csi.sock + value: /var/lib/kubelet/plugins/csi-sodaplugin-block/csi.sock - name: KUBE_NODE_NAME valueFrom: fieldRef: @@ -58,76 +58,76 @@ spec: image: {{ .Values.image }} args : - "--csiEndpoint=$(CSI_ENDPOINT)" - - "--opensdsEndpoint=$(OPENSDS_ENDPOINT)" - - "--opensdsAuthStrategy=$(OPENSDS_AUTH_STRATEGY)" + - "--sodaEndpoint=$(soda_ENDPOINT)" + - "--sodaAuthStrategy=$(soda_AUTH_STRATEGY)" - "--v=8" env: - name: CSI_ENDPOINT - value: unix://var/lib/kubelet/plugins/csi-opensdsplugin-block/csi.sock - - name: OPENSDS_ENDPOINT + value: unix://var/lib/kubelet/plugins/csi-sodaplugin-block/csi.sock + - name: soda_ENDPOINT valueFrom: configMapKeyRef: - name: csi-configmap-opensdsplugin-block - key: opensdsendpoint - - name: OPENSDS_AUTH_STRATEGY + name: csi-configmap-sodaplugin-block + key: sodaendpoint + - name: soda_AUTH_STRATEGY valueFrom: configMapKeyRef: - name: csi-configmap-opensdsplugin-block - key: opensdsauthstrategy + name: csi-configmap-sodaplugin-block + key: sodaauthstrategy - name: OS_AUTH_URL valueFrom: configMapKeyRef: - name: csi-configmap-opensdsplugin-block + name: csi-configmap-sodaplugin-block key: osauthurl - name: OS_USERNAME valueFrom: configMapKeyRef: - name: csi-configmap-opensdsplugin-block + name: csi-configmap-sodaplugin-block key: osusername - name: OS_PASSWORD valueFrom: configMapKeyRef: - name: csi-configmap-opensdsplugin-block + name: csi-configmap-sodaplugin-block key: ospassword - name: PASSWORD_ENCRYPTER valueFrom: configMapKeyRef: - name: csi-configmap-opensdsplugin-block + name: csi-configmap-sodaplugin-block key: passwordencrypter - name: ENABLE_ENCRYPTED valueFrom: configMapKeyRef: - name: csi-configmap-opensdsplugin-block + name: csi-configmap-sodaplugin-block key: enableEncrypted - name: OS_TENANT_NAME valueFrom: configMapKeyRef: - name: csi-configmap-opensdsplugin-block + name: csi-configmap-sodaplugin-block key: ostenantname - name: PASSWORD_ENCRYPTER valueFrom: configMapKeyRef: - name: csi-configmap-opensdsplugin-block + name: csi-configmap-sodaplugin-block key: passwordencrypter - name: ENABLE_ENCRYPTED valueFrom: configMapKeyRef: - name: csi-configmap-opensdsplugin-block + name: csi-configmap-sodaplugin-block key: enableEncrypted - name: OS_PROJECT_NAME valueFrom: configMapKeyRef: - name: csi-configmap-opensdsplugin-block + name: csi-configmap-sodaplugin-block key: osprojectname - name: OS_USER_DOMAIN_ID valueFrom: configMapKeyRef: - name: csi-configmap-opensdsplugin-block + name: csi-configmap-sodaplugin-block key: osuserdomainid imagePullPolicy: {{ .Values.imagePullPolicy }} volumeMounts: - name: socket-dir - mountPath: /var/lib/kubelet/plugins/csi-opensdsplugin-block + mountPath: /var/lib/kubelet/plugins/csi-sodaplugin-block - name: pods-mount-dir mountPath: /var/lib/kubelet/pods mountPropagation: "Bidirectional" @@ -142,13 +142,13 @@ spec: - name: ceph-dir mountPath: /etc/ceph/ - name: certificate-path - mountPath: /opt/opensds-security + mountPath: /opt/soda-security - name: hosts mountPath: /etc volumes: - name: socket-dir hostPath: - path: /var/lib/kubelet/plugins/csi-opensdsplugin-block + path: /var/lib/kubelet/plugins/csi-sodaplugin-block type: DirectoryOrCreate - name: volume-devices-dir hostPath: @@ -176,7 +176,7 @@ spec: type: DirectoryOrCreate - name: certificate-path hostPath: - path: /opt/opensds-security + path: /opt/soda-security type: DirectoryOrCreate - name: hosts hostPath: diff --git a/charts/csiplugin-block/templates/csi-provisioner-opensdsplugin.yaml b/charts/csiplugin-block/templates/csi-provisioner-opensdsplugin.yaml index 4f51ac52a..8f56af3ec 100644 --- a/charts/csiplugin-block/templates/csi-provisioner-opensdsplugin.yaml +++ b/charts/csiplugin-block/templates/csi-provisioner-opensdsplugin.yaml @@ -1,5 +1,5 @@ # This YAML file contains attacher & csi driver API objects, -# which are necessary to run external csi provisioner for opensds. +# which are necessary to run external csi provisioner for soda. kind: Service apiVersion: v1 @@ -50,7 +50,7 @@ spec: - name: csi-provisioner image: quay.io/k8scsi/csi-provisioner:v1.1.0 args: - - "--provisioner=csi-opensdsplugin" + - "--provisioner=csi-sodaplugin" - "--csi-address=$(ADDRESS)" - "--connection-timeout=15s" - "--feature-gates=Topology=True" @@ -65,77 +65,77 @@ spec: image: {{ .Values.image }} args : - "--csiEndpoint=$(CSI_ENDPOINT)" - - "--opensdsEndpoint=$(OPENSDS_ENDPOINT)" - - "--opensdsAuthStrategy=$(OPENSDS_AUTH_STRATEGY)" + - "--sodaEndpoint=$(soda_ENDPOINT)" + - "--sodaAuthStrategy=$(soda_AUTH_STRATEGY)" - "--v=8" env: - name: CSI_ENDPOINT value: unix://csi/csi.sock - - name: OPENSDS_ENDPOINT + - name: soda_ENDPOINT valueFrom: configMapKeyRef: - name: csi-configmap-opensdsplugin-block - key: opensdsendpoint - - name: OPENSDS_AUTH_STRATEGY + name: csi-configmap-sodaplugin-block + key: sodaendpoint + - name: soda_AUTH_STRATEGY valueFrom: configMapKeyRef: - name: csi-configmap-opensdsplugin-block - key: opensdsauthstrategy + name: csi-configmap-sodaplugin-block + key: sodaauthstrategy - name: OS_AUTH_URL valueFrom: configMapKeyRef: - name: csi-configmap-opensdsplugin-block + name: csi-configmap-sodaplugin-block key: osauthurl - name: OS_USERNAME valueFrom: configMapKeyRef: - name: csi-configmap-opensdsplugin-block + name: csi-configmap-sodaplugin-block key: osusername - name: PASSWORD_ENCRYPTER valueFrom: configMapKeyRef: - name: csi-configmap-opensdsplugin-block + name: csi-configmap-sodaplugin-block key: passwordencrypter - name: OS_PASSWORD valueFrom: configMapKeyRef: - name: csi-configmap-opensdsplugin-block + name: csi-configmap-sodaplugin-block key: ospassword - name: PASSWORD_ENCRYPTER valueFrom: configMapKeyRef: - name: csi-configmap-opensdsplugin-block + name: csi-configmap-sodaplugin-block key: passwordencrypter - name: ENABLE_ENCRYPTED valueFrom: configMapKeyRef: - name: csi-configmap-opensdsplugin-block + name: csi-configmap-sodaplugin-block key: enableEncrypted - name: OS_TENANT_NAME valueFrom: configMapKeyRef: - name: csi-configmap-opensdsplugin-block + name: csi-configmap-sodaplugin-block key: ostenantname - name: OS_PROJECT_NAME valueFrom: configMapKeyRef: - name: csi-configmap-opensdsplugin-block + name: csi-configmap-sodaplugin-block key: osprojectname - name: OS_USER_DOMAIN_ID valueFrom: configMapKeyRef: - name: csi-configmap-opensdsplugin-block + name: csi-configmap-sodaplugin-block key: osuserdomainid imagePullPolicy: {{ .Values.imagePullPolicy }} volumeMounts: - name: socket-dir mountPath: /csi - name: certificate-path - mountPath: /opt/opensds-security + mountPath: /opt/soda-security volumes: - name: socket-dir emptyDir: - name: certificate-path hostPath: - path: /opt/opensds-security + path: /opt/soda-security type: DirectoryOrCreate diff --git a/charts/csiplugin-block/templates/csi-provisioner-rbac.yaml b/charts/csiplugin-block/templates/csi-provisioner-rbac.yaml index 656a15f66..f195c39c4 100644 --- a/charts/csiplugin-block/templates/csi-provisioner-rbac.yaml +++ b/charts/csiplugin-block/templates/csi-provisioner-rbac.yaml @@ -1,5 +1,5 @@ # This YAML file contains RBAC API objects, -# which are necessary to run external csi provisioner for opensds. +# which are necessary to run external csi provisioner for soda. apiVersion: v1 kind: ServiceAccount diff --git a/charts/csiplugin-block/templates/csi-snapshotter-opensdsplugin.yaml b/charts/csiplugin-block/templates/csi-snapshotter-opensdsplugin.yaml index 7e0860ed4..8eb0d8e38 100644 --- a/charts/csiplugin-block/templates/csi-snapshotter-opensdsplugin.yaml +++ b/charts/csiplugin-block/templates/csi-snapshotter-opensdsplugin.yaml @@ -1,5 +1,5 @@ # This YAML file contains snapshotter & csi driver API objects, -# which are necessary to run external csi snapshotter for opensds. +# which are necessary to run external csi snapshotter for soda. kind: Service apiVersion: v1 @@ -50,7 +50,7 @@ spec: - name: csi-snapshotter image: quay.io/k8scsi/csi-snapshotter:v1.1.0 args: - - "--snapshotter=csi-opensdsplugin" + - "--snapshotter=csi-sodaplugin" - "--csi-address=$(ADDRESS)" - "--connection-timeout=15s" env: @@ -64,82 +64,82 @@ spec: image: {{ .Values.image }} args : - "--csiEndpoint=$(CSI_ENDPOINT)" - - "--opensdsEndpoint=$(OPENSDS_ENDPOINT)" - - "--opensdsAuthStrategy=$(OPENSDS_AUTH_STRATEGY)" + - "--sodaEndpoint=$(soda_ENDPOINT)" + - "--sodaAuthStrategy=$(soda_AUTH_STRATEGY)" - "--v=8" env: - name: CSI_ENDPOINT value: unix://csi/csi.sock - - name: OPENSDS_ENDPOINT + - name: soda_ENDPOINT valueFrom: configMapKeyRef: - name: csi-configmap-opensdsplugin-block - key: opensdsendpoint + name: csi-configmap-sodaplugin-block + key: sodaendpoint - name: ENABLE_ENCRYPTED valueFrom: configMapKeyRef: - name: csi-configmap-opensdsplugin-block + name: csi-configmap-sodaplugin-block key: enableEncrypted - name: PASSWORD_ENCRYPTER valueFrom: configMapKeyRef: - name: csi-configmap-opensdsplugin-block + name: csi-configmap-sodaplugin-block key: passwordencrypter - - name: OPENSDS_AUTH_STRATEGY + - name: soda_AUTH_STRATEGY valueFrom: configMapKeyRef: - name: csi-configmap-opensdsplugin-block - key: opensdsauthstrategy + name: csi-configmap-sodaplugin-block + key: sodaauthstrategy - name: OS_AUTH_URL valueFrom: configMapKeyRef: - name: csi-configmap-opensdsplugin-block + name: csi-configmap-sodaplugin-block key: osauthurl - name: OS_USERNAME valueFrom: configMapKeyRef: - name: csi-configmap-opensdsplugin-block + name: csi-configmap-sodaplugin-block key: osusername - name: OS_PASSWORD valueFrom: configMapKeyRef: - name: csi-configmap-opensdsplugin-block + name: csi-configmap-sodaplugin-block key: ospassword - name: PASSWORD_ENCRYPTER valueFrom: configMapKeyRef: - name: csi-configmap-opensdsplugin-block + name: csi-configmap-sodaplugin-block key: passwordencrypter - name: ENABLE_ENCRYPTED valueFrom: configMapKeyRef: - name: csi-configmap-opensdsplugin-block + name: csi-configmap-sodaplugin-block key: enableEncrypted - name: OS_TENANT_NAME valueFrom: configMapKeyRef: - name: csi-configmap-opensdsplugin-block + name: csi-configmap-sodaplugin-block key: ostenantname - name: OS_PROJECT_NAME valueFrom: configMapKeyRef: - name: csi-configmap-opensdsplugin-block + name: csi-configmap-sodaplugin-block key: osprojectname - name: OS_USER_DOMAIN_ID valueFrom: configMapKeyRef: - name: csi-configmap-opensdsplugin-block + name: csi-configmap-sodaplugin-block key: osuserdomainid imagePullPolicy: {{ .Values.imagePullPolicy }} volumeMounts: - name: socket-dir mountPath: /csi - name: certificate-path - mountPath: /opt/opensds-security + mountPath: /opt/soda-security volumes: - name: socket-dir emptyDir: - name: certificate-path hostPath: - path: /opt/opensds-security + path: /opt/soda-security type: DirectoryOrCreate diff --git a/charts/csiplugin-block/templates/csi-snapshotter-rbac.yaml b/charts/csiplugin-block/templates/csi-snapshotter-rbac.yaml index e2f28548b..4027bfe2b 100644 --- a/charts/csiplugin-block/templates/csi-snapshotter-rbac.yaml +++ b/charts/csiplugin-block/templates/csi-snapshotter-rbac.yaml @@ -1,5 +1,5 @@ # This YAML file contains RBAC API objects, -# which are necessary to run external csi snapshotter for opensds. +# which are necessary to run external csi snapshotter for soda. apiVersion: v1 kind: ServiceAccount diff --git a/charts/csiplugin-block/values.yaml b/charts/csiplugin-block/values.yaml index 501f7bf46..80dbd3aee 100644 --- a/charts/csiplugin-block/values.yaml +++ b/charts/csiplugin-block/values.yaml @@ -1,4 +1,4 @@ -# Default values for opensds csi plugin. +# Default values for soda csi plugin. # This is a YAML-formatted file. # Declare variables to be passed into your templates. @@ -10,11 +10,11 @@ imagePullPolicy: IfNotPresent imageRestartPolicy: Never # Please modify data fields in real environment data: - opensdsEndpoint: http://127.0.0.1:50040 - opensdsAuthStrategy: keystone + sodaEndpoint: http://127.0.0.1:50040 + sodaAuthStrategy: keystone osAuthURL: http://127.0.0.1/identity osUsername: admin - osPassword: opensds@123 + osPassword: soda@123 osTenantName: admin osProjectName: admin osUserDomainId: default @@ -23,17 +23,17 @@ data: # csipluginProvisioner spec csipluginProvisioner: - name: csi-provisioner-opensdsplugin-block + name: csi-provisioner-sodaplugin-block replicaCount: 1 # csipluginAttacher spec csipluginAttacher: - name: csi-attacher-opensdsplugin-block + name: csi-attacher-sodaplugin-block replicaCount: 1 # csipluginNodeplugin spec csipluginNodeplugin: - name: csi-nodeplugin-opensdsplugin-block + name: csi-nodeplugin-sodaplugin-block replicaCount: 1 # csipluginSnapshotter spec csipluginSnapshotter: - name: csi-snapshotter-opensdsplugin-block + name: csi-snapshotter-sodaplugin-block replicaCount: 1 diff --git a/charts/csiplugin-file/Chart.yaml b/charts/csiplugin-file/Chart.yaml index 64b3db521..39a1d0f7a 100644 --- a/charts/csiplugin-file/Chart.yaml +++ b/charts/csiplugin-file/Chart.yaml @@ -1,3 +1,3 @@ name: csiplugin-file -description: OpenSDS csi file plugin deployment Helm Chart. +description: soda csi file plugin deployment Helm Chart. version: 0.6.1 diff --git a/charts/csiplugin-file/templates/csi-attacher-opensdsplugin.yaml b/charts/csiplugin-file/templates/csi-attacher-opensdsplugin.yaml index de8d54c04..8d5823004 100644 --- a/charts/csiplugin-file/templates/csi-attacher-opensdsplugin.yaml +++ b/charts/csiplugin-file/templates/csi-attacher-opensdsplugin.yaml @@ -1,5 +1,5 @@ # This YAML file contains attacher & csi driver API objects, -# which are necessary to run external csi attacher for opensds. +# which are necessary to run external csi attacher for soda. kind: Service apiVersion: v1 @@ -77,71 +77,71 @@ spec: image: {{ .Values.image }} args : - "--csiEndpoint=$(CSI_ENDPOINT)" - - "--opensdsEndpoint=$(OPENSDS_ENDPOINT)" - - "--opensdsAuthStrategy=$(OPENSDS_AUTH_STRATEGY)" + - "--sodaEndpoint=$(soda_ENDPOINT)" + - "--sodaAuthStrategy=$(soda_AUTH_STRATEGY)" - "--v=8" env: - name: CSI_ENDPOINT value: unix://csi/csi.sock - - name: OPENSDS_ENDPOINT + - name: soda_ENDPOINT valueFrom: configMapKeyRef: - name: csi-configmap-opensdsplugin-file - key: opensdsendpoint - - name: OPENSDS_AUTH_STRATEGY + name: csi-configmap-sodaplugin-file + key: sodaendpoint + - name: soda_AUTH_STRATEGY valueFrom: configMapKeyRef: - name: csi-configmap-opensdsplugin-file - key: opensdsauthstrategy + name: csi-configmap-sodaplugin-file + key: sodaauthstrategy - name: OS_AUTH_URL valueFrom: configMapKeyRef: - name: csi-configmap-opensdsplugin-file + name: csi-configmap-sodaplugin-file key: osauthurl - name: OS_USERNAME valueFrom: configMapKeyRef: - name: csi-configmap-opensdsplugin-file + name: csi-configmap-sodaplugin-file key: osusername - name: PASSWORD_ENCRYPTER valueFrom: configMapKeyRef: - name: csi-configmap-opensdsplugin-file + name: csi-configmap-sodaplugin-file key: passwordencrypter - name: ENABLE_ENCRYPTED valueFrom: configMapKeyRef: - name: csi-configmap-opensdsplugin-file + name: csi-configmap-sodaplugin-file key: enableEncrypted - name: OS_PASSWORD valueFrom: configMapKeyRef: - name: csi-configmap-opensdsplugin-file + name: csi-configmap-sodaplugin-file key: ospassword - name: PASSWORD_ENCRYPTER valueFrom: configMapKeyRef: - name: csi-configmap-opensdsplugin-file + name: csi-configmap-sodaplugin-file key: passwordencrypter - name: ENABLE_ENCRYPTED valueFrom: configMapKeyRef: - name: csi-configmap-opensdsplugin-file + name: csi-configmap-sodaplugin-file key: enableEncrypted - name: OS_TENANT_NAME valueFrom: configMapKeyRef: - name: csi-configmap-opensdsplugin-file + name: csi-configmap-sodaplugin-file key: ostenantname - name: OS_PROJECT_NAME valueFrom: configMapKeyRef: - name: csi-configmap-opensdsplugin-file + name: csi-configmap-sodaplugin-file key: osprojectname - name: OS_USER_DOMAIN_ID valueFrom: configMapKeyRef: - name: csi-configmap-opensdsplugin-file + name: csi-configmap-sodaplugin-file key: osuserdomainid imagePullPolicy: {{ .Values.imagePullPolicy }} volumeMounts: @@ -152,7 +152,7 @@ spec: - name: ceph-dir mountPath: /etc/ceph/ - name: certificate-path - mountPath: /opt/opensds-security + mountPath: /opt/soda-security volumes: - name: socket-dir emptyDir: @@ -166,5 +166,5 @@ spec: type: DirectoryOrCreate - name: certificate-path hostPath: - path: /opt/opensds-security + path: /opt/soda-security type: DirectoryOrCreate diff --git a/charts/csiplugin-file/templates/csi-attacher-rbac.yaml b/charts/csiplugin-file/templates/csi-attacher-rbac.yaml index 8e964d734..f22569df4 100644 --- a/charts/csiplugin-file/templates/csi-attacher-rbac.yaml +++ b/charts/csiplugin-file/templates/csi-attacher-rbac.yaml @@ -1,5 +1,5 @@ # This YAML file contains RBAC API objects, -# which are necessary to run external csi attacher for opensds. +# which are necessary to run external csi attacher for soda. apiVersion: v1 kind: ServiceAccount diff --git a/charts/csiplugin-file/templates/csi-configmap-opensdsplugin.yaml b/charts/csiplugin-file/templates/csi-configmap-opensdsplugin.yaml index fcbaeec74..024347d8d 100644 --- a/charts/csiplugin-file/templates/csi-configmap-opensdsplugin.yaml +++ b/charts/csiplugin-file/templates/csi-configmap-opensdsplugin.yaml @@ -1,13 +1,13 @@ # This YAML file contains configmap objects, -# which are necessary to run csi opensds plugin. +# which are necessary to run csi soda plugin. kind: ConfigMap apiVersion: v1 metadata: - name: csi-configmap-opensdsplugin-file + name: csi-configmap-sodaplugin-file data: - opensdsendpoint: {{ .Values.data.opensdsEndpoint }} - opensdsauthstrategy: {{ .Values.data.opensdsAuthStrategy }} + sodaendpoint: {{ .Values.data.sodaEndpoint }} + sodaauthstrategy: {{ .Values.data.sodaAuthStrategy }} osauthurl: {{ .Values.data.osAuthURL }} osusername: {{ .Values.data.osUsername }} ospassword: {{ .Values.data.osPassword }} diff --git a/charts/csiplugin-file/templates/csi-nodeplugin-opensdsplugin.yaml b/charts/csiplugin-file/templates/csi-nodeplugin-opensdsplugin.yaml index 7cdaeeb5a..1c2662f32 100644 --- a/charts/csiplugin-file/templates/csi-nodeplugin-opensdsplugin.yaml +++ b/charts/csiplugin-file/templates/csi-nodeplugin-opensdsplugin.yaml @@ -1,5 +1,5 @@ # This YAML file contains driver-registrar & csi driver nodeplugin API objects, -# which are necessary to run csi nodeplugin for opensds. +# which are necessary to run csi nodeplugin for soda. kind: DaemonSet apiVersion: apps/v1 @@ -38,7 +38,7 @@ spec: - "--kubelet-registration-path=$(ADDRESS)" env: - name: ADDRESS - value: /var/lib/kubelet/plugins/csi-opensdsplugin-file/csi.sock + value: /var/lib/kubelet/plugins/csi-sodaplugin-file/csi.sock - name: KUBE_NODE_NAME valueFrom: fieldRef: @@ -58,76 +58,76 @@ spec: image: {{ .Values.image }} args : - "--csiEndpoint=$(CSI_ENDPOINT)" - - "--opensdsEndpoint=$(OPENSDS_ENDPOINT)" - - "--opensdsAuthStrategy=$(OPENSDS_AUTH_STRATEGY)" + - "--sodaEndpoint=$(soda_ENDPOINT)" + - "--sodaAuthStrategy=$(soda_AUTH_STRATEGY)" - "--v=8" env: - name: CSI_ENDPOINT - value: unix://var/lib/kubelet/plugins/csi-opensdsplugin-file/csi.sock - - name: OPENSDS_ENDPOINT + value: unix://var/lib/kubelet/plugins/csi-sodaplugin-file/csi.sock + - name: soda_ENDPOINT valueFrom: configMapKeyRef: - name: csi-configmap-opensdsplugin-file - key: opensdsendpoint - - name: OPENSDS_AUTH_STRATEGY + name: csi-configmap-sodaplugin-file + key: sodaendpoint + - name: soda_AUTH_STRATEGY valueFrom: configMapKeyRef: - name: csi-configmap-opensdsplugin-file - key: opensdsauthstrategy + name: csi-configmap-sodaplugin-file + key: sodaauthstrategy - name: OS_AUTH_URL valueFrom: configMapKeyRef: - name: csi-configmap-opensdsplugin-file + name: csi-configmap-sodaplugin-file key: osauthurl - name: OS_USERNAME valueFrom: configMapKeyRef: - name: csi-configmap-opensdsplugin-file + name: csi-configmap-sodaplugin-file key: osusername - name: OS_PASSWORD valueFrom: configMapKeyRef: - name: csi-configmap-opensdsplugin-file + name: csi-configmap-sodaplugin-file key: ospassword - name: PASSWORD_ENCRYPTER valueFrom: configMapKeyRef: - name: csi-configmap-opensdsplugin-file + name: csi-configmap-sodaplugin-file key: passwordencrypter - name: ENABLE_ENCRYPTED valueFrom: configMapKeyRef: - name: csi-configmap-opensdsplugin-file + name: csi-configmap-sodaplugin-file key: enableEncrypted - name: OS_TENANT_NAME valueFrom: configMapKeyRef: - name: csi-configmap-opensdsplugin-file + name: csi-configmap-sodaplugin-file key: ostenantname - name: PASSWORD_ENCRYPTER valueFrom: configMapKeyRef: - name: csi-configmap-opensdsplugin-file + name: csi-configmap-sodaplugin-file key: passwordencrypter - name: ENABLE_ENCRYPTED valueFrom: configMapKeyRef: - name: csi-configmap-opensdsplugin-file + name: csi-configmap-sodaplugin-file key: enableEncrypted - name: OS_PROJECT_NAME valueFrom: configMapKeyRef: - name: csi-configmap-opensdsplugin-file + name: csi-configmap-sodaplugin-file key: osprojectname - name: OS_USER_DOMAIN_ID valueFrom: configMapKeyRef: - name: csi-configmap-opensdsplugin-file + name: csi-configmap-sodaplugin-file key: osuserdomainid imagePullPolicy: {{ .Values.imagePullPolicy }} volumeMounts: - name: socket-dir - mountPath: /var/lib/kubelet/plugins/csi-opensdsplugin-file + mountPath: /var/lib/kubelet/plugins/csi-sodaplugin-file - name: pods-mount-dir mountPath: /var/lib/kubelet/pods mountPropagation: "Bidirectional" @@ -142,13 +142,13 @@ spec: - name: ceph-dir mountPath: /etc/ceph/ - name: certificate-path - mountPath: /opt/opensds-security + mountPath: /opt/soda-security - name: hosts mountPath: /etc volumes: - name: socket-dir hostPath: - path: /var/lib/kubelet/plugins/csi-opensdsplugin-file + path: /var/lib/kubelet/plugins/csi-sodaplugin-file type: DirectoryOrCreate - name: volume-devices-dir hostPath: @@ -176,7 +176,7 @@ spec: type: DirectoryOrCreate - name: certificate-path hostPath: - path: /opt/opensds-security + path: /opt/soda-security type: DirectoryOrCreate - name: hosts hostPath: diff --git a/charts/csiplugin-file/templates/csi-provisioner-opensdsplugin.yaml b/charts/csiplugin-file/templates/csi-provisioner-opensdsplugin.yaml index f3a0cc2d7..56c1a1cab 100644 --- a/charts/csiplugin-file/templates/csi-provisioner-opensdsplugin.yaml +++ b/charts/csiplugin-file/templates/csi-provisioner-opensdsplugin.yaml @@ -1,5 +1,5 @@ # This YAML file contains attacher & csi driver API objects, -# which are necessary to run external csi provisioner for opensds. +# which are necessary to run external csi provisioner for soda. kind: Service apiVersion: v1 @@ -50,7 +50,7 @@ spec: - name: csi-provisioner image: quay.io/k8scsi/csi-provisioner:v1.1.0 args: - - "--provisioner=csi-opensdsplugin" + - "--provisioner=csi-sodaplugin" - "--csi-address=$(ADDRESS)" - "--connection-timeout=15s" - "--feature-gates=Topology=True" @@ -65,77 +65,77 @@ spec: image: {{ .Values.image }} args : - "--csiEndpoint=$(CSI_ENDPOINT)" - - "--opensdsEndpoint=$(OPENSDS_ENDPOINT)" - - "--opensdsAuthStrategy=$(OPENSDS_AUTH_STRATEGY)" + - "--sodaEndpoint=$(soda_ENDPOINT)" + - "--sodaAuthStrategy=$(soda_AUTH_STRATEGY)" - "--v=8" env: - name: CSI_ENDPOINT value: unix://csi/csi.sock - - name: OPENSDS_ENDPOINT + - name: soda_ENDPOINT valueFrom: configMapKeyRef: - name: csi-configmap-opensdsplugin-file - key: opensdsendpoint - - name: OPENSDS_AUTH_STRATEGY + name: csi-configmap-sodaplugin-file + key: sodaendpoint + - name: soda_AUTH_STRATEGY valueFrom: configMapKeyRef: - name: csi-configmap-opensdsplugin-file - key: opensdsauthstrategy + name: csi-configmap-sodaplugin-file + key: sodaauthstrategy - name: OS_AUTH_URL valueFrom: configMapKeyRef: - name: csi-configmap-opensdsplugin-file + name: csi-configmap-sodaplugin-file key: osauthurl - name: OS_USERNAME valueFrom: configMapKeyRef: - name: csi-configmap-opensdsplugin-file + name: csi-configmap-sodaplugin-file key: osusername - name: PASSWORD_ENCRYPTER valueFrom: configMapKeyRef: - name: csi-configmap-opensdsplugin-file + name: csi-configmap-sodaplugin-file key: passwordencrypter - name: OS_PASSWORD valueFrom: configMapKeyRef: - name: csi-configmap-opensdsplugin-file + name: csi-configmap-sodaplugin-file key: ospassword - name: PASSWORD_ENCRYPTER valueFrom: configMapKeyRef: - name: csi-configmap-opensdsplugin-file + name: csi-configmap-sodaplugin-file key: passwordencrypter - name: ENABLE_ENCRYPTED valueFrom: configMapKeyRef: - name: csi-configmap-opensdsplugin-file + name: csi-configmap-sodaplugin-file key: enableEncrypted - name: OS_TENANT_NAME valueFrom: configMapKeyRef: - name: csi-configmap-opensdsplugin-file + name: csi-configmap-sodaplugin-file key: ostenantname - name: OS_PROJECT_NAME valueFrom: configMapKeyRef: - name: csi-configmap-opensdsplugin-file + name: csi-configmap-sodaplugin-file key: osprojectname - name: OS_USER_DOMAIN_ID valueFrom: configMapKeyRef: - name: csi-configmap-opensdsplugin-file + name: csi-configmap-sodaplugin-file key: osuserdomainid imagePullPolicy: {{ .Values.imagePullPolicy }} volumeMounts: - name: socket-dir mountPath: /csi - name: certificate-path - mountPath: /opt/opensds-security + mountPath: /opt/soda-security volumes: - name: socket-dir emptyDir: - name: certificate-path hostPath: - path: /opt/opensds-security + path: /opt/soda-security type: DirectoryOrCreate diff --git a/charts/csiplugin-file/templates/csi-provisioner-rbac.yaml b/charts/csiplugin-file/templates/csi-provisioner-rbac.yaml index 730285ca2..9ca4c4c84 100644 --- a/charts/csiplugin-file/templates/csi-provisioner-rbac.yaml +++ b/charts/csiplugin-file/templates/csi-provisioner-rbac.yaml @@ -1,5 +1,5 @@ # This YAML file contains RBAC API objects, -# which are necessary to run external csi provisioner for opensds. +# which are necessary to run external csi provisioner for soda. apiVersion: v1 kind: ServiceAccount diff --git a/charts/csiplugin-file/templates/csi-snapshotter-opensdsplugin.yaml b/charts/csiplugin-file/templates/csi-snapshotter-opensdsplugin.yaml index 5f6e3682c..6dd39299a 100644 --- a/charts/csiplugin-file/templates/csi-snapshotter-opensdsplugin.yaml +++ b/charts/csiplugin-file/templates/csi-snapshotter-opensdsplugin.yaml @@ -1,5 +1,5 @@ # This YAML file contains snapshotter & csi driver API objects, -# which are necessary to run external csi snapshotter for opensds. +# which are necessary to run external csi snapshotter for soda. kind: Service apiVersion: v1 @@ -50,7 +50,7 @@ spec: - name: csi-snapshotter image: quay.io/k8scsi/csi-snapshotter:v1.1.0 args: - - "--snapshotter=csi-opensdsplugin" + - "--snapshotter=csi-sodaplugin" - "--csi-address=$(ADDRESS)" - "--connection-timeout=15s" env: @@ -64,82 +64,82 @@ spec: image: {{ .Values.image }} args : - "--csiEndpoint=$(CSI_ENDPOINT)" - - "--opensdsEndpoint=$(OPENSDS_ENDPOINT)" - - "--opensdsAuthStrategy=$(OPENSDS_AUTH_STRATEGY)" + - "--sodaEndpoint=$(soda_ENDPOINT)" + - "--sodaAuthStrategy=$(soda_AUTH_STRATEGY)" - "--v=8" env: - name: CSI_ENDPOINT value: unix://csi/csi.sock - - name: OPENSDS_ENDPOINT + - name: soda_ENDPOINT valueFrom: configMapKeyRef: - name: csi-configmap-opensdsplugin-file - key: opensdsendpoint + name: csi-configmap-sodaplugin-file + key: sodaendpoint - name: ENABLE_ENCRYPTED valueFrom: configMapKeyRef: - name: csi-configmap-opensdsplugin-file + name: csi-configmap-sodaplugin-file key: enableEncrypted - name: PASSWORD_ENCRYPTER valueFrom: configMapKeyRef: - name: csi-configmap-opensdsplugin-file + name: csi-configmap-sodaplugin-file key: passwordencrypter - - name: OPENSDS_AUTH_STRATEGY + - name: soda_AUTH_STRATEGY valueFrom: configMapKeyRef: - name: csi-configmap-opensdsplugin-file - key: opensdsauthstrategy + name: csi-configmap-sodaplugin-file + key: sodaauthstrategy - name: OS_AUTH_URL valueFrom: configMapKeyRef: - name: csi-configmap-opensdsplugin-file + name: csi-configmap-sodaplugin-file key: osauthurl - name: OS_USERNAME valueFrom: configMapKeyRef: - name: csi-configmap-opensdsplugin-file + name: csi-configmap-sodaplugin-file key: osusername - name: OS_PASSWORD valueFrom: configMapKeyRef: - name: csi-configmap-opensdsplugin-file + name: csi-configmap-sodaplugin-file key: ospassword - name: PASSWORD_ENCRYPTER valueFrom: configMapKeyRef: - name: csi-configmap-opensdsplugin-file + name: csi-configmap-sodaplugin-file key: passwordencrypter - name: ENABLE_ENCRYPTED valueFrom: configMapKeyRef: - name: csi-configmap-opensdsplugin-file + name: csi-configmap-sodaplugin-file key: enableEncrypted - name: OS_TENANT_NAME valueFrom: configMapKeyRef: - name: csi-configmap-opensdsplugin-file + name: csi-configmap-sodaplugin-file key: ostenantname - name: OS_PROJECT_NAME valueFrom: configMapKeyRef: - name: csi-configmap-opensdsplugin-file + name: csi-configmap-sodaplugin-file key: osprojectname - name: OS_USER_DOMAIN_ID valueFrom: configMapKeyRef: - name: csi-configmap-opensdsplugin-file + name: csi-configmap-sodaplugin-file key: osuserdomainid imagePullPolicy: {{ .Values.imagePullPolicy }} volumeMounts: - name: socket-dir mountPath: /csi - name: certificate-path - mountPath: /opt/opensds-security + mountPath: /opt/soda-security volumes: - name: socket-dir emptyDir: - name: certificate-path hostPath: - path: /opt/opensds-security + path: /opt/soda-security type: DirectoryOrCreate diff --git a/charts/csiplugin-file/templates/csi-snapshotter-rbac.yaml b/charts/csiplugin-file/templates/csi-snapshotter-rbac.yaml index 20b24b4c9..29202bc9f 100644 --- a/charts/csiplugin-file/templates/csi-snapshotter-rbac.yaml +++ b/charts/csiplugin-file/templates/csi-snapshotter-rbac.yaml @@ -1,5 +1,5 @@ # This YAML file contains RBAC API objects, -# which are necessary to run external csi snapshotter for opensds. +# which are necessary to run external csi snapshotter for soda. apiVersion: v1 kind: ServiceAccount diff --git a/charts/csiplugin-file/values.yaml b/charts/csiplugin-file/values.yaml index 46ca76c66..8698ba44d 100644 --- a/charts/csiplugin-file/values.yaml +++ b/charts/csiplugin-file/values.yaml @@ -1,4 +1,4 @@ -# Default values for opensds csi plugin. +# Default values for soda csi plugin. # This is a YAML-formatted file. # Declare variables to be passed into your templates. @@ -10,11 +10,11 @@ imagePullPolicy: IfNotPresent imageRestartPolicy: Never # Please modify data fields in real environment data: - opensdsEndpoint: http://127.0.0.1:50040 - opensdsAuthStrategy: keystone + sodaEndpoint: http://127.0.0.1:50040 + sodaAuthStrategy: keystone osAuthURL: http://127.0.0.1/identity osUsername: admin - osPassword: opensds@123 + osPassword: soda@123 osTenantName: admin osProjectName: admin osUserDomainId: default @@ -23,17 +23,17 @@ data: # csipluginProvisioner spec csipluginProvisioner: - name: csi-provisioner-opensdsplugin-file + name: csi-provisioner-sodaplugin-file replicaCount: 1 # csipluginAttacher spec csipluginAttacher: - name: csi-attacher-opensdsplugin-file + name: csi-attacher-sodaplugin-file replicaCount: 1 # csipluginNodeplugin spec csipluginNodeplugin: - name: csi-nodeplugin-opensdsplugin-file + name: csi-nodeplugin-sodaplugin-file replicaCount: 1 # csipluginSnapshotter spec csipluginSnapshotter: - name: csi-snapshotter-opensdsplugin-file + name: csi-snapshotter-sodaplugin-file replicaCount: 1 diff --git a/charts/opensds/Chart.yaml b/charts/opensds/Chart.yaml index 4d0a23481..b054f62c8 100644 --- a/charts/opensds/Chart.yaml +++ b/charts/opensds/Chart.yaml @@ -1,3 +1,3 @@ -name: opensds -description: OpenSDS deployment Helm Chart. +name: soda +description: soda deployment Helm Chart. version: 0.6.1 diff --git a/charts/opensds/templates/deployment.yaml b/charts/opensds/templates/deployment.yaml index b91d1aabe..cb473629f 100644 --- a/charts/opensds/templates/deployment.yaml +++ b/charts/opensds/templates/deployment.yaml @@ -1,4 +1,4 @@ -# Copyright (c) 2019 The OpenSDS Authors. +# Copyright (c) 2019 The soda Authors. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -46,12 +46,12 @@ spec: ports: - containerPort: 50040 volumeMounts: - - name: opensds-conf-dir - mountPath: /etc/opensds + - name: soda-conf-dir + mountPath: /etc/soda volumes: - - name: opensds-conf-dir + - name: soda-conf-dir hostPath: - path: /etc/opensds + path: /etc/soda type: Directory --- ########################################################################## @@ -88,12 +88,12 @@ spec: ports: - containerPort: 50049 volumeMounts: - - name: opensds-conf-dir - mountPath: /etc/opensds + - name: soda-conf-dir + mountPath: /etc/soda volumes: - - name: opensds-conf-dir + - name: soda-conf-dir hostPath: - path: /etc/opensds + path: /etc/soda type: Directory --- ########################################################################## @@ -135,8 +135,8 @@ spec: ports: - containerPort: 50050 volumeMounts: - - name: opensds-conf-dir - mountPath: /etc/opensds + - name: soda-conf-dir + mountPath: /etc/soda - name: ceph-conf-dir mountPath: /etc/ceph - name: tgt-conf-dir @@ -155,9 +155,9 @@ spec: mountPath: /lib/modules readOnly: true volumes: - - name: opensds-conf-dir + - name: soda-conf-dir hostPath: - path: /etc/opensds + path: /etc/soda type: Directory - name: ceph-conf-dir hostPath: @@ -264,13 +264,13 @@ spec: image: {{ .Values.osdsdashboard.image }} imagePullPolicy: {{ .Values.osdsdashboard.imagePullPolicy }} env: - - name: OPENSDS_AUTH_URL + - name: soda_AUTH_URL value: http://{{ .Values.osdsauthchecker.name }}.{{ .Release.Namespace }}.svc.cluster.local/identity - - name: OPENSDS_HOTPOT_URL + - name: soda_HOTPOT_URL value: http://{{ .Values.osdsapiserver.name }}.{{ .Release.Namespace }}.svc.cluster.local:50040 - - name: OPENSDS_GELATO_URL + - name: soda_GELATO_URL value: http://127.0.0.1:8089 - - name: OPENSDS_ORCHESTRATION_URL + - name: soda_ORCHESTRATION_URL value: http://127.0.0.1:5000 ports: - containerPort: 8088 diff --git a/charts/opensds/templates/service.yaml b/charts/opensds/templates/service.yaml index b043e4086..54452b6a2 100644 --- a/charts/opensds/templates/service.yaml +++ b/charts/opensds/templates/service.yaml @@ -1,4 +1,4 @@ -# Copyright (c) 2019 The OpenSDS Authors. +# Copyright (c) 2019 The soda Authors. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/charts/opensds/values.yaml b/charts/opensds/values.yaml index 5b9f14a2c..92f110e09 100644 --- a/charts/opensds/values.yaml +++ b/charts/opensds/values.yaml @@ -1,4 +1,4 @@ -# Default values for opensds. +# Default values for soda. # This is a YAML-formatted file. # Declare variables to be passed into your templates. @@ -156,7 +156,7 @@ osdsdb: osdsauthchecker: name: authchecker replicaCount: 1 - image: opensdsio/opensds-authchecker:latest + image: sodaio/soda-authchecker:latest # ImagePullPolicy: valid values are "IfNotPresent", "Never", and "Always" imagePullPolicy: IfNotPresent # Attributes of the authchecker's service resource diff --git a/charts/servicebroker/Chart.yaml b/charts/servicebroker/Chart.yaml index cc1e380eb..5e3e6751e 100644 --- a/charts/servicebroker/Chart.yaml +++ b/charts/servicebroker/Chart.yaml @@ -1,3 +1,3 @@ name: service-broker -description: opensds-provided service-broker deployment Helm chart. +description: soda-provided service-broker deployment Helm chart. version: 0.6.1 diff --git a/charts/servicebroker/templates/broker-deployment.yaml b/charts/servicebroker/templates/broker-deployment.yaml index 85d68c065..8b95d88c5 100644 --- a/charts/servicebroker/templates/broker-deployment.yaml +++ b/charts/servicebroker/templates/broker-deployment.yaml @@ -34,10 +34,10 @@ spec: - --port - "8080" env: - - name: OPENSDS_ENDPOINT - value: {{ .Values.opensdsEndpoint }} - - name: OPENSDS_AUTH_STRATEGY - value: {{ .Values.opensdsAuthStrategy }} + - name: soda_ENDPOINT + value: {{ .Values.sodaEndpoint }} + - name: soda_AUTH_STRATEGY + value: {{ .Values.sodaAuthStrategy }} - name: OS_AUTH_URL value: {{ .Values.osAuthURL }} - name: OS_USERNAME diff --git a/charts/servicebroker/values.yaml b/charts/servicebroker/values.yaml index 100c496f7..58afbdec4 100644 --- a/charts/servicebroker/values.yaml +++ b/charts/servicebroker/values.yaml @@ -1,4 +1,4 @@ -# Default values for OpenSDS Service Broker +# Default values for soda Service Broker # Image to use name: servicebroker image: @@ -13,11 +13,11 @@ imagePullPolicy: IfNotPresent deployClusterServiceBroker: true # Please modify these fields according to your real environment -opensdsEndpoint: http://127.0.0.1:50040 -opensdsAuthStrategy: noauth +sodaEndpoint: http://127.0.0.1:50040 +sodaAuthStrategy: noauth osAuthURL: http://127.0.0.1/identity osUsername: admin -osPassword: opensds@123 +osPassword: soda@123 osTenantName: admin osProjectName: admin osUserDomainID: default diff --git a/ci/ci_check.sh b/ci/ci_check.sh index 624ae453b..a84249fd5 100644 --- a/ci/ci_check.sh +++ b/ci/ci_check.sh @@ -1,6 +1,6 @@ #!/bin/bash -# Copyright 2019 The OpenSDS Authors. +# Copyright 2019 The soda Authors. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/devsds/examples/driver/chubaofs.yaml b/devsds/examples/driver/chubaofs.yaml index d51c2eb1d..86fdd45b8 100644 --- a/devsds/examples/driver/chubaofs.yaml +++ b/devsds/examples/driver/chubaofs.yaml @@ -11,7 +11,7 @@ runtimeEnv: clientPath: /var/chubaofs pool: - opensds-files-chubaofs: + soda-files-chubaofs: diskType: NL-SAS availabilityZone: default multiAttach: true diff --git a/devsds/examples/driver/huawei_oceanstor_block.yaml b/devsds/examples/driver/huawei_oceanstor_block.yaml index 0acdec051..b3f494220 100644 --- a/devsds/examples/driver/huawei_oceanstor_block.yaml +++ b/devsds/examples/driver/huawei_oceanstor_block.yaml @@ -9,7 +9,7 @@ authOptions: endpoints: "https://0.0.0.0:8088/deviceManager/rest" pool: - opensds_block: + soda_block: storageType: block availabilityZone: default extras: diff --git a/devsds/examples/driver/manila.yaml b/devsds/examples/driver/manila.yaml index e0a4e08e5..fb396babe 100644 --- a/devsds/examples/driver/manila.yaml +++ b/devsds/examples/driver/manila.yaml @@ -16,7 +16,7 @@ authOptions: endpoint: "http://10.10.3.101/identity" domainName: "Default" username: "admin" - password: "opensds" + password: "soda" # Whether to encrypt the password. If enabled, the value of the password must be ciphertext. enableEncrypted: false # Encryption and decryption tool. Default value is aes. The decryption tool can only decrypt the corresponding ciphertext. diff --git a/devsds/examples/driver/netapp_ontap_san.yaml b/devsds/examples/driver/netapp_ontap_san.yaml index 6c7d0751c..ab029f50c 100644 --- a/devsds/examples/driver/netapp_ontap_san.yaml +++ b/devsds/examples/driver/netapp_ontap_san.yaml @@ -6,7 +6,7 @@ backendOptions: managementLIF: "127.0.0.1" dataLIF: "127.0.0.1" svm: "vserver" - igroupName: "opensds" + igroupName: "soda" pool: ontap-pool: storageType: block diff --git a/devsds/examples/driver/nfs.yaml b/devsds/examples/driver/nfs.yaml index 1526764f7..e2dd73b69 100644 --- a/devsds/examples/driver/nfs.yaml +++ b/devsds/examples/driver/nfs.yaml @@ -15,7 +15,7 @@ tgtBindIp: 100.64.40.97 tgtConfDir: /etc/tgt/conf.d pool: - opensds-files-default: + soda-files-default: diskType: NL-SAS availabilityZone: default multiAttach: true diff --git a/devsds/examples/opensds.conf b/devsds/examples/opensds.conf index 0a6842eec..7b0bd5240 100755 --- a/devsds/examples/opensds.conf +++ b/devsds/examples/opensds.conf @@ -16,8 +16,8 @@ api_endpoint = localhost:50040 auth_strategy = keystone # If https is enabled, the default value of cert file -# is /opt/opensds-security/sodafoundation/api-cert.pem, -# and key file is /opt/opensds-security/sodafoundation/api-key.pem +# is /opt/soda-security/sodafoundation/api-cert.pem, +# and key file is /opt/soda-security/sodafoundation/api-key.pem https_enabled = False beego_https_cert_file = beego_https_key_file = @@ -43,45 +43,45 @@ driver_name = sample name = ceph description = Ceph Test driver_name = ceph -config_path = /etc/opensds/driver/ceph.yaml +config_path = /etc/soda/driver/ceph.yaml [cinder] name = cinder description = Cinder Test driver_name = cinder -config_path = /etc/opensds/driver/cinder.yaml +config_path = /etc/soda/driver/cinder.yaml [lvm] name = lvm description = LVM Test driver_name = lvm -config_path = /etc/opensds/driver/lvm.yaml +config_path = /etc/soda/driver/lvm.yaml host_based_replication_driver = drbd [spectrumscale] name = spectrumscale description = IBM TEST driver_name = spectrumscale -config_path = /etc/opensds/driver/spectrumscale.yaml +config_path = /etc/soda/driver/spectrumscale.yaml [huawei_oceanstor_block] name = oceanstor description = oceanstor Test driver_name = huawei_oceanstor_block -config_path = /etc/opensds/driver/huawei_oceanstor_block.yaml +config_path = /etc/soda/driver/huawei_oceanstor_block.yaml replication_type = array_based [huawei_fusionstorage] name = fusionstorage backend description = This is a fusionstorage backend service driver_name = huawei_fusionstorage -config_path = /etc/opensds/driver/fusionstorage.yaml +config_path = /etc/soda/driver/fusionstorage.yaml [netapp_ontap_san] name = netapp ontap san backend description = netapp ontap Test driver_name = netapp_ontap_san -config_path = /etc/opensds/driver/netapp_ontap_san.yaml +config_path = /etc/soda/driver/netapp_ontap_san.yaml [database] endpoint = localhost:2379,localhost:2380 diff --git a/devsds/install.sh b/devsds/install.sh index c4541d76e..15e5b95f0 100755 --- a/devsds/install.sh +++ b/devsds/install.sh @@ -77,7 +77,7 @@ echo "TOP DIR ${TOP_DIR}" SODA_DIR=$(cd $TOP_DIR/ && pwd) # SODA configuration directory -SODA_CONFIG_DIR=${SODA_CONFIG_DIR:-/etc/opensds} +SODA_CONFIG_DIR=${SODA_CONFIG_DIR:-/etc/soda} SODA_DRIVER_CONFIG_DIR=${SODA_CONFIG_DIR}/driver # Export openssl config file as environment variable @@ -150,7 +150,7 @@ source $TOP_DIR/sdsrc soda::backendlist_check $SODA_BACKEND_LIST # clean up soda.conf -:> $SODA_CONFIG_DIR/opensds.conf +:> $SODA_CONFIG_DIR/soda.conf # Install service which is enabled. soda::util::service_operation install @@ -172,14 +172,14 @@ fi echo echo "Execute commands below to set up ENVs which are needed by SODA CLI:" echo "------------------------------------------------------------------" -echo "export OPENSDS_AUTH_STRATEGY=$SODA_AUTH_STRATEGY" -echo "export OPENSDS_ENDPOINT=http://localhost:50040" +echo "export soda_AUTH_STRATEGY=$SODA_AUTH_STRATEGY" +echo "export soda_ENDPOINT=http://localhost:50040" if soda::util::is_service_enabled keystone; then if [ "true" == $USE_CONTAINER_KEYSTONE ] then echo "export OS_AUTH_URL=http://$KEYSTONE_IP/identity" echo "export OS_USERNAME=admin" - echo "export OS_PASSWORD=opensds@123" + echo "export OS_PASSWORD=soda@123" echo "export OS_TENANT_NAME=admin" echo "export OS_PROJECT_NAME=admin" echo "export OS_USER_DOMAIN_ID=default" diff --git a/devsds/lib/certificate.sh b/devsds/lib/certificate.sh index 878056b9d..0a6a0792d 100755 --- a/devsds/lib/certificate.sh +++ b/devsds/lib/certificate.sh @@ -18,7 +18,7 @@ _XTRACE_CEPH=$(set +o | grep xtrace) set +o xtrace -COMPONENT=("opensds" "nbp") +COMPONENT=("soda" "nbp") SODA_CERT_DIR="/opt/soda-security" ROOT_CERT_DIR=${ROOT_CERT_DIR:-"${SODA_CERT_DIR}"/ca} diff --git a/devsds/lib/keystone.sh b/devsds/lib/keystone.sh index 22589ccc8..b4ae42360 100755 --- a/devsds/lib/keystone.sh +++ b/devsds/lib/keystone.sh @@ -66,11 +66,11 @@ DEV_STACK_LOCAL_CONF_DOCK chown stack:stack $DEV_STACK_LOCAL_CONF } -soda::keystone::opensds_conf() { -cat >> $SODA_CONFIG_DIR/opensds.conf << SODA_GLOBAL_CONFIG_DOC +soda::keystone::soda_conf() { +cat >> $SODA_CONFIG_DIR/soda.conf << SODA_GLOBAL_CONFIG_DOC [keystone_authtoken] memcached_servers = $KEYSTONE_IP:11211 -signing_dir = /var/cache/opensds +signing_dir = /var/cache/soda cafile = /opt/stack/data/ca-bundle.pem auth_uri = http://$KEYSTONE_IP/identity project_domain_name = Default @@ -93,22 +93,22 @@ cp $SODA_DIR/examples/policy.json $SODA_CONFIG_DIR soda::keystone::create_user_and_endpoint(){ . $DEV_STACK_DIR/openrc admin admin openstack user create --domain default --password $STACK_PASSWORD $SODA_SERVER_NAME - openstack role add --project service --user opensds admin + openstack role add --project service --user soda admin openstack group create service - openstack group add user service opensds + openstack group add user service soda openstack role add service --project service --group service openstack group add user admins admin - openstack service create --name opensds$SODA_VERSION --description "OpenSDS Block Storage" opensds$SODA_VERSION - openstack endpoint create --region RegionOne opensds$SODA_VERSION public http://$HOST_IP:50040/$SODA_VERSION/%\(tenant_id\)s - openstack endpoint create --region RegionOne opensds$SODA_VERSION internal http://$HOST_IP:50040/$SODA_VERSION/%\(tenant_id\)s - openstack endpoint create --region RegionOne opensds$SODA_VERSION admin http://$HOST_IP:50040/$SODA_VERSION/%\(tenant_id\)s + openstack service create --name soda$SODA_VERSION --description "soda Block Storage" soda$SODA_VERSION + openstack endpoint create --region RegionOne soda$SODA_VERSION public http://$HOST_IP:50040/$SODA_VERSION/%\(tenant_id\)s + openstack endpoint create --region RegionOne soda$SODA_VERSION internal http://$HOST_IP:50040/$SODA_VERSION/%\(tenant_id\)s + openstack endpoint create --region RegionOne soda$SODA_VERSION admin http://$HOST_IP:50040/$SODA_VERSION/%\(tenant_id\)s } soda::keystone::delete_user(){ . $DEV_STACK_DIR/openrc admin admin - openstack service delete opensds$SODA_VERSION + openstack service delete soda$SODA_VERSION openstack role remove service --project service --group service - openstack group remove user service opensds + openstack group remove user service soda openstack group delete service openstack user delete $SODA_SERVER_NAME --domain default } @@ -134,17 +134,17 @@ soda::keystone::install(){ if [ "true" == $USE_CONTAINER_KEYSTONE ] then KEYSTONE_IP=$HOST_IP - docker pull opensdsio/opensds-authchecker:latest - docker run -d --privileged=true --net=host --name=opensds-authchecker opensdsio/opensds-authchecker:latest - soda::keystone::opensds_conf - docker cp $TOP_DIR/lib/keystone.policy.json opensds-authchecker:/etc/keystone/policy.json + docker pull sodaio/soda-authchecker:latest + docker run -d --privileged=true --net=host --name=soda-authchecker sodaio/soda-authchecker:latest + soda::keystone::soda_conf + docker cp $TOP_DIR/lib/keystone.policy.json soda-authchecker:/etc/keystone/policy.json else if [ "true" != $USE_EXISTING_KEYSTONE ] then KEYSTONE_IP=$HOST_IP soda::keystone::create_user soda::keystone::download_code - soda::keystone::opensds_conf + soda::keystone::soda_conf # If keystone is ready to start, there is no need continue next step. if soda::util::wait_for_url http://$HOST_IP/identity "keystone" 0.25 4; then @@ -155,10 +155,10 @@ soda::keystone::install(){ su $STACK_USER_NAME -c ${DEV_STACK_DIR}/stack.sh soda::keystone::create_user_and_endpoint soda::keystone::delete_redundancy_data - # add opensds customize policy.json for keystone + # add soda customize policy.json for keystone cp $TOP_DIR/lib/keystone.policy.json /etc/keystone/policy.json else - soda::keystone::opensds_conf + soda::keystone::soda_conf cd ${DEV_STACK_DIR} soda::keystone::create_user_and_endpoint fi @@ -172,8 +172,8 @@ soda::keystone::cleanup() { soda::keystone::uninstall(){ if [ "true" == $USE_CONTAINER_KEYSTONE ] then - docker stop opensds-authchecker - docker rm opensds-authchecker + docker stop soda-authchecker + docker rm soda-authchecker else if [ "true" != $USE_EXISTING_KEYSTONE ] then diff --git a/devsds/lib/lvm.sh b/devsds/lib/lvm.sh index 850deacb5..804e021e1 100755 --- a/devsds/lib/lvm.sh +++ b/devsds/lib/lvm.sh @@ -21,9 +21,9 @@ set +o xtrace # Defaults # -------- # Name of the lvm volume groups to use/create for iscsi volumes -VOLUME_GROUP_NAME=${VOLUME_GROUP_NAME:-opensds-volumes} -FILE_GROUP_NAME=${FILE_GROUP_NAME:-opensds-files} -FILE_VOLUME_GROUP_NAME=${VOLUME_GROUP_NAME:-opensds-files} +VOLUME_GROUP_NAME=${VOLUME_GROUP_NAME:-soda-volumes} +FILE_GROUP_NAME=${FILE_GROUP_NAME:-soda-files} +FILE_VOLUME_GROUP_NAME=${VOLUME_GROUP_NAME:-soda-files} DEFAULT_VOLUME_GROUP_NAME=$VOLUME_GROUP_NAME-default FILE_DEFAULT_VOLUME_GROUP_NAME=$FILE_GROUP_NAME-default @@ -43,7 +43,7 @@ mkdir -p $FILE_LVM_DIR # nvme dir -NVME_DIR=/opt/opensdsNvme +NVME_DIR=/opt/sodaNvme # nvme device LVM_DEVICE=/dev/nvme0n1 @@ -104,7 +104,7 @@ soda::lvm::create_volume_group(){ } soda::lvm::create_volume_group_for_file(){ - local fvg="opensds-files-default" + local fvg="soda-files-default" local size=$2 local backing_file=$FILE_DATA_DIR/$fvg$BACKING_FILE_SUFFIX @@ -153,7 +153,7 @@ soda::lvm::create_nvme_vg(){ } soda::lvm::set_configuration(){ -cat > $SODA_DRIVER_CONFIG_DIR/lvm.yaml << OPENSDS_LVM_CONFIG_DOC +cat > $SODA_DRIVER_CONFIG_DIR/lvm.yaml << soda_LVM_CONFIG_DOC tgtBindIp: $HOST_IP tgtConfDir: /etc/tgt/conf.d pool: @@ -177,20 +177,20 @@ pool: advanced: diskType: SSD latency: 5ms -OPENSDS_LVM_CONFIG_DOC +soda_LVM_CONFIG_DOC -cat >> $SODA_CONFIG_DIR/opensds.conf << OPENSDS_LVM_GLOBAL_CONFIG_DOC +cat >> $SODA_CONFIG_DIR/soda.conf << soda_LVM_GLOBAL_CONFIG_DOC [lvm] name = lvm description = LVM Test driver_name = lvm -config_path = /etc/opensds/driver/lvm.yaml +config_path = /etc/soda/driver/lvm.yaml -OPENSDS_LVM_GLOBAL_CONFIG_DOC +soda_LVM_GLOBAL_CONFIG_DOC } soda::lvm::set_configuration_for_file(){ -cat > $SODA_DRIVER_CONFIG_DIR/nfs.yaml << OPENSDS_FILE_CONFIG_DOC +cat > $SODA_DRIVER_CONFIG_DIR/nfs.yaml << soda_FILE_CONFIG_DOC tgtBindIp: $HOST_IP tgtConfDir: /etc/tgt/conf.d pool: @@ -218,20 +218,20 @@ pool: advanced: diskType: SSD latency: 5ms -OPENSDS_FILE_CONFIG_DOC +soda_FILE_CONFIG_DOC -cat >> $SODA_CONFIG_DIR/opensds.conf << OPENSDS_FILE_GLOBAL_CONFIG_DOC +cat >> $SODA_CONFIG_DIR/soda.conf << soda_FILE_GLOBAL_CONFIG_DOC [nfs] name = nfs description = NFS LVM TEST driver_name = nfs -config_path = /etc/opensds/driver/nfs.yaml +config_path = /etc/soda/driver/nfs.yaml -OPENSDS_FILE_GLOBAL_CONFIG_DOC +soda_FILE_GLOBAL_CONFIG_DOC } soda::lvm::set_nvme_configuration(){ -cat >> $SODA_DRIVER_CONFIG_DIR/lvm.yaml << OPENSDS_LVM_CONFIG_DOC +cat >> $SODA_DRIVER_CONFIG_DIR/lvm.yaml << soda_LVM_CONFIG_DOC $NVME_VOLUME_GROUP_NAME: diskType: NL-SAS @@ -253,7 +253,7 @@ cat >> $SODA_DRIVER_CONFIG_DIR/lvm.yaml << OPENSDS_LVM_CONFIG_DOC advanced: diskType: SSD latency: 20us -OPENSDS_LVM_CONFIG_DOC +soda_LVM_CONFIG_DOC } soda::lvm::remove_volumes() { @@ -270,7 +270,7 @@ soda::lvm::remove_volume_group() { sudo vgremove -f $vg } soda::lvm::remove_volume_group_for_file() { - local fvg="opensds-files-default" + local fvg="soda-files-default" # Remove the volume group sudo vgremove -f $fvg } @@ -289,7 +289,7 @@ soda::lvm::clean_backing_file() { } soda::lvm::clean_volume_group_for_file() { - local fvg="opensds-files-default" + local fvg="soda-files-default" soda::lvm::remove_volume_group_for_file $fvg # if there is no logical volume left, it's safe to attempt a cleanup # of the backing file diff --git a/devsds/lib/opensds.sh b/devsds/lib/opensds.sh index fc7fe163f..4926a4ae9 100755 --- a/devsds/lib/opensds.sh +++ b/devsds/lib/opensds.sh @@ -20,20 +20,20 @@ _XTRACE_SODA=$(set +o | grep xtrace) set +o xtrace -soda:opensds:configuration(){ +soda:soda:configuration(){ # Copy api spec file to configuration path SODA_API_DIR=${SODA_DIR}/../../api cp $SODA_API_DIR/openapi-spec/swagger.yaml $SODA_CONFIG_DIR # Set global configuration. -cat >> $SODA_CONFIG_DIR/opensds.conf << OPENSDS_GLOBAL_CONFIG_DOC +cat >> $SODA_CONFIG_DIR/soda.conf << soda_GLOBAL_CONFIG_DOC [osdsapiserver] api_endpoint = 0.0.0.0:50040 auth_strategy = $SODA_AUTH_STRATEGY # If https is enabled, the default value of cert file -# is /opt/opensds-security/sodafoundation/api-cert.pem, -# and key file is /opt/opensds-security/sodafoundation/api-key.pem +# is /opt/soda-security/sodafoundation/api-cert.pem, +# and key file is /opt/soda-security/sodafoundation/api-key.pem https_enabled = False beego_https_cert_file = beego_https_key_file = @@ -50,11 +50,11 @@ enabled_backends = $SODA_BACKEND_LIST endpoint = $HOST_IP:$ETCD_PORT,$HOST_IP:$ETCD_PEER_PORT driver = etcd -OPENSDS_GLOBAL_CONFIG_DOC +soda_GLOBAL_CONFIG_DOC } -soda::opensds::install(){ - soda:opensds:configuration +soda::soda::install(){ + soda:soda:configuration # Run osdsdock and osdslet daemon in background. ( cd ${SODA_API_DIR} @@ -71,7 +71,7 @@ soda::opensds::install(){ KEYSTONE_IP=$HOST_IP export OS_AUTH_URL=http://$KEYSTONE_IP/identity export OS_USERNAME=admin - export OS_PASSWORD=opensds@123 + export OS_PASSWORD=soda@123 export OS_TENANT_NAME=admin export OS_PROJECT_NAME=admin export OS_USER_DOMAIN_ID=default @@ -87,8 +87,8 @@ soda::opensds::install(){ # Copy bash completion script to system. cp ${SODA_API_DIR}/osdsctl/completion/osdsctl.bash_completion /etc/bash_completion.d/ - export OPENSDS_AUTH_STRATEGY=$SODA_AUTH_STRATEGY - export OPENSDS_ENDPOINT=http://localhost:50040 + export soda_AUTH_STRATEGY=$SODA_AUTH_STRATEGY + export soda_ENDPOINT=http://localhost:50040 ${SODA_API_DIR}/build/out/bin/osdsctl profile create '{"name": "default_block", "description": "default policy", "storageType": "block"}' ${SODA_API_DIR}/build/out/bin/osdsctl profile create '{"name": "default_file", "description": "default policy", "storageType": "file", "provisioningProperties":{"ioConnectivity": {"accessProtocol": "NFS"},"DataStorage":{"StorageAccessCapability":["Read","Write","Execute"]}}}' @@ -98,15 +98,15 @@ soda::opensds::install(){ ) } -soda::opensds::cleanup() { +soda::soda::cleanup() { sudo killall -9 osdsapiserver osdslet osdsdock &>/dev/null } -soda::opensds::uninstall(){ +soda::soda::uninstall(){ : # Do nothing } -soda::opensds::uninstall_purge(){ +soda::soda::uninstall_purge(){ : # Do nothing } diff --git a/devsds/sdsrc b/devsds/sdsrc index 6510e3987..3d258443c 100755 --- a/devsds/sdsrc +++ b/devsds/sdsrc @@ -23,14 +23,14 @@ if [ "$HOST_IP" == "" ]; then soda::util::die $LINENO "Could not determine host ip address. See local.conf for suggestions on setting HOST_IP." fi -# OpenSDS configuration. +# soda configuration. SODA_VERSION=${SODA_VERSION:-v1beta} #openstack authentication strategy, support 'noauth', 'keystone'. SODA_AUTH_STRATEGY=${SODA_AUTH_STRATEGY:-noauth} -# OpenSDS service name in keystone. -SODA_SERVER_NAME=${SODA_SERVER_NAME:-opensds} +# soda service name in keystone. +SODA_SERVER_NAME=${SODA_SERVER_NAME:-soda} # SODA backend list. SODA_BACKEND_LIST=${SODA_BACKEND_LIST:-lvm} @@ -41,7 +41,7 @@ SODA_PROJECT=${SODA_PROJECT:-all} # devstack keystone configuration STACK_GIT_BASE=${STACK_GIT_BASE:-https://git.openstack.org} STACK_USER_NAME=${STACK_USER_NAME:-stack} -STACK_PASSWORD=${STACK_PASSWORD:-opensds@123} +STACK_PASSWORD=${STACK_PASSWORD:-soda@123} STACK_HOME=${STACK_HOME:-/opt/stack} STACK_BRANCH=${STACK_BRANCH:-stable/queens} DEV_STACK_DIR=$STACK_HOME/devstack @@ -55,9 +55,9 @@ ETCD_DIR=${OPT_DIR}/etcd ETCD_LOGFILE=${ETCD_DIR}/etcd.log ETCD_DATADIR=${ETCD_DIR}/data -SODA_ENABLED_SERVICES=opensds,etcd,certificate +SODA_ENABLED_SERVICES=soda,etcd,certificate if [ $SODA_AUTH_STRATEGY = keystone ];then SODA_ENABLED_SERVICES+=,keystone fi SODA_ENABLED_SERVICES+=,$SODA_BACKEND_LIST -SUPPORT_SERVICES=certificate,keystone,lvm,ceph,etcd,opensds +SUPPORT_SERVICES=certificate,keystone,lvm,ceph,etcd,soda diff --git a/devsds/uninstall.sh b/devsds/uninstall.sh index c4007cc11..633d905d4 100755 --- a/devsds/uninstall.sh +++ b/devsds/uninstall.sh @@ -68,7 +68,7 @@ soda::uninstall_purge(){ soda::util::service_operation uninstall_purge rm /opt/sodafoundation -rf - rm /etc/opensds -rf + rm /etc/soda -rf rm /var/log/sodafoundation -rf rm /etc/bash_completion.d/osdsctl.bash_completion -rf rm /opt/soda-security -rf diff --git a/salt/HACKING.md b/salt/HACKING.md index f25531e36..84da088a8 100644 --- a/salt/HACKING.md +++ b/salt/HACKING.md @@ -3,20 +3,20 @@ Site specific deployment values =============================== -The default site configuration is detailed in the `/root/opensds-installer/salt/srv/pillar/site.j2` file. This is the primary interface for customizing the deployment experience for OpenSDS installer on Salt. Typically you may want to modify ip addresses, or more rarely set a specific release (urls, hashsums, revisions). This `site.j2` file is consumed by [saltstack-formulas/opensds-formula](https://github.com/saltstack-formulas/opensds-formula) during deployments. Please take care not to corrupt the file with bad syntax if you need to make updates. +The default site configuration is detailed in the `/root/soda-installer/salt/srv/pillar/site.j2` file. This is the primary interface for customizing the deployment experience for soda installer on Salt. Typically you may want to modify ip addresses, or more rarely set a specific release (urls, hashsums, revisions). This `site.j2` file is consumed by [saltstack-formulas/soda-formula](https://github.com/saltstack-formulas/soda-formula) during deployments. Please take care not to corrupt the file with bad syntax if you need to make updates. -The secondary interface for customizations is the `/root/opensds-installer/salt/srv/pillar/opensds.sls` yaml file. Again caution should be exercised if you make any updates. +The secondary interface for customizations is the `/root/soda-installer/salt/srv/pillar/soda.sls` yaml file. Again caution should be exercised if you make any updates. All other files should be left alone. Flexible Deployments ===================== -You can install OpenSDS in a more modular fashion. Salt has powerful features for distributed deployment management so the shipped solution could be extended for flexible deployment (salt integration knowledge is useful). +You can install soda in a more modular fashion. Salt has powerful features for distributed deployment management so the shipped solution could be extended for flexible deployment (salt integration knowledge is useful). The following commands are provided (or -r for removal). ``` - vi ./srv/pillar/opensds.sls ### Tweak something (advanced) + vi ./srv/pillar/soda.sls ### Tweak something (advanced) vi site.js ### Set IP addresses (easy) @@ -24,13 +24,13 @@ The following commands are provided (or -r for removal). sudo salter.sh -i keystone ### Runs devstack-formula - sudo salter.sh -i config ### Creates directories and /etc/opensds/opensds.conf file + sudo salter.sh -i config ### Creates directories and /etc/soda/soda.conf file sudo salter.sh -i database ### Installs ETCD sudo salter.sh -i hotpot ### Installs the HotPot - sudo salter.sh -i sushi ### Configures drivers in opensds.conf and /etc/opensds/driver directory + sudo salter.sh -i sushi ### Configures drivers in soda.conf and /etc/soda/driver directory sudo salter.sh -i backend ### Installs Backends (lvm, iscsi, cinder, etc) @@ -79,7 +79,7 @@ Start the virtual environment. Upstream support ================ -The upstream [saltstack-formulas/opensds-formula](https://github.com/saltstack-formulas/opensds-formula) is specifically designed for extensibility. +The upstream [saltstack-formulas/soda-formula](https://github.com/saltstack-formulas/soda-formula) is specifically designed for extensibility. To request upstream enhancements or bug fixes please raise a github issue for consideration. @@ -90,9 +90,9 @@ Example Installer output ======================== ``` -~/opensds-installer/salt # vi site.j2 +~/soda-installer/salt # vi site.j2 -~/opensds-installer/salt # sudo salter.sh -i salter; sudo salter.sh -i opensds +~/soda-installer/salt # sudo salter.sh -i salter; sudo salter.sh -i soda Loading repository data... Reading installed packages... @@ -119,7 +119,7 @@ Failed: 0 ------------- Total states run: 31 Total run time: 62.087 s -See full log in [ /tmp/opensds-installer-salt/install-salt/log.201902211252 ] +See full log in [ /tmp/soda-installer-salt/install-salt/log.201902211252 ] Accepted Keys: opensuse-leap-x64 @@ -132,7 +132,7 @@ run salt ... local: ---------- base: - - opensds.infra + - soda.infra ... this takes a while ... please be patient ... Summary for local @@ -142,13 +142,13 @@ Failed: 0 ------------- Total states run: 83 Total run time: 55.062 s -See full log in [ /tmp/opensds-installer-salt/install-infra/log.201902211254 ] +See full log in [ /tmp/soda-installer-salt/install-infra/log.201902211254 ] run salt ... local: ---------- base: - - opensds.keystone + - soda.keystone ... this takes a while ... please be patient ... Summary for local @@ -158,7 +158,7 @@ Failed: 0 ------------- Total states run: 24 Total run time: 582.516 s -See full log in [ /tmp/opensds-installer-salt/install-keystone/log.201902211255 ] +See full log in [ /tmp/soda-installer-salt/install-keystone/log.201902211255 ] Services are running under systemd unit files. For more information see: @@ -174,7 +174,7 @@ run salt ... local: ---------- base: - - opensds.config + - soda.config ... this takes a while ... please be patient ... Summary for local @@ -184,13 +184,13 @@ Failed: 0 ------------- Total states run: 15 Total run time: 390.923 ms -See full log in [ /tmp/opensds-installer-salt/install-config/log.201902211305 ] +See full log in [ /tmp/soda-installer-salt/install-config/log.201902211305 ] run salt ... local: ---------- base: - - opensds.database + - soda.database ... this takes a while ... please be patient ... Summary for local @@ -200,13 +200,13 @@ Failed: 0 ------------- Total states run: 33 Total run time: 60.786 s -See full log in [ /tmp/opensds-installer-salt/install-database/log.201902211305 ] +See full log in [ /tmp/soda-installer-salt/install-database/log.201902211305 ] run salt ... local: ---------- base: - - opensds.auth + - soda.auth ... this takes a while ... please be patient ... Summary for local @@ -216,13 +216,13 @@ Failed: 0 ------------- Total states run: 41 Total run time: 24.252 s -See full log in [ /tmp/opensds-installer-salt/install-auth/log.201902211307 ] +See full log in [ /tmp/soda-installer-salt/install-auth/log.201902211307 ] run salt ... local: ---------- base: - - opensds.hotpot + - soda.hotpot ... this takes a while ... please be patient ... Summary for local @@ -232,13 +232,13 @@ Failed: 0 ------------- Total states run: 30 Total run time: 324.824 s -See full log in [ /tmp/opensds-installer-salt/install-hotpot/log.201902211307 ] +See full log in [ /tmp/soda-installer-salt/install-hotpot/log.201902211307 ] run salt ... local: ---------- base: - - opensds.sushi + - soda.sushi ... this takes a while ... please be patient ... Summary for local @@ -248,13 +248,13 @@ Failed: 0 ------------- Total states run: 60 Total run time: 561.968 s -See full log in [ /tmp/opensds-installer-salt/install-sushi/log.201902211313 ] +See full log in [ /tmp/soda-installer-salt/install-sushi/log.201902211313 ] run salt ... local: ---------- base: - - opensds.backend + - soda.backend ... this takes a while ... please be patient ... Summary for local @@ -264,13 +264,13 @@ Failed: 1 ------------- Total states run: 84 Total run time: 1154.499 s -See full log in [ /tmp/opensds-installer-salt/install-backend/log.201902211323 ] +See full log in [ /tmp/soda-installer-salt/install-backend/log.201902211323 ] run salt ... local: ---------- base: - - opensds.dock + - soda.dock ... this takes a while ... please be patient ... Summary for local @@ -280,13 +280,13 @@ Failed: 0 ------------- Total states run: 30 Total run time: 1.073 s -See full log in [ /tmp/opensds-installer-salt/install-dock/log.201902211343 ] +See full log in [ /tmp/soda-installer-salt/install-dock/log.201902211343 ] run salt ... local: ---------- base: - - opensds.dashboard + - soda.dashboard ... this takes a while ... please be patient ... Summary for local @@ -296,13 +296,13 @@ Failed: 0 ------------- Total states run: 21 Total run time: 47.614 s -See full log in [ /tmp/opensds-installer-salt/install-dashboard/log.201902211343 ] +See full log in [ /tmp/soda-installer-salt/install-dashboard/log.201902211343 ] run salt ... local: ---------- base: - - opensds.gelato + - soda.gelato ... this takes a while ... please be patient ... Summary for local @@ -312,13 +312,13 @@ Failed: 0 ------------- Total states run: 42 Total run time: 284.863 s -See full log in [ /tmp/opensds-installer-salt/install-gelato/log.201902211344 ] +See full log in [ /tmp/soda-installer-salt/install-gelato/log.201902211344 ] local: ---------- - opensds: + soda: - default -Copy opensds-installer/conf/policy.json to /etc/opensds/ +Copy soda-installer/conf/policy.json to /etc/soda/ ``` @@ -326,7 +326,7 @@ Copy opensds-installer/conf/policy.json to /etc/opensds/ #### REMOVAL ``` -salter.sh -r opensds +salter.sh -r soda ... Summary for local diff --git a/salt/README.md b/salt/README.md index 69785d8ac..b6908a283 100644 --- a/salt/README.md +++ b/salt/README.md @@ -1,6 +1,6 @@ -# Deploying OpenSDS with Salt +# Deploying soda with Salt -Deploy OpenSDS (www.opensds.io) using Salt. This is an experimental solution using repeatable patterns of jinja/yaml to deploy cloud-native stack using infrastructure as code. +Deploy soda (www.soda.io) using Salt. This is an experimental solution using repeatable patterns of jinja/yaml to deploy cloud-native stack using infrastructure as code. Software versions ================= @@ -9,7 +9,7 @@ Verified on CENTOS-7, UBUNTU-18, and OPENSUSE-15 with Salt 2018.3 and 2019.2 rel Solution View ============= -![Solution overview](lib/solutionDesign.png) +![Solution overview](lib/solutionDesign.png) Reference Vagrant setup ======================= @@ -18,11 +18,11 @@ Refer to HACKING.md. Prefer a minimum of 6GB+4CPU per virutalized hosts. Procedure =========== -Deploy OpenSDS using the steps below. The expected installer duration is 20-55 minutes depending on your network bandwith and compute resources (we recommend at least 4CPU x 8G ram x 60G rootdisk). +Deploy soda using the steps below. The expected installer duration is 20-55 minutes depending on your network bandwith and compute resources (we recommend at least 4CPU x 8G ram x 60G rootdisk). Install Salt on UBUNTU/CENTOS/OpenSUSE_15 ``` -curl -o salter.sh https://raw.githubusercontent.com/opensds/opensds-installer/master/salt/salter.sh && sudo bash salter.sh -i bootstrap && sudo bash salter.sh -i salter +curl -o salter.sh https://raw.githubusercontent.com/soda/soda-installer/master/salt/salter.sh && sudo bash salter.sh -i bootstrap && sudo bash salter.sh -i salter ``` Reboot if kernel got major-upgraded. If in doubt, reboot anyway. ``` @@ -32,33 +32,33 @@ init 6 Review site deployment data to double check ipv4 adddres. Set "auth_strategy: noauth" if not using keystone. ``` ip addr - sudo vi /srv/salt/opensds/site.j2 + sudo vi /srv/salt/soda/site.j2 ``` -Deploy OpenSDS on UBUNTU/CENTOS/OpenSUSE_15 +Deploy soda on UBUNTU/CENTOS/OpenSUSE_15 ``` -sudo bash salter.sh -i opensds +sudo bash salter.sh -i soda ``` -How to test opensds cluster +How to test soda cluster =========================== -Check openSDS services are running (check logs/status if necessary) +Check soda services are running (check logs/status if necessary) ``` sudo -s docker ps -a ps -ef | grep osds - systemctl list-unit-files | grep opensds + systemctl list-unit-files | grep soda ``` -Check openSDS services which start slowly first time: +Check soda services which start slowly first time: ``` - journalctl -u opensds-multi-cloud --follow - journalctl -u opensds-cinder --follow + journalctl -u soda-multi-cloud --follow + journalctl -u soda-cinder --follow ``` -Firstly configure opensds CLI tool: +Firstly configure soda CLI tool: ``` - export OPENSDS_AUTH_STRATEGY=noauth - export OPENSDS_ENDPOINT=http://127.0.0.1:50040 (or your :8088. +The soda dashboard is available at http://127.0.0.1:8088 or http://:8088. -Please login to the dashboard using the default admin credentials: admin/opensds@123. Create tenant, user, and profiles as admin. Multi-Cloud is also supported by dashboard. +Please login to the dashboard using the default admin credentials: admin/soda@123. Create tenant, user, and profiles as admin. Multi-Cloud is also supported by dashboard. Now logout from dashboard (as admin) and login the dashboard again as a non-admin user to create volume, snapshot, expand volume, create volume from snapshot, create volume group. -How to purge and clean opensds cluster +How to purge and clean soda cluster ======================================== ``` - sudo /srv/salt/opensds/salter.sh -r opensds - sudo /srv/salt/opensds/salter.sh -r devstack # optional + sudo /srv/salt/soda/salter.sh -r soda + sudo /srv/salt/soda/salter.sh -r devstack # optional ``` diff --git a/salt/file_roots/install/auth.sls b/salt/file_roots/install/auth.sls index 359d4ec19..1c182bed8 100644 --- a/salt/file_roots/install/auth.sls +++ b/salt/file_roots/install/auth.sls @@ -1,4 +1,4 @@ -## opensds-installer/salt/srv/salt/install/auth.sls +## soda-installer/salt/srv/salt/install/auth.sls base: '*': - - opensds.auth + - soda.auth diff --git a/salt/file_roots/install/backend.sls b/salt/file_roots/install/backend.sls index 2c368ff8d..23cb01d1d 100644 --- a/salt/file_roots/install/backend.sls +++ b/salt/file_roots/install/backend.sls @@ -1,4 +1,4 @@ -## opensds-installer/salt/srv/salt/install/backend.sls +## soda-installer/salt/srv/salt/install/backend.sls base: '*': - - opensds.backend + - soda.backend diff --git a/salt/file_roots/install/config.sls b/salt/file_roots/install/config.sls index 79d5a3988..201967e41 100644 --- a/salt/file_roots/install/config.sls +++ b/salt/file_roots/install/config.sls @@ -1,4 +1,4 @@ -## opensds-installer/salt/srv/salt/install/config.sls +## soda-installer/salt/srv/salt/install/config.sls base: '*': - - opensds.config + - soda.config diff --git a/salt/file_roots/install/dashboard.sls b/salt/file_roots/install/dashboard.sls index 2507e8b6a..1cd69f754 100644 --- a/salt/file_roots/install/dashboard.sls +++ b/salt/file_roots/install/dashboard.sls @@ -1,4 +1,4 @@ -## opensds-installer/salt/srv/salt/install/dashboard.sls +## soda-installer/salt/srv/salt/install/dashboard.sls base: '*': - - opensds.dashboard + - soda.dashboard diff --git a/salt/file_roots/install/database.sls b/salt/file_roots/install/database.sls index 41fd8cd4c..b5977e17e 100644 --- a/salt/file_roots/install/database.sls +++ b/salt/file_roots/install/database.sls @@ -1,4 +1,4 @@ -## opensds-installer/salt/srv/salt/install/database.sls +## soda-installer/salt/srv/salt/install/database.sls base: '*': - - opensds.database + - soda.database diff --git a/salt/file_roots/install/dock.sls b/salt/file_roots/install/dock.sls index f13bd6ceb..11da12e74 100644 --- a/salt/file_roots/install/dock.sls +++ b/salt/file_roots/install/dock.sls @@ -1,4 +1,4 @@ -## opensds-installer/salt/srv/salt/install/dock.sls +## soda-installer/salt/srv/salt/install/dock.sls base: '*': - - opensds.dock + - soda.dock diff --git a/salt/file_roots/install/formulas.sls b/salt/file_roots/install/formulas.sls index e80a3164a..647d788f3 100644 --- a/salt/file_roots/install/formulas.sls +++ b/salt/file_roots/install/formulas.sls @@ -1,4 +1,4 @@ -## opensds-installer/salt/srv/salt/install/formulas.sls +## soda-installer/salt/srv/salt/install/formulas.sls base: '*': - salt.formulas diff --git a/salt/file_roots/install/freespace.sls b/salt/file_roots/install/freespace.sls index 349a90152..f8f5cdfda 100644 --- a/salt/file_roots/install/freespace.sls +++ b/salt/file_roots/install/freespace.sls @@ -1,4 +1,4 @@ -## opensds-installer/salt/srv/salt/install/freespace.sls +## soda-installer/salt/srv/salt/install/freespace.sls base: '*': - - opensds.freespace + - soda.freespace diff --git a/salt/file_roots/install/gelato.sls b/salt/file_roots/install/gelato.sls index c8b2a719e..94192c0ed 100644 --- a/salt/file_roots/install/gelato.sls +++ b/salt/file_roots/install/gelato.sls @@ -1,4 +1,4 @@ -## opensds-installer/salt/srv/salt/install/gelato.sls +## soda-installer/salt/srv/salt/install/gelato.sls base: '*': - - opensds.gelato + - soda.gelato diff --git a/salt/file_roots/install/hotpot.sls b/salt/file_roots/install/hotpot.sls index 333e1b932..d24866c32 100644 --- a/salt/file_roots/install/hotpot.sls +++ b/salt/file_roots/install/hotpot.sls @@ -1,4 +1,4 @@ -## opensds-installer/salt/srv/salt/install/hotpot.sls +## soda-installer/salt/srv/salt/install/hotpot.sls base: '*': - - opensds.hotpot + - soda.hotpot diff --git a/salt/file_roots/install/infra.sls b/salt/file_roots/install/infra.sls index e2d2c75c2..dbb181cc8 100644 --- a/salt/file_roots/install/infra.sls +++ b/salt/file_roots/install/infra.sls @@ -1,4 +1,4 @@ -## opensds-installer/salt/srv/salt/install/infra.sls +## soda-installer/salt/srv/salt/install/infra.sls base: '*': - - opensds.infra + - soda.infra diff --git a/salt/file_roots/install/keystone.sls b/salt/file_roots/install/keystone.sls index 0172b5e07..b34a863aa 100644 --- a/salt/file_roots/install/keystone.sls +++ b/salt/file_roots/install/keystone.sls @@ -1,4 +1,4 @@ -## opensds-installer/salt/srv/salt/install/keystone.sls +## soda-installer/salt/srv/salt/install/keystone.sls base: '*': - - opensds.keystone + - soda.keystone diff --git a/salt/file_roots/install/opensds.sls b/salt/file_roots/install/opensds.sls index 49e0f43db..9b04a651e 100644 --- a/salt/file_roots/install/opensds.sls +++ b/salt/file_roots/install/opensds.sls @@ -1,4 +1,4 @@ -## opensds-installer/salt/srv/salt/install/opensds.sls +## soda-installer/salt/srv/salt/install/soda.sls base: '*': - - opensds + - soda diff --git a/salt/file_roots/install/sushi.sls b/salt/file_roots/install/sushi.sls index 5b71d0531..7f4c57ddc 100644 --- a/salt/file_roots/install/sushi.sls +++ b/salt/file_roots/install/sushi.sls @@ -1,4 +1,4 @@ -## opensds-installer/salt/srv/salt/install/sushi.sls +## soda-installer/salt/srv/salt/install/sushi.sls base: '*': - - opensds.sushi + - soda.sushi diff --git a/salt/file_roots/install/telemetry.sls b/salt/file_roots/install/telemetry.sls index 5f6635eff..358c28eb4 100644 --- a/salt/file_roots/install/telemetry.sls +++ b/salt/file_roots/install/telemetry.sls @@ -1,4 +1,4 @@ -## opensds-installer/salt/srv/salt/install/telemetry.sls +## soda-installer/salt/srv/salt/install/telemetry.sls base: '*': - - opensds.telemetry + - soda.telemetry diff --git a/salt/file_roots/install/tzdns.sls b/salt/file_roots/install/tzdns.sls index ccf96d18a..4b1b0c567 100644 --- a/salt/file_roots/install/tzdns.sls +++ b/salt/file_roots/install/tzdns.sls @@ -1,4 +1,4 @@ -## opensds-installer/salt/srv/salt/installer/tzdns.sls +## soda-installer/salt/srv/salt/installer/tzdns.sls base: '*': - timezone diff --git a/salt/file_roots/remove/auth.sls b/salt/file_roots/remove/auth.sls index fd8be5b4d..1906dcc83 100644 --- a/salt/file_roots/remove/auth.sls +++ b/salt/file_roots/remove/auth.sls @@ -1,4 +1,4 @@ -## opensds-installer/salt/srv/salt/remove/auth.sls +## soda-installer/salt/srv/salt/remove/auth.sls base: '*': - - opensds.auth.clean + - soda.auth.clean diff --git a/salt/file_roots/remove/backend.sls b/salt/file_roots/remove/backend.sls index 94f309499..0b528d05e 100644 --- a/salt/file_roots/remove/backend.sls +++ b/salt/file_roots/remove/backend.sls @@ -1,4 +1,4 @@ -## opensds-installer/salt/srv/salt/remove/dock.sls +## soda-installer/salt/srv/salt/remove/dock.sls base: '*': - - opensds.backend.clean + - soda.backend.clean diff --git a/salt/file_roots/remove/config.sls b/salt/file_roots/remove/config.sls index b918143ef..61b27edf6 100644 --- a/salt/file_roots/remove/config.sls +++ b/salt/file_roots/remove/config.sls @@ -1,4 +1,4 @@ -## opensds-installer/salt/srv/salt/remove/config.sls +## soda-installer/salt/srv/salt/remove/config.sls base: '*': - - opensds.config.clean + - soda.config.clean diff --git a/salt/file_roots/remove/dashboard.sls b/salt/file_roots/remove/dashboard.sls index 95621078d..3f2033453 100644 --- a/salt/file_roots/remove/dashboard.sls +++ b/salt/file_roots/remove/dashboard.sls @@ -1,4 +1,4 @@ -## opensds-installer/salt/srv/salt/remove/dashboard.sls +## soda-installer/salt/srv/salt/remove/dashboard.sls base: '*': - - opensds.dashboard.clean + - soda.dashboard.clean diff --git a/salt/file_roots/remove/database.sls b/salt/file_roots/remove/database.sls index f48103aa8..7d6e13eb8 100644 --- a/salt/file_roots/remove/database.sls +++ b/salt/file_roots/remove/database.sls @@ -1,4 +1,4 @@ -## opensds-installer/salt/srv/salt/remove/database.sls +## soda-installer/salt/srv/salt/remove/database.sls base: '*': - - opensds.database.clean + - soda.database.clean diff --git a/salt/file_roots/remove/dock.sls b/salt/file_roots/remove/dock.sls index 6a2098658..032b708a8 100644 --- a/salt/file_roots/remove/dock.sls +++ b/salt/file_roots/remove/dock.sls @@ -1,4 +1,4 @@ -## opensds-installer/salt/srv/salt/remove/dock.sls +## soda-installer/salt/srv/salt/remove/dock.sls base: '*': - - opensds.dock.clean + - soda.dock.clean diff --git a/salt/file_roots/remove/files.sls b/salt/file_roots/remove/files.sls index 361c7f1e0..8c0e2d7e4 100644 --- a/salt/file_roots/remove/files.sls +++ b/salt/file_roots/remove/files.sls @@ -1,4 +1,4 @@ -## opensds-installer/srv/salt/salt/top.sls +## soda-installer/srv/salt/salt/top.sls base: '*': - - opensds.clean + - soda.clean diff --git a/salt/file_roots/remove/freespace.sls b/salt/file_roots/remove/freespace.sls index fe3acd986..b30e10f97 100644 --- a/salt/file_roots/remove/freespace.sls +++ b/salt/file_roots/remove/freespace.sls @@ -1,4 +1,4 @@ -## opensds-installer/salt/srv/salt/remove/freespace.sls +## soda-installer/salt/srv/salt/remove/freespace.sls base: '*': - - opensds.freespace + - soda.freespace diff --git a/salt/file_roots/remove/gelato.sls b/salt/file_roots/remove/gelato.sls index 7ad20f490..b04f74960 100644 --- a/salt/file_roots/remove/gelato.sls +++ b/salt/file_roots/remove/gelato.sls @@ -1,4 +1,4 @@ -## opensds-installer/salt/srv/salt/remove/gelato.sls +## soda-installer/salt/srv/salt/remove/gelato.sls base: '*': - - opensds.gelato.clean + - soda.gelato.clean diff --git a/salt/file_roots/remove/hotpot.sls b/salt/file_roots/remove/hotpot.sls index 0409c06ef..02624b7c8 100644 --- a/salt/file_roots/remove/hotpot.sls +++ b/salt/file_roots/remove/hotpot.sls @@ -1,4 +1,4 @@ -## opensds-installer/salt/srv/salt/remove/hotpot.sls +## soda-installer/salt/srv/salt/remove/hotpot.sls base: '*': - - opensds.hotpot.clean + - soda.hotpot.clean diff --git a/salt/file_roots/remove/infra.sls b/salt/file_roots/remove/infra.sls index ffba57486..ab6271e1e 100644 --- a/salt/file_roots/remove/infra.sls +++ b/salt/file_roots/remove/infra.sls @@ -1,4 +1,4 @@ -## opensds-installer/salt/srv/salt/remove/infra.sls +## soda-installer/salt/srv/salt/remove/infra.sls base: '*': - - opensds.infra.clean + - soda.infra.clean diff --git a/salt/file_roots/remove/keystone.sls b/salt/file_roots/remove/keystone.sls index 3232dae5d..094dd1fef 100644 --- a/salt/file_roots/remove/keystone.sls +++ b/salt/file_roots/remove/keystone.sls @@ -1,4 +1,4 @@ -## opensds-installer/salt/srv/salt/remove/keystone.sls +## soda-installer/salt/srv/salt/remove/keystone.sls base: '*': - - opensds.keystone.clean + - soda.keystone.clean diff --git a/salt/file_roots/remove/opensds.sls b/salt/file_roots/remove/opensds.sls index d5e28ea37..31df75ef0 100644 --- a/salt/file_roots/remove/opensds.sls +++ b/salt/file_roots/remove/opensds.sls @@ -1,5 +1,5 @@ -## opensds-installer/salt/srv/salt/remove/top.sls +## soda-installer/salt/srv/salt/remove/top.sls base: '*': - salt.formulas - - opensds.cleaner + - soda.cleaner diff --git a/salt/file_roots/remove/salt.sls b/salt/file_roots/remove/salt.sls index dd865f8b9..220a1617d 100644 --- a/salt/file_roots/remove/salt.sls +++ b/salt/file_roots/remove/salt.sls @@ -1,4 +1,4 @@ -## opensds-installer/salt/srv/salt/salt.sls +## soda-installer/salt/srv/salt/salt.sls base: '*': {{ '- salt.pkgrepo' if grains.os_family|lower not in ('suse', 'freebsd') else '' }} #Is suse fixed yet? diff --git a/salt/file_roots/remove/sushi.sls b/salt/file_roots/remove/sushi.sls index 28c2ef928..67b998feb 100644 --- a/salt/file_roots/remove/sushi.sls +++ b/salt/file_roots/remove/sushi.sls @@ -1,4 +1,4 @@ -## opensds-installer/salt/srv/salt/sushi.sls +## soda-installer/salt/srv/salt/sushi.sls base: '*': - - opensds.sushi.clean + - soda.sushi.clean diff --git a/salt/file_roots/remove/telemetry.sls b/salt/file_roots/remove/telemetry.sls index 3f3dfb7cc..069884680 100644 --- a/salt/file_roots/remove/telemetry.sls +++ b/salt/file_roots/remove/telemetry.sls @@ -1,4 +1,4 @@ -## opensds-installer/salt/srv/salt/remove/telemetry.sls +## soda-installer/salt/srv/salt/remove/telemetry.sls base: '*': - - opensds.telemetry.clean + - soda.telemetry.clean diff --git a/salt/pillar_roots/opensds.sls b/salt/pillar_roots/opensds.sls index 748a1f066..d10bacdb8 100644 --- a/salt/pillar_roots/opensds.sls +++ b/salt/pillar_roots/opensds.sls @@ -1,16 +1,16 @@ {% from "site.j2" import sitedata as site %} -opensds: +soda: deploy_project: {{ site.deploy_project }} host: {{ site.host_ipv4 or site.host_ipv6 or "127.0.0.1" }} ports: - opensds: {{ site.port_hotpot }} + soda: {{ site.port_hotpot }} dock: {{ site.port_dock }} dir: - go: {{ site.go_path }}/src/github.com/opensds + go: {{ site.go_path }}/src/github.com/soda environ: - opensds_endpoint: {{ site.host_ipv4 or site.host_ipv6 or "127.0.0.1" }}:{{ site.port_hotpot }} - opensds_auth_strategy: {{ site.auth_strategy }} + soda_endpoint: {{ site.host_ipv4 or site.host_ipv6 or "127.0.0.1" }}:{{ site.port_hotpot }} + soda_auth_strategy: {{ site.auth_strategy }} csi_endpoint: {{ site.host_ipv4 or site.host_ipv6 or '127.0.0.1' }}:{{ site.port_csi }} gopath: {{ site.go_path }} @@ -93,7 +93,7 @@ opensds: ########### DOCKS ############### dock: - opensdsconf: + sodaconf: osdsdock: api_endpoint: {{ site.host_ipv4 or site.host_ipv6 or "127.0.0.1" }}:{{ site.port_dock }} dock_type: {{ site.dock_type }} @@ -108,21 +108,21 @@ opensds: port_bindings: - '{{ site.port_dock }}:{{ site.port_dock }}' daemon: - opensds: + soda: strategy: binaries osdsdock: strategy: config-systemd - ############ OPENSDS TELEMETRY ########### + ############ soda TELEMETRY ########### telemetry: {} - ############ OPENSDS GELATO ############# + ############ soda GELATO ############# gelato: release: {{ site.gelato_release }} service: {{ site.gelato_service }} ids: - {{ site.gelato_service }} - opensdsconf: + sodaconf: {{ site.gelato_service }}: endpoint: {{ site.host_ipv4 or site.host_ipv6 or "127.0.0.1" }} port: {{ site.port_gelato }} @@ -135,12 +135,12 @@ opensds: branch: {{ site.gelato_release }} - ############ OPENSDS AUTH ############# + ############ soda AUTH ############# auth: ids: - osdsauth - keystone_authtoken - opensdsconf: + sodaconf: keystone_authtoken: memcached_servers: '{{ site.host_ipv4 or site.host_ipv6 or "127.0.0.1" }}:11211' auth_uri: 'http://{{ site.host_ipv4 or site.host_ipv6 or "127.0.0.1" }}/identity' @@ -153,16 +153,16 @@ opensds: user_domain_name: {{ site.user_domain_name }} daemon: osdsauth: - strategy: config-keystone ##verified on Ubuntu opensds-installer/salt + strategy: config-keystone ##verified on Ubuntu soda-installer/salt endpoint_ipv4: http://{{ site.host_ipv4 or site.host_ipv6 or "127.0.0.1" }} endpoint_port: {{ site.port_hotpot }} - ############ OPENSDS DATABASE ############# + ############ soda DATABASE ############# database: ids: - database - etcd - opensdsconf: + sodaconf: database: endpoint: '{{ site.host_ipv4 or site.host_ipv6 or "127.0.0.1" }}:{{ site.port_auth1 }},http://{{ site.host_ipv4 or site.host_ipv6 or "127.0.0.1" }}:{{ site.port_auth2 }}' credential: '{{ site.hotpot_service }}:{{ site.devstack_password }}@{{ site.host_ipv4 or site.host_ipv6 or "127.0.0.1"}}:{{ site.port_mysql }}/dbname' @@ -171,16 +171,16 @@ opensds: strategy: config-etcd-formula/container - ############### OPENSDS HOTPOT ################ + ############### soda HOTPOT ################ hotpot: release: {{ site.hotpot_release }} service: {{ site.hotpot_service }} - opensdsconf: + sodaconf: osdslet: api_endpoint: {{ site.host_ipv4 or site.host_ipv6 or "127.0.0.1"}}:{{ site.port_hotpot }} auth_strategy: {{ site.auth_strategy }} ### note: noauth verified on ubuntu salt installer container: - opensds: + soda: image: {{ site.container_hotpot_img }} version: {{ site.hotpot_version }} ports: @@ -189,14 +189,14 @@ opensds: port_bindings: - {{site.host_ipv4 or site.host_ipv6 or '127.0.0.1'}}:{{site.port_hotpot}}:{{site.port_hotpot}} daemon: - opensds: + soda: strategy: repo-config-build-binaries-systemd endpoint_ipv4: http://{{ site.host_ipv4 or site.host_ipv6 or "127.0.0.1" }} endpoint_port: {{ site.port_hotpot }} - ############### OPENSDS DASHBOARD(S) ################ + ############### soda DASHBOARD(S) ################ dashboard: - opensdsconf: + sodaconf: dashboard: endpoint: http://{{ site.host_ipv4 or site.host_ipv6 or "127.0.0.1" }} port: {{ site.port_hotpot }} @@ -205,14 +205,14 @@ opensds: image: {{ site.container_dashboard_img }} version: {{ site.dashboard_version }} env: - OPENSDS_HOST_IP: {{ site.host_ipv4 or site.host_ipv6 or "127.0.0.1" }} + soda_HOST_IP: {{ site.host_ipv4 or site.host_ipv6 or "127.0.0.1" }} daemon: dashboard: strategy: config-container repo: branch: {{ site.dashboard_version }} - ############### OPENSDS SUSHI NORTH-BOUND-PLUGINS ################ + ############### soda SUSHI NORTH-BOUND-PLUGINS ################ sushi: release: {{ site.sushi_release }} plugin_type: {{ site.dock_type }} @@ -283,12 +283,12 @@ lvm: vg: remove: cinder-volumes: - opensds-volumes: + soda-volumes: create: cinder-volumes: devices: - /dev/loop0 - opensds-volumes: + soda-volumes: devices: - /dev/loop1 @@ -324,8 +324,8 @@ firewalld: - 8883 ## mqtt-tls client - 15674 ## STOMP-over-WebSockets - 15675 ## MQTT-over-WebSockets - opensds: - short: opensds + soda: + short: soda description: Open Software Defined Storage ports: tcp: @@ -366,7 +366,7 @@ firewalld: - ntp - saltstack - ceph - - opensds + - soda - rabbitmq {%- if grains.os == 'Fedora' %} @@ -379,7 +379,7 @@ firewalld: - ntp - saltstack - ceph - - opensds + - soda {%- endif %} @@ -445,7 +445,7 @@ devstack: options: project: {{ site.project_name }} user: - - opensds{{ site.hotpot_release }} + - soda{{ site.hotpot_release }} - {{ site.gelato_service }}{{ site.gelato_release }} {{ site.project_name }}: options: @@ -454,15 +454,15 @@ devstack: - {{ site.project_name }} endpoint: create: - 'opensds{{site.hotpot_release}} public https://{{ site.host_ipv4 or site.host_ipv6 or "127.0.0.1"}}/{{ site.port_hotpot }}/{{ site.hotpot_release }}/%\(tenant_id\)s': + 'soda{{site.hotpot_release}} public https://{{ site.host_ipv4 or site.host_ipv6 or "127.0.0.1"}}/{{ site.port_hotpot }}/{{ site.hotpot_release }}/%\(tenant_id\)s': options: region: RegionOne enable: True - 'opensds{{site.hotpot_release}} internal https://{{ site.host_ipv4 or site.host_ipv6 or "127.0.0.1"}}/{{ site.port_hotpot }}/{{ site.hotpot_release }}/%\(tenant_id\)s': + 'soda{{site.hotpot_release}} internal https://{{ site.host_ipv4 or site.host_ipv6 or "127.0.0.1"}}/{{ site.port_hotpot }}/{{ site.hotpot_release }}/%\(tenant_id\)s': options: region: RegionOne enable: True - 'opensds{{site.hotpot_release}} admin https://{{ site.host_ipv4 or site.host_ipv6 or "127.0.0.1"}}/{{ site.port_hotpot }}/{{ site.hotpot_release }}/%\(tenant_id\)s': + 'soda{{site.hotpot_release}} admin https://{{ site.host_ipv4 or site.host_ipv6 or "127.0.0.1"}}/{{ site.port_hotpot }}/{{ site.hotpot_release }}/%\(tenant_id\)s': options: region: RegionOne enable: True @@ -653,7 +653,7 @@ packages: - tox - click pkgs: - wanted: [] ## populated by opensds-formula in map.jinja + wanted: [] ## populated by soda-formula in map.jinja unwanted: - unattended-upgrades {%- if grains.os_family in ('RedHat',) %} @@ -699,11 +699,11 @@ packages: hashsum: {{ site.gelato_hashsum }} hotpot: - dest: {{ site.hotpot_path }}/opensds + dest: {{ site.hotpot_path }}/soda options: '--strip-components=1' dl: format: tar - source: {{ site.hotpot_uri }}/{{ site.hotpot_release }}/opensds-hotpot-{{ site.hotpot_release }}-linux-amd64.tar.gz + source: {{ site.hotpot_uri }}/{{ site.hotpot_release }}/soda-hotpot-{{ site.hotpot_release }}-linux-amd64.tar.gz hashsum: {{ site.hotpot_hashsum }} nbp: @@ -711,7 +711,7 @@ packages: options: '--strip-components=1' dl: format: tar - source: {{ site.sushi_uri }}/{{ site.sushi_release }}/opensds-sushi-{{ site.sushi_release }}-linux-amd64.tar.gz + source: {{ site.sushi_uri }}/{{ site.sushi_release }}/soda-sushi-{{ site.sushi_release }}-linux-amd64.tar.gz hashsum: {{ site.sushi_hashsum }} cinder: @@ -722,8 +722,8 @@ packages: source: {{ site.cinder_url }} hashsum: {{ site.cinder_hashsum }} unwanted: - - {{ site.go_path }}/src/github.com/opensds/nbp - - {{ site.go_path }}/src/github.com/opensds/opensds + - {{ site.go_path }}/src/github.com/soda/nbp + - {{ site.go_path }}/src/github.com/soda/soda - {{ site.sushi_path }} - {{ site.hotpot_path }} # /var/lib/mysql/ diff --git a/salt/pillar_roots/salt.sls b/salt/pillar_roots/salt.sls index 888b5b32b..d99f1445e 100644 --- a/salt/pillar_roots/salt.sls +++ b/salt/pillar_roots/salt.sls @@ -74,7 +74,7 @@ salt_formulas: - devstack-formula - golang-formula - memcached-formula - - opensds-formula + - soda-formula - mysql-formula - timezone-formula - resolver-formula diff --git a/salt/pillar_roots/site.j2 b/salt/pillar_roots/site.j2 index cc3300c14..38ad44b93 100644 --- a/salt/pillar_roots/site.j2 +++ b/salt/pillar_roots/site.j2 @@ -29,7 +29,7 @@ 'timezone': 'America/Denver', 'enabled_backends': 'lvm, cinder, ceph', - 'lvm_poolname': 'opensds-volumes', + 'lvm_poolname': 'soda-volumes', 'ceph_poolname': 'ceph-volumes', 'cinder_poolname': 'cinder-volumes', 'dorado_poolname': 'dorado-volumes', @@ -37,17 +37,17 @@ 'gelato_release': 'v0.6.0', 'gelato_service': 'multi-cloud', - 'gelato_uri': 'https://github.com/opensds/multi-cloud/releases/download', + 'gelato_uri': 'https://github.com/soda/multi-cloud/releases/download', 'gelato_hashsum': '92a26c93a8b56472922d7b771eb41f3689e585e87aaee6466dae5684f14976ea', 'hotpot_release': 'v0.6.0', - 'hotpot_service': 'opensds', + 'hotpot_service': 'soda', 'hotpot_hashsum': '34916233b3f145491efd97108558938dadaa3f699f4508cf946e22f28aac4741', - 'hotpot_uri': 'https://github.com/opensds/opensds/releases/download', + 'hotpot_uri': 'https://github.com/soda/soda/releases/download', 'sushi_release': 'v0.6.0', 'sushi_hashsum': 'b609798db6f31a8a3d2261f88657c162821c0fa296e4e9dbe9a3dafa5e907270', - 'sushi_uri': 'https://github.com/opensds/nbp/releases/download', + 'sushi_uri': 'https://github.com/soda/nbp/releases/download', 'cinder_release': '13.0.5', 'cinder_hashsum': '6da0712d6ef69ee2fbab99a0613900d368d188ccafa2038c08198835cb80f52d', @@ -69,16 +69,16 @@ 'cinder_version': 'stable/rocky', 'devstack_enabled_services': 'mysql,key', - 'devstack_password': 'opensds@123', + 'devstack_password': 'soda@123', 'project_domain_name': 'Default', 'project_name': 'service', 'user_domain_name': 'Default', - 'devstack_path': '/opt/opensds-linux-amd64-devstack', - 'hotpot_path': '/opt/opensds-linux-amd64', - 'devstack_path': '/opt/opensds-linux-amd64-devstack', - 'gelato_path': '/opt/opensds-gelato-linux-amd64', - 'sushi_path': '/opt/opensds-sushi-linux-amd64', + 'devstack_path': '/opt/soda-linux-amd64-devstack', + 'hotpot_path': '/opt/soda-linux-amd64', + 'devstack_path': '/opt/soda-linux-amd64-devstack', + 'gelato_path': '/opt/soda-gelato-linux-amd64', + 'sushi_path': '/opt/soda-sushi-linux-amd64', 'go_prefix': '/usr/local', 'go_root': '/usr/local/go', 'go_path': '/usr/local/golang/packages', diff --git a/salt/pillar_roots/top.sls b/salt/pillar_roots/top.sls index 87a70ad41..8e6359e29 100644 --- a/salt/pillar_roots/top.sls +++ b/salt/pillar_roots/top.sls @@ -1,5 +1,5 @@ base: '*': - salt - - opensds + - soda - deepsea diff --git a/salt/salter.sh b/salt/salter.sh index 96252c3e1..967ec4319 100755 --- a/salt/salter.sh +++ b/salt/salter.sh @@ -537,7 +537,7 @@ cli-options() { } ######################################################################### -# SOLUTION: Copyright 2019 The OpenSDS Authors +# SOLUTION: Copyright 2019 The soda Authors ######################################################################### developer-definitions() { @@ -550,12 +550,12 @@ developer-definitions() { solution-definitions() { solution['saltmaster']="" solution['uri']="https://github.com" - solution['entity']="opensds" - solution['repo']="opensds-installer" - solution['alias']="opensds" + solution['entity']="soda" + solution['repo']="soda-installer" + solution['alias']="soda" solution['subdir']="salt" solution['provider']="saltstack-formulas" - solution['profiles']="opensds|gelato|auth|hotpot|backend|dashboard|database|dock|keystone|config|infra|sushi|freespace|telemetry|deepsea" + solution['profiles']="soda|gelato|auth|hotpot|backend|dashboard|database|dock|keystone|config|infra|sushi|freespace|telemetry|deepsea" ### derivatives solution['homedir']="${SALTFS}/namespaces/${solution[entity]}/${solution[repo]}/${solution[subdir]}" @@ -588,7 +588,7 @@ custom-install() { highstate install ${solution[saltdir]} dashboard highstate install ${solution[saltdir]} gelato highstate install ${solution[saltdir]} freespace - cp ${SALTFS}/namespaces/${solution['entity']}/${solution[repo]}/conf/*.json /etc/opensds/ 2>/dev/null + cp ${SALTFS}/namespaces/${solution['entity']}/${solution[repo]}/conf/*.json /etc/soda/ 2>/dev/null } custom-postinstall() {