comment pgw until it is ready

Change-Id: Ie7cc3a46f777a5a87c446255442bcee21ecfd47e
diff --git a/mcord/Makefile b/mcord/Makefile
index 2ce8584..b2fc4da 100644
--- a/mcord/Makefile
+++ b/mcord/Makefile
@@ -55,8 +55,8 @@
         
 	sudo cp id_rsa key_import/vBBU_rsa
 	sudo cp id_rsa.pub key_import/vBBU_rsa.pub
-	sudo cp id_rsa key_import/vPGW_rsa
-	sudo cp id_rsa.pub key_import/vPGW_rsa.pub
+	sudo cp id_rsa key_import/vPGWC_rsa
+	sudo cp id_rsa.pub key_import/vPGWC_rsa.pub
 	sudo cp id_rsa key_import/onos_rsa
 	sudo cp id_rsa key_import/onos_rsa.pub
 	$(RUN_TOSCA_BOOTSTRAP) $(SERVICE_DIR)/openstack/xos/openstack-onboard.yaml
diff --git a/mcord/mcord.yaml b/mcord/mcord.yaml
index 0af1a5f..335dfed 100644
--- a/mcord/mcord.yaml
+++ b/mcord/mcord.yaml
@@ -122,9 +122,9 @@
           icon_url: /static/mCordServices/service_server.png

           view_url: /admin/mcord/vbbucomponent

           public_key: { get_artifact: [ SELF, pubkey, LOCAL_FILE] }

-          private_key_fn: /opt/xos/services/vBBU/keys/vBBU_rsa

+          private_key_fn: /opt/xos/services/vbbu/keys/vBBU_rsa

       artifacts:

-          pubkey: /opt/xos/services/vBBU/keys/vBBU_rsa.pub

+          pubkey: /opt/xos/services/vbbu/keys/vBBU_rsa.pub

 

     vPGWC:

       type: tosca.nodes.MCORDService

@@ -134,9 +134,11 @@
           icon_url: /static/mCordServices/service_server.png

           view_url: /admin/mcord/vpgwccomponent

           public_key: { get_artifact: [ SELF, pubkey, LOCAL_FILE] }

-          private_key_fn: /opt/xos/configurations/mcord/mcord_private_key

+          #private_key_fn: /opt/xos/services/vpgwc/keys/vPGWC_rsa

+          private_key_fn: /opt/xos/services/vbbu/keys/vBBU_rsa

       artifacts:

-          pubkey: /opt/xos/configurations/mcord/mcord_public_key

+          #pubkey: /opt/xos/services/vpgwc/keys/vPGWC_rsa.pub

+          pubkey: /opt/xos/services/vbbu/keys/vBBU_rsa.pub

 

     m1.xlarge:

       type: tosca.nodes.Flavor

@@ -315,18 +317,19 @@
       properties:

           network: noauto

           default_node: compute10

-

-    mysite_VPGWC_Component:

-      description: MCORD Service default Component

-      type: tosca.nodes.VPGWCComponent

-      requirements:

-          - provider_service:

-              node: vPGWC

-              relationship: tosca.relationships.MemberOfService

-          - vpgwc_slice:

-              node: mysite_vpgwc_slice1

-              relationship: tosca.relationships.MemberOfSlice

-      properties:

-          display_message: vPGWC looks good!

-          s5s8_pgw_tag: 300

+    

+    # TODO: will uncomment it when pgw service is ready

+    #mysite_VPGWC_Component:

+    #  description: MCORD Service default Component

+    #  type: tosca.nodes.VPGWCComponent

+    #  requirements:

+    #      - provider_service:

+    #          node: vPGWC

+    #          relationship: tosca.relationships.MemberOfService

+    #      - vpgwc_slice:

+    #          node: mysite_vpgwc_slice1

+    #          relationship: tosca.relationships.MemberOfSlice

+    #  properties:

+    #      display_message: vPGWC looks good!

+    #      s5s8_pgw_tag: 300