summaryrefslogtreecommitdiffstats
path: root/samples/vnf_samples/nsut
diff options
context:
space:
mode:
Diffstat (limited to 'samples/vnf_samples/nsut')
-rw-r--r--samples/vnf_samples/nsut/acl/tc_heat_rfc2544_ipv4_1rule_1flow_64B_trex.yaml3
-rw-r--r--samples/vnf_samples/nsut/cgnapt/tc_heat_rfc2544_ipv4_1flow_64B_trex.yaml1
-rw-r--r--samples/vnf_samples/nsut/vfw/tc_heat_rfc2544_ipv4_1rule_1flow_64B_trex.yaml1
3 files changed, 0 insertions, 5 deletions
diff --git a/samples/vnf_samples/nsut/acl/tc_heat_rfc2544_ipv4_1rule_1flow_64B_trex.yaml b/samples/vnf_samples/nsut/acl/tc_heat_rfc2544_ipv4_1rule_1flow_64B_trex.yaml
index 6fe826642..3c92e877f 100644
--- a/samples/vnf_samples/nsut/acl/tc_heat_rfc2544_ipv4_1rule_1flow_64B_trex.yaml
+++ b/samples/vnf_samples/nsut/acl/tc_heat_rfc2544_ipv4_1rule_1flow_64B_trex.yaml
@@ -44,7 +44,6 @@ context:
name: yardstick
image: yardstick-samplevnfs
flavor:
- name: yardstick-dpdk-flavor
vcpus: 10
ram: 20480
disk: 4
@@ -60,11 +59,9 @@ context:
vnf:
floating_ip: true
placement: "pgrp1"
- image: yardstick-vnfs
trafficgen_1:
floating_ip: true
placement: "pgrp1"
- image: yardstick-trex
networks:
mgmt:
cidr: '10.0.1.0/24'
diff --git a/samples/vnf_samples/nsut/cgnapt/tc_heat_rfc2544_ipv4_1flow_64B_trex.yaml b/samples/vnf_samples/nsut/cgnapt/tc_heat_rfc2544_ipv4_1flow_64B_trex.yaml
index 56d26be8b..516c727de 100644
--- a/samples/vnf_samples/nsut/cgnapt/tc_heat_rfc2544_ipv4_1flow_64B_trex.yaml
+++ b/samples/vnf_samples/nsut/cgnapt/tc_heat_rfc2544_ipv4_1flow_64B_trex.yaml
@@ -43,7 +43,6 @@ context:
name: yardstick
image: yardstick-samplevnfs
flavor:
- name: yardstick-dpdk-flavor
vcpus: 10
ram: 20480
disk: 4
diff --git a/samples/vnf_samples/nsut/vfw/tc_heat_rfc2544_ipv4_1rule_1flow_64B_trex.yaml b/samples/vnf_samples/nsut/vfw/tc_heat_rfc2544_ipv4_1rule_1flow_64B_trex.yaml
index 2e7ef3d3f..82e89a2a4 100644
--- a/samples/vnf_samples/nsut/vfw/tc_heat_rfc2544_ipv4_1rule_1flow_64B_trex.yaml
+++ b/samples/vnf_samples/nsut/vfw/tc_heat_rfc2544_ipv4_1rule_1flow_64B_trex.yaml
@@ -44,7 +44,6 @@ context:
name: yardstick
image: yardstick-samplevnfs
flavor:
- name: yardstick-dpdk-flavor
vcpus: 10
ram: 20480
disk: 4
ref='#n236'>236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 
# vim: set ts=2 et:
trusty-mitaka-nodes:
  inherits: openstack-phase1

trusty-mitaka:
  inherits: contrail
  overrides:
    #os-data-network: 10.4.8.0/21
    #ceph-cluster-network: 10.4.0.0/21
    #prefer-ipv6: true
    #enable-dvr: true
    #l2-population: true
    region: Canonical
    #source: "cloud:trusty-mitaka"
    openstack-origin: "cloud:trusty-mitaka"
    #ceph-osd-replication-count: 2
    admin-role: admin
    keystone-admin-role: admin
    openstack-origin-git: mitaka

