Skip to content

Commit

Permalink
NDS-802 / NDS-803: Fixed broken deployment in 1.0.9 (#71)
Browse files Browse the repository at this point in the history
* Fix missed change from NDS-562 

See PR #64

* Reverted accidental change

from when I tried to do NDS-498, and needed to back out my changes

* NDS-802: Fix apiserver crash looping on 1.0.9
  • Loading branch information
bodom0015 committed Mar 28, 2017
1 parent fc33182 commit 78b9a57
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion FILES.deploy-tools/root/playbooks/openstack-delete.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
- local_action:
module: file
state: absent
path: "/root/SAVED_AND_SENSITIVE/{{ logical_cluster_name }}_cache/{{ inventory_hostname }}"
path: "/root/SAVED_AND_SENSITIVE/inventory_cache/{{ inventory_hostname }}"

# delete docker vols
- name: Remove docker volumes
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
failed_when: kubesyssecret.rc < 0

- name: NDSLabs TLS Secret| create ndslabs-tls-secret - kube-system
command: /opt/bin/kubectl create secret generic ndslabs-tls-secret --from-file=tls.crt=/tmp/ndslabs.cert --from-file=tls.key=/tmp/ndslabs.key --namespace=kube-system
command: /opt/bin/kubectl create secret generic ndslabs-tls-secret --from-file=tls.crt="/tmp/{{ logical_cluster_name }}.cert" --from-file=tls.key="/tmp/{{ logical_cluster_name }}.key" --namespace=kube-system
when: kubesyssecret.rc != 0


Expand All @@ -25,4 +25,4 @@
command: /opt/bin/kubectl create --namespace=kube-system -f "/tmp/kube-system-ingress.yaml"
when: ingress.rc != 0



Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ spec:
- name: SMTP_HOST
value: "{{ smtp_host }}"
- name: SMTP_TLS
value: "{{ smtp_tls }}"
value: "{{ smtp_tls | bool | lower }}"
volumes:
- hostPath:
path: {{ clusterfs_vol_path }}
Expand Down

0 comments on commit 78b9a57

Please sign in to comment.