diff options
Diffstat (limited to 'deploy')
4 files changed, 17 insertions, 2 deletions
diff --git a/deploy/adapters/ansible/kubernetes/roles/kargo/tasks/main.yml b/deploy/adapters/ansible/kubernetes/roles/kargo/tasks/main.yml index d3dcb878..16d0b2c0 100644 --- a/deploy/adapters/ansible/kubernetes/roles/kargo/tasks/main.yml +++ b/deploy/adapters/ansible/kubernetes/roles/kargo/tasks/main.yml @@ -83,6 +83,12 @@ tags: - ansible +- name: enable helm + lineinfile: + dest: /opt/kargo_k8s/inventory/group_vars/k8s-cluster.yml + regexp: '^helm_enabled:' + line: 'helm_enabled: {{ helm_flag }}' + - name: run kargo playbook shell: | cd /opt/kargo_k8s diff --git a/deploy/adapters/ansible/kubernetes/roles/kargo/vars/main.yml b/deploy/adapters/ansible/kubernetes/roles/kargo/vars/main.yml new file mode 100644 index 00000000..2d396d06 --- /dev/null +++ b/deploy/adapters/ansible/kubernetes/roles/kargo/vars/main.yml @@ -0,0 +1,2 @@ +--- +helm_flag: true diff --git a/deploy/adapters/ansible/roles/storage/tasks/ceph.yml b/deploy/adapters/ansible/roles/storage/tasks/ceph.yml index e024c671..50476c7b 100644 --- a/deploy/adapters/ansible/roles/storage/tasks/ceph.yml +++ b/deploy/adapters/ansible/roles/storage/tasks/ceph.yml @@ -43,3 +43,10 @@ line: "losetup -f /var/{{ item }}.img" insertbefore: "{{ rc_local_insert_before }}" with_items: "{{ ceph_osd_images }}" + +- name: Create ceph partitions at boot time + lineinfile: + dest: "{{ rc_local }}" + line: "partprobe -s {{ item }}" + insertbefore: "{{ rc_local_insert_before }}" + with_items: "{{ ceph_loopback.results | map(attribute='stdout') | list }}" diff --git a/deploy/conf/cluster.conf b/deploy/conf/cluster.conf index ddcbb6c3..c9e565ad 100644 --- a/deploy/conf/cluster.conf +++ b/deploy/conf/cluster.conf @@ -8,8 +8,8 @@ else export ADAPTER_OS_PATTERN=${ADAPTER_OS_PATTERN:-'(?i)CentOS-7.*16.*'} fi -# newton -export OPENSTACK_VERSION=${OPENSTACK_VERSION:-"newton"} +# ocata +export OPENSTACK_VERSION=${OPENSTACK_VERSION:-"ocata"} # don't touch this export ADAPTER_TARGET_SYSTEM_PATTERN="^openstack$" |