openstack-phase1:
  services:
    nodes:
      charm: "cs:trusty/ubuntu"
      num_units: 2
    ntp:
      charm: "local:trusty/ntp"
      options:
        source: "0.ubuntu.pool.ntp.org 1.ubuntu.pool.ntp.org 2.ubuntu.pool.ntp.org 3.ubuntu.pool.ntp.org"
        auto_peers: false
    zookeeper:
      charm: local:precise/zookeeper
      series: precise
      to:
        - "lxc:nodes=0"
    cassandra:
      charm: local:trusty/cassandra
      to:
        - "lxc:nodes=1"
      options:
        authenticator: AllowAllAuthenticator
  relations:
    - - "ntp:juju-info"
      - "nodes:juju-info"
    - - "ntp:juju-info"
      - "nodes:juju-info"

contrail:
  inherits: openstack-phase2
  overrides:
    admin-role: admin
  relations:
    - [ "contrail-configuration:cassandra", "cassandra:database" ]
    - [ contrail-configuration, zookeeper ]
    - [ contrail-configuration, rabbitmq-server ]
    - [ contrail-configuration, keystone ]
    - [ neutron-api-contrail, contrail-configuration ]
    - [ neutron-api-contrail, keystone ]
    - [ "contrail-control:contrail-api", "contrail-configuration:contrail-api" ]
    - [ "contrail-control:contrail-discovery", "contrail-configuration:contrail-discovery" ]
    - [ "contrail-control:contrail-ifmap", "contrail-configuration:contrail-ifmap" ]
    - [ contrail-control, keystone ]
    - [ "contrail-analytics:cassandra", "cassandra:database" ]
    - [ "contrail-analytics:contrail-analytics-api", "contrail-configuration:contrail-analytics-api" ]
    - [ "contrail-configuration:contrail-discovery", "contrail-analytics:contrail-discovery" ]
    - [ contrail-webui, keystone ]
    - [ "contrail-webui:contrail_api", "contrail-configuration:contrail-api" ]
    - [ "contrail-webui:contrail_discovery", "contrail-configuration:contrail-discovery" ]
    - [ "contrail-webui:cassandra", "cassandra:database" ]
    - [ nova-compute, neutron-contrail ]
    - [ "neutron-contrail:contrail-discovery", "contrail-configuration:contrail-discovery" ]
    - [ "neutron-contrail:contrail-api", "contrail-configuration:contrail-api" ]
    - [ neutron-contrail, keystone ]
    - [ contrail-configuration, ntp ]
    - [ contrail-control, ntp ]
    - [ contrail-analytics, ntp ]
  services:
    contrail-configuration:
      charm: local:trusty/contrail-configuration
      to:
        - "lxc:nodes=0"
    contrail-control:
      charm: local:trusty/contrail-control
      to:
        - "lxc:nodes=1"
    contrail-analytics:
      charm: local:trusty/contrail-analytics
      to:
        - "lxc:nodes=0"
    contrail-webui:
      charm: local:trusty/contrail-webui
      to:
        - "lxc:nodes=1"
    neutron-api-contrail:
      charm: local:trusty/neutron-api-contrail
    neutron-contrail:
      charm: local:trusty/neutron-contrail

