switch kube-network-manager to addon

Change-Id: I65910352eae2f769720bca775041cdd1a34521a9
diff --git a/tests/pillar/master_contrail.sls b/tests/pillar/master_contrail.sls
new file mode 100644
index 0000000..b1d5037
--- /dev/null
+++ b/tests/pillar/master_contrail.sls
@@ -0,0 +1,100 @@
+kubernetes:
+  common:
+    network:
+      engine: opencontrail
+    hyperkube:
+      image: hyperkube-amd64:v1.5.0-beta.3-1
+  master:
+    addons:
+      dns:
+        domain: cluster.local
+        enabled: false
+        replicas: 1
+        server: 10.254.0.10
+        autoscaler:
+          enabled: true
+      heapster_influxdb:
+        enabled: true
+        public_ip: 185.22.97.132
+      dashboard:
+        enabled: true
+        public_ip: 185.22.97.131
+      helm:
+        enabled: true
+        tiller_image: gcr.io/kubernetes-helm/tiller:v2.2.3
+      netchecker:
+        enabled: true
+        namespace: netchecker
+        port: 80
+        interval: 60
+        server_image: image
+        agent_image: image
+      calico_policy:
+        enabled: true
+        namespace: kube-system
+        image: image
+      kube_network_manager:
+        enabled: true
+        namespace: kube-system
+    admin:
+      password: password
+      username: admin
+    registry:
+        host: tcpcloud
+    host:
+      name: node040
+    apiserver:
+      address: 10.0.175.100
+      insecure_address: 127.0.0.1
+      insecure_port: 8080
+    ca: kubernetes
+    enabled: true
+    unschedulable: true
+    etcd:
+      members:
+      - host: 10.0.175.100
+        name: node040
+    kubelet:
+      allow_privileged: true
+    network:
+      engine: opencontrail
+      host: 10.0.170.70
+      port: 8082
+      default_domain: default-domain
+      default_project: default-domain:default-project
+      public_network: default-domain:default-project:Public
+      public_ip_range: 185.22.97.128/26
+      private_ip_range: 10.150.0.0/16
+      service_cluster_ip_range: 10.254.0.0/16
+      network_label: name
+      service_label: uses
+      cluster_service: kube-system/default
+      image: tianon/true
+    service_addresses: 10.254.0.0/16
+    storage:
+      engine: glusterfs
+      members:
+      - host: 10.0.175.101
+        port: 24007
+      - host: 10.0.175.102
+        port: 24007
+      - host: 10.0.175.103
+        port: 24007
+      port: 24007
+    token:
+      admin: DFvQ8GJ9JD4fKNfuyEddw3rjnFTkUKsv
+      controller_manager: EreGh6AnWf8DxH8cYavB2zS029PUi7vx
+      dns: RAFeVSE4UvsCz4gk3KYReuOI5jsZ1Xt3
+      kube_proxy: DFvQ8GelB7afH3wClC9romaMPhquyyEe
+      kubelet: 7bN5hJ9JD4fKjnFTkUKsvVNfuyEddw3r
+      logging: MJkXKdbgqRmTHSa2ykTaOaMykgO6KcEf
+      monitoring: hnsj0XqABgrSww7Nqo7UVTSZLJUt2XRd
+      scheduler: HY1UUxEPpmjW4a1dDLGIANYQp1nZkLDk
+    version: v1.2.4
+    namespace:
+      kube-system:
+        enabled: true
+      netchecker:
+        enabled: true
+    hyperkube:
+      hash: hnsj0XqABgrSww7Nqo7UVTSZLJUt2XRd