From db43a275ff0b9993f2b62a9c8ff8e9f553a9d94f Mon Sep 17 00:00:00 2001 From: yesac Date: Sat, 25 Jan 2020 10:44:01 -0700 Subject: [PATCH] Changed manifest to container builder method --- Tungsten-Fabric-Centos-one-line-install-on-k8s.md | 2 +- Tungsten-Fabric-Ubuntu-one-line-install-on-k8s.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Tungsten-Fabric-Centos-one-line-install-on-k8s.md b/Tungsten-Fabric-Centos-one-line-install-on-k8s.md index ad59c78..a47713b 100644 --- a/Tungsten-Fabric-Centos-one-line-install-on-k8s.md +++ b/Tungsten-Fabric-Centos-one-line-install-on-k8s.md @@ -24,7 +24,7 @@ This wiki will describe the most simplest of all: **A single yaml based install* {% raw %} ``` -K8S_MASTER_IP=x.x.x.x; CONTRAIL_REPO="docker.io\/opencontrailnightly"; CONTRAIL_RELEASE="latest"; mkdir -pm 777 /var/lib/contrail/kafka-logs; curl https://raw.githubusercontent.com/Juniper/contrail-kubernetes-docs/master/install/kubernetes/templates/contrail-single-step-cni-install-centos.yaml | sed "s/{{ K8S_MASTER_IP }}/$K8S_MASTER_IP/g; s/{{ CONTRAIL_REPO }}/$CONTRAIL_REPO/g; s/{{ CONTRAIL_RELEASE }}/$CONTRAIL_RELEASE/g" | kubectl apply -f - +export MASTER_IP="x.x.x.x" ; mkdir /root/tf ; git clone https://github.com/Juniper/contrail-container-builder /root/tf/contrail-container-builder ; mv /root/tf/contrail-container-builder/kubernetes/sample_config_files/common.env.kubernetes /root/tf/contrail-container-builder/common.env ; sed -i "s/10.84.13.54/$MASTER_IP/" /root/tf/contrail-container-builder/common.env ; /root/tf/contrail-container-builder/kubernetes/manifests/./resolve-manifest.sh /root/tf/contrail-container-builder/kubernetes/manifests/contrail-standalone-kubernetes.yaml > /root/tf/tf.yml ; /root/tf/contrail-container-builder/kubernetes/manifests/./set-node-labels.sh ; kubectl apply -f /root/tf/tf.yml ``` {% endraw %} diff --git a/Tungsten-Fabric-Ubuntu-one-line-install-on-k8s.md b/Tungsten-Fabric-Ubuntu-one-line-install-on-k8s.md index ff16959..b4d2ebc 100644 --- a/Tungsten-Fabric-Ubuntu-one-line-install-on-k8s.md +++ b/Tungsten-Fabric-Ubuntu-one-line-install-on-k8s.md @@ -18,7 +18,7 @@ This wiki will describe the most simplest of all: **A single yaml based install* {% raw %} ``` -K8S_MASTER_IP=x.x.x.x; CONTRAIL_REPO="docker.io\/opencontrailnightly"; CONTRAIL_RELEASE="latest"; mkdir -pm 777 /var/lib/contrail/kafka-logs; curl https://raw.githubusercontent.com/Juniper/contrail-kubernetes-docs/master/install/kubernetes/templates/contrail-single-step-cni-install-ubuntu.yaml | sed "s/{{ K8S_MASTER_IP }}/$K8S_MASTER_IP/g; s/{{ CONTRAIL_REPO }}/$CONTRAIL_REPO/g; s/{{ CONTRAIL_RELEASE }}/$CONTRAIL_RELEASE/g" | kubectl apply -f - +export MASTER_IP="x.x.x.x" ; mkdir /root/tf ; git clone https://github.com/Juniper/contrail-container-builder /root/tf/contrail-container-builder ; mv /root/tf/contrail-container-builder/kubernetes/sample_config_files/common.env.kubernetes /root/tf/contrail-container-builder/common.env ; sed -i "s/10.84.13.54/$MASTER_IP/" /root/tf/contrail-container-builder/common.env ; /root/tf/contrail-container-builder/kubernetes/manifests/./resolve-manifest.sh /root/tf/contrail-container-builder/kubernetes/manifests/contrail-standalone-kubernetes.yaml > /root/tf/tf.yml ; sed -i "s/kernel-init/kernel-build-init/" /root/tf/tf.yml ; /root/tf/contrail-container-builder/kubernetes/manifests/./set-node-labels.sh ; kubectl apply -f /root/tf/tf.yml ``` {% endraw %}