aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorramamani yeleswarapu <ramamani.yeleswarapu@intel.com>2018-08-15 17:22:38 -0700
committerramamani yeleswarapu <ramamani.yeleswarapu@intel.com>2018-08-17 12:04:02 -0700
commit7e8c2d865003f087fa9179a6f847a82934ee31d5 (patch)
tree1b4b066ec69f323b43fc7ecf5e9ba02a127e06e1
parent381a1df096e1f358bef8de1dbaa7593379357f22 (diff)
[stor4nfv] Changes to k8s scenarios
Makes a few changes to 'stor4nfv' role to accommodate Stor4nfv repo changes. Change-Id: I1b7d190e4308a2394f90012767c08990e1354e6d Signed-off-by: ramamani yeleswarapu <ramamani.yeleswarapu@intel.com>
-rw-r--r--plugins/stor4nfv/roles/stor4nfv/files/configure_vars.sh14
-rw-r--r--plugins/stor4nfv/roles/stor4nfv/tasks/opensds.yml8
-rw-r--r--plugins/stor4nfv/roles/stor4nfv/tasks/post-install.yml16
3 files changed, 14 insertions, 24 deletions
diff --git a/plugins/stor4nfv/roles/stor4nfv/files/configure_vars.sh b/plugins/stor4nfv/roles/stor4nfv/files/configure_vars.sh
index a4fe44e..112d9c8 100644
--- a/plugins/stor4nfv/roles/stor4nfv/files/configure_vars.sh
+++ b/plugins/stor4nfv/roles/stor4nfv/files/configure_vars.sh
@@ -10,10 +10,6 @@
cd $HOME/gopath/src/github.com/stor4nfv/stor4nfv/ci/ansible
-sed -i 's/^opensds_release.*/opensds_release: v0.1.5/g' group_vars/common.yml
-
-sed -i 's/^nbp_release.*/nbp_release: v0.1.0/g' group_vars/common.yml
-
sed -i 's/^container_enabled.*/container_enabled: false/g' group_vars/common.yml
sed -i 's/^nbp_plugin_type.*/nbp_plugin_type: csi/g' group_vars/common.yml
@@ -34,7 +30,9 @@ sed -i 's|^cluster_network.*|cluster_network: '"$2"'|g' group_vars/ceph/all.yml
sed -i 's/^monitor_interface.*/monitor_interface: eth0/g' group_vars/ceph/all.yml
-sed -i 's/^devices:.*/devices: [\/dev\/loop0, \/dev\/loop1, \/dev\/loop2]/g' group_vars/ceph/osds.yml
+sed -i 's/^devices:.*/devices: [\/dev\/loop0, \/dev\/loop1, \/dev\/loop2]/g' group_vars/ceph/all.yml
+
+sed -i '/dev\/sda/s/^/#/g' group_vars/ceph/all.yml
sed -i 's/^osd_scenario.*/osd_scenario: collocated/g' group_vars/ceph/osds.yml
@@ -45,3 +43,9 @@ sed -i 's/^etcd_host.*/etcd_host: 127.0.0.1/g' group_vars/osdsdb.yml
sed -i 's/^etcd_port.*/etcd_port: 62379/g' group_vars/osdsdb.yml
sed -i 's/^etcd_peer_port.*/etcd_peer_port: 62380/g' group_vars/osdsdb.yml
+
+sed -i 's/^opensds_auth_strategy.*/opensds_auth_strategy: noauth/g' group_vars/auth.yml
+
+sed -i '/check_ansible_version/a \ ignore_errors: yes\' roles/common/tasks/main.yml
+
+sed -i '/- dashboard-installer/s/^/#/g' site.yml
diff --git a/plugins/stor4nfv/roles/stor4nfv/tasks/opensds.yml b/plugins/stor4nfv/roles/stor4nfv/tasks/opensds.yml
index 3252fef..e84ce0a 100644
--- a/plugins/stor4nfv/roles/stor4nfv/tasks/opensds.yml
+++ b/plugins/stor4nfv/roles/stor4nfv/tasks/opensds.yml
@@ -15,6 +15,7 @@
with_items:
- make
- gcc
+ - gawk
- name: copy install_ansible script
remote_user: root
@@ -26,13 +27,6 @@
- name: install ansible
command: su -s /bin/sh -c "/opt/install_ansible.sh"
-- name: install ceph-ansible code
- remote_user: root
- shell: |
- cd /opt;
- 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
shell: |
diff --git a/plugins/stor4nfv/roles/stor4nfv/tasks/post-install.yml b/plugins/stor4nfv/roles/stor4nfv/tasks/post-install.yml
index 182c0a6..017f377 100644
--- a/plugins/stor4nfv/roles/stor4nfv/tasks/post-install.yml
+++ b/plugins/stor4nfv/roles/stor4nfv/tasks/post-install.yml
@@ -31,6 +31,7 @@
become: true
args:
chdir: /opt/ceph-ansible
+ ignore_errors: "true"
when:
- ceph_ansible_exists.stat.exists is defined and ceph_ansible_exists.stat.exists
@@ -43,26 +44,17 @@
- name: ensure osdsctl exists
stat:
- path: /opt/opensds-v0.1.5-linux-{{ imgarch }}/bin/osdsctl
+ path: /opt/opensds-hotpot-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-{{ imgarch }}
- ignore_errors: "true"
- register: csi_dir_exists
-
-- name: create opensds default profile, csi pods
+- name: create opensds default profile
remote_user: root
shell: |
- cp /opt/opensds-v0.1.5-linux-{{ imgarch }}/bin/osdsctl /usr/local/bin;
+ cp /opt/opensds-hotpot-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-{{ imgarch }};
- kubectl create -f csi/deploy/kubernetes;
ignore_errors: "true"
when:
- osdsctl_exists.stat.exists is defined and osdsctl_exists.stat.exists
- - csi_dir_exists.stat.exists is defined and csi_dir_exists.stat.exists