diff --git a/README.md b/README.md index c7eee78c0..55d63626a 100644 --- a/README.md +++ b/README.md @@ -78,7 +78,10 @@ cd ~/mcp ```bash cd ~/mcp -./deploy-ccp.sh +# Build CCP images +ansible-playbook -i nodes_to_inv.py playbooks/ccp-build.yaml +# Deploy CCP +ansible-playbook -i nodes_to_inv.py playbooks/ccp-deploy.yaml ``` Working with kubernetes diff --git a/deploy-ccp.sh b/bak/deploy-ccp.sh similarity index 100% rename from deploy-ccp.sh rename to bak/deploy-ccp.sh diff --git a/examples/kubernetes/ccp/README.md b/examples/kubernetes/ccp/README.md index 7f49140ba..76f1a34be 100644 --- a/examples/kubernetes/ccp/README.md +++ b/examples/kubernetes/ccp/README.md @@ -18,3 +18,8 @@ iptables -I FORWARD -d 10.210.0.12 -j ACCEPT ``` Where `10.210.0.12` is IP of one of your k8s minions and `32643` is nodePort of Horizon service. + +* You can do the same for novnc: +```bash +echo $(kubectl --namespace=openstack get svc/nova-novncproxy -o go-template='{{(index .spec.ports 0).nodePort}}') +``` diff --git a/playbooks/ccp-build.yaml b/playbooks/ccp-build.yaml index 3766f23b0..c524f5808 100644 --- a/playbooks/ccp-build.yaml +++ b/playbooks/ccp-build.yaml @@ -45,11 +45,11 @@ when: get_svc.stdout.find('registry') == -1 - name: Fetch CCP images - shell: mcp-microservices --config-file=/root/ccp/ccp.conf fetch + shell: "mcp-microservices --config-file=/root/ccp/ccp.conf fetch &> /var/log/ccp-fetch.log" run_once: true - name: Build CCP images - shell: mcp-microservices --config-file=/root/ccp/ccp.conf build + shell: "mcp-microservices --config-file=/root/ccp/ccp.conf build &> /var/log/ccp-build.log" run_once: true - hosts: k8s-cluster diff --git a/playbooks/ccp-deploy.yaml b/playbooks/ccp-deploy.yaml index 9e4b5e95b..08d7e805b 100644 --- a/playbooks/ccp-deploy.yaml +++ b/playbooks/ccp-deploy.yaml @@ -20,7 +20,7 @@ run_once: true - name: Deploy CCP - shell: mcp-microservices --config-file=/root/ccp/ccp.conf deploy + shell: "mcp-microservices --config-file=/root/ccp/ccp.conf deploy &> /var/log/ccp-deploy.log" args: chdir: /root/ccp run_once: true