diff --git a/scripts/install-px b/scripts/install-px index 956b76a6..dc36e442 100644 --- a/scripts/install-px +++ b/scripts/install-px @@ -127,10 +127,6 @@ done kubectl apply -f /tmp/px.yml wait -if [ "$storageless" = true ]; then - INDEX=$(kubectl get ds portworx -n kube-system -o json | jq '.spec.template.spec.containers[0].args | bsearch("-a")') - kubectl patch ds portworx -n kube-system --type='json' -p '[{"op":"remove","path":"/spec/template/spec/containers/0/args/'$INDEX'"}]' -fi curl -sL https://github.com/portworx/pxc/releases/download/v0.35.0/pxc-v0.35.0.linux.amd64.tar.gz | tar xvz -C /tmp curl -so /usr/local/bin/pxc-pxctl https://raw.githubusercontent.com/portworx/pxc/master/component/pxctl/pxc-pxctl diff --git a/scripts/install-px-standalone b/scripts/install-px-standalone deleted file mode 100644 index c707ffb8..00000000 --- a/scripts/install-px-standalone +++ /dev/null @@ -1,14 +0,0 @@ -# Install Portworx standalone - -# To use a journal, set the environment variable journal=auto or journal=/dev/sdb - -if [ "$journal" ]; then - params="-j $journal" -fi - -for i in $(grep node-$cluster- /etc/hosts | cut -f 1 -d " "); do - while ! ssh $i "docker run --entrypoint /runc-entry-point.sh --rm -i --privileged=true -v /opt/pwx:/opt/pwx -v /etc/pwx:/etc/pwx portworx/px-enterprise:$px_version ; /opt/pwx/bin/px-runc install -c disaggregated-cluster -k etcd://master-1:2382 $params -a ; systemctl daemon-reload ; systemctl enable portworx; systemctl start portworx" - do - sleep 1 - done -done diff --git a/templates/async-dr.yml b/templates/async-dr.yml index ec8df5c6..e8c8e6b6 100644 --- a/templates/async-dr.yml +++ b/templates/async-dr.yml @@ -7,7 +7,6 @@ cluster: - id: 2 scripts: ["clusterpair-dr"] env: - operator: true #licenses: "XXXX-XXXX-XXXX-XXXX-XXXX-XXXX-XXXX-XXXX" #DR_BUCKET: "" diff --git a/templates/disaggregated.yml b/templates/disaggregated.yml deleted file mode 100644 index 6ccd9613..00000000 --- a/templates/disaggregated.yml +++ /dev/null @@ -1,13 +0,0 @@ -description: Deploys 3 Kubernetes clusters - cluster 1 will run Portworx in Docker standlone, cluster 2 will run Portworx, cluster 3 will run Portworx, Portworx cluster is stretched across all of the nodes -clusters: 3 -env: - px_suffix: "k=etcd:http://master-1:2382&c=disaggregated-cluster&b=false" - storageless: "true" - operator: "false" -cluster: - - id: 1 - scripts: ["etcd", "install-px-standalone"] - - id: 2 - scripts: ["install-px"] - - id: 3 - scripts: ["install-px"] diff --git a/templates/migration.yml b/templates/migration.yml index 39622649..246c7526 100644 --- a/templates/migration.yml +++ b/templates/migration.yml @@ -8,7 +8,6 @@ cluster: - id: 2 scripts: ["clusterpair"] env: - operator: true #DR_BUCKET: "" # use `-e install_apps=true` to install the optional apps