openstack-phase2:
  inherits: openstack-phase1
  relations:
    - [ keystone, mysql ]
    - [ nova-cloud-controller, mysql ]
    - [ nova-cloud-controller, rabbitmq-server ]
    - [ nova-cloud-controller, glance ]
    - [ nova-cloud-controller, keystone ]
    - [ nova-compute, nova-cloud-controller ]
    - [ "nova-compute:shared-db", "mysql:shared-db" ]
    - [ "nova-compute:amqp", "rabbitmq-server:amqp" ]
    - [ nova-compute, glance ]
    - [ glance, mysql ]
    - [ glance, keystone ]
    - [ openstack-dashboard, keystone ]
    - [ neutron-api, mysql ]
    - [ neutron-api, rabbitmq-server ]
    - [ neutron-api, nova-cloud-controller ]
    - [ neutron-api, keystone ]
    - [ neutron-api, neutron-api-contrail ]
    - [ "ceilometer:amqp", "rabbitmq-server:amqp" ]
    - [ "ceilometer-agent:ceilometer-service", "ceilometer:ceilometer-service" ]
    - [ "ceilometer:identity-service", "keystone:identity-service" ]
    - [ "ceilometer:identity-notifications", "keystone:identity-notifications" ]
    - [ "ceilometer-agent:nova-ceilometer", "nova-compute:nova-ceilometer" ]
    - [ "ceilometer:shared-db", "mongodb:database" ]
    - [ "heat:shared-db", "mysql:shared-db" ]
    - [ "heat:identity-service", "keystone:identity-service" ]
    - [ "heat:amqp", "rabbitmq-server:amqp" ]
    - [ "cinder:image-service", "glance:image-service" ]
    - [ "cinder:amqp", "rabbitmq-server:amqp" ]
    - [ "cinder:identity-service", "keystone:identity-service" ]
    - [ "cinder:cinder-volume-service", "nova-cloud-controller:cinder-volume-service" ]
    - [ "cinder-ceph:storage-backend", "cinder:storage-backend" ]
    - [ "ceph:client", "nova-compute:ceph" ]
    - [ "cinder:shared-db", "mysql:shared-db" ]
    - [ "ceph:client", "cinder-ceph:ceph" ]
    - [ "ceph:client", "glance:ceph" ]
    - [ "ceph-osd:mon", "ceph:osd" ]
    - [ "ceph-radosgw:mon", "ceph:radosgw" ]
    - [ "ceph-radosgw:identity-service", "keystone:identity-service"]
    #- - nova-compute:lxd
      #- lxd:lxd
    - - congress:shared-db
      - mysql:shared-db
    - - congress:identity-service
      - keystone:identity-service
    - - congress:amqp
      - rabbitmq-server:amqp
  services:
    mysql:
      charm: "local:trusty/percona-cluster"
      options:
        dataset-size: 2G
        max-connections: 10000
      to:
        - "lxc:nodes=0"
    mongodb:
      charm: local:trusty/mongodb
      to:
        - "lxc:nodes=1"
    ceilometer:
      charm: "local:trusty/ceilometer"
      to:
        - "lxc:nodes=0"
    ceilometer-agent:
      charm: "local:trusty/ceilometer-agent"
    heat:
      charm: "local:trusty/heat"
      to:
        - "lxc:nodes=1"
    ceph:
      charm: "local:trusty/ceph"
      num_units: 2
      options:
        fsid: 5a791d94-980b-11e4-b6f6-3c970e8b1cf7
        monitor-secret: AQAi5a9UeJXUExAA+By9u+GPhl8/XiUQ4nwI3A==
        osd-devices: ""
        monitor-count: 1
#        osd-reformat: 'no'
#        ceph-cluster-network: 192.168.0.0/24
#        ceph-public-network: 192.168.0.0/24
      to:
        - "lxc:nodes=0"
        - "lxc:nodes=1"
    ceph-osd:
      charm: "local:trusty/ceph-osd"
      num_units: 2
      options:
        osd-devices: /srv
        osd-reformat: 'yes'
      to:
        - "nodes=0"
        - "nodes=1"
    ceph-radosgw:
      charm: local:trusty/ceph-radosgw
      options:
        use-embedded-webserver: true
        operator-roles: "Member,admin"
      to:
        - "lxc:nodes=0"
    cinder:
      charm: local:trusty/cinder
      options:
        block-device: None
        glance-api-version: 2
      to:
        - "lxc:nodes=1"
    cinder-ceph:
      charm: local:trusty/cinder-ceph
    rabbitmq-server:
      charm: local:trusty/rabbitmq-server
      to:
        - "lxc:nodes=0"
    keystone:
      charm: local:trusty/keystone
      options:
        admin-password: openstack
        admin-token: admin
      to:
        - "lxc:nodes=1"
    openstack-dashboard:
      charm: local:trusty/openstack-dashboard
      options:
        secret: admin
        webroot: /
      to:
        - "lxc:nodes=0"
    nova-compute:
      charm: local:trusty/nova-compute
      options:
        manage-neutron-plugin-legacy-mode: False
      to:
        - "nodes=1"
    nova-cloud-controller:
      charm: local:trusty/nova-cloud-controller
      options:
        network-manager: Neutron
      to:
        - "lxc:nodes=1"
    neutron-api:
      charm: local:trusty/neutron-api
      options:
        manage-neutron-plugin-legacy-mode: False
      to:
        - "lxc:nodes=0"
    glance:
      charm: local:trusty/glance
      to:
        - "lxc:nodes=1"
    opnfv-promise:
      charm: local:trusty/promise
      to:
        - "lxc:nodes=0"
    congress:
      charm: local:trusty/congress
      options:
        #source-branch: stable/mitaka
      to:
        - "lxc:nodes=1"