diff options
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/barometer/roles/grafana/files/install_grafana.sh | 2 | ||||
| -rw-r--r-- | plugins/stor4nfv/roles/stor4nfv/tasks/opensds.yml | 3 | ||||
| -rw-r--r-- | plugins/stor4nfv/roles/stor4nfv/tasks/post-install.yml | 12 |
3 files changed, 11 insertions, 6 deletions
diff --git a/plugins/barometer/roles/grafana/files/install_grafana.sh b/plugins/barometer/roles/grafana/files/install_grafana.sh index 0b9f4ec5..43d9a588 100644 --- a/plugins/barometer/roles/grafana/files/install_grafana.sh +++ b/plugins/barometer/roles/grafana/files/install_grafana.sh @@ -13,7 +13,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -echo "deb https://packagecloud.io/grafana/stable/debian/ wheezy main" | tee /etc/apt/sources.list.d/grafana.list +echo "deb https://packagecloud.io/grafana/stable/debian/ stretch main" | tee /etc/apt/sources.list.d/grafana.list curl https://packagecloud.io/gpg.key | apt-key add - diff --git a/plugins/stor4nfv/roles/stor4nfv/tasks/opensds.yml b/plugins/stor4nfv/roles/stor4nfv/tasks/opensds.yml index a095ceb0..3252fefb 100644 --- a/plugins/stor4nfv/roles/stor4nfv/tasks/opensds.yml +++ b/plugins/stor4nfv/roles/stor4nfv/tasks/opensds.yml @@ -30,7 +30,8 @@ remote_user: root shell: | cd /opt; - git clone https://github.com/ceph/ceph-ansible.git + git clone https://github.com/ceph/ceph-ansible.git; + [ -f ceph-ansible/requirements.txt ] && pip install -r ceph-ansible/requirements.txt - name: fetch stor4nfv source code remote_user: root diff --git a/plugins/stor4nfv/roles/stor4nfv/tasks/post-install.yml b/plugins/stor4nfv/roles/stor4nfv/tasks/post-install.yml index 55d26d69..182c0a68 100644 --- a/plugins/stor4nfv/roles/stor4nfv/tasks/post-install.yml +++ b/plugins/stor4nfv/roles/stor4nfv/tasks/post-install.yml @@ -8,6 +8,10 @@ # ############################################################################# --- +- name: define image architecture + set_fact: + imgarch: "{{ 'arm64' if ansible_architecture == 'aarch64' else 'amd64' }}" + - name: ensure ceph-ansible dir exists stat: path: /opt/ceph-ansible @@ -39,24 +43,24 @@ - name: ensure osdsctl exists stat: - path: /opt/opensds-v0.1.5-linux-amd64/bin/osdsctl + path: /opt/opensds-v0.1.5-linux-{{ imgarch }}/bin/osdsctl ignore_errors: "true" register: osdsctl_exists - name: ensure opensds csi directory exists stat: - path: /opt/opensds-k8s-v0.1.0-linux-amd64 + path: /opt/opensds-k8s-v0.1.0-linux-{{ imgarch }} ignore_errors: "true" register: csi_dir_exists - name: create opensds default profile, csi pods remote_user: root shell: | - cp /opt/opensds-v0.1.5-linux-amd64/bin/osdsctl /usr/local/bin; + cp /opt/opensds-v0.1.5-linux-{{ imgarch }}/bin/osdsctl /usr/local/bin; export OPENSDS_ENDPOINT=http://{{ public_vip.ip }}:50040; export OPENSDS_AUTH_STRATEGY=noauth; osdsctl profile create '{"name": "default", "description": "default policy"}' - cd /opt/opensds-k8s-v0.1.0-linux-amd64; + cd /opt/opensds-k8s-v0.1.0-linux-{{ imgarch }}; kubectl create -f csi/deploy/kubernetes; ignore_errors: "true" when: |