From 96add565270438b89366907309bc94a6caf4cb0f Mon Sep 17 00:00:00 2001 From: Aleksandr Didenko Date: Tue, 28 Jun 2016 14:06:53 +0200 Subject: [PATCH] Update node labels according to new CCP nodeSelector --- ccp/ccp-deploy.sh | 12 ++++++------ playbooks/ccp-deploy.yaml | 6 ++++++ 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/ccp/ccp-deploy.sh b/ccp/ccp-deploy.sh index 8918f6c4c..2eacf41b9 100755 --- a/ccp/ccp-deploy.sh +++ b/ccp/ccp-deploy.sh @@ -7,12 +7,12 @@ create_network_conf() { } assign_node_roles() { - kubectl label nodes node2 openstack-role=controller - kubectl label nodes node3 openstack-role=controller - kubectl label nodes node4 openstack-role=compute - kubectl label nodes node5 openstack-role=compute - kubectl label nodes node6 openstack-role=compute - kubectl label nodes node7 openstack-role=compute + kubectl label nodes node2 openstack-controller=true + kubectl label nodes node3 openstack-controller=true + kubectl label nodes node4 openstack-controller=true + kubectl label nodes node5 openstack-compute=true + kubectl label nodes node6 openstack-compute=true + kubectl label nodes node7 openstack-compute=true } create_network_conf diff --git a/playbooks/ccp-deploy.yaml b/playbooks/ccp-deploy.yaml index 6e7732733..cc5e0dbbe 100644 --- a/playbooks/ccp-deploy.yaml +++ b/playbooks/ccp-deploy.yaml @@ -2,6 +2,12 @@ pre_tasks: - name: Rsync nodes list synchronize: src=/root/nodes dest=/root/nodes + - name: Rsync MCP scripts and repo + synchronize: + src: /root/ccp/ + dest: /root/ccp/ + rsync_opts: + - "--exclude=/microservices-repos" tasks: - name: Deploy CCP shell: ./ccp-deploy.sh