added the labconfig file for att virpod1. Remove the mac
[joid.git] / ci / odl / juju-deployer / ovs-odl-tip.yaml
index db41fd7..c01dad1 100644 (file)
 # vim: set ts=2 et:
+trusty-mitaka-nodes:
+  inherits: openstack-phase1
+  overrides:
+    series: trusty
+
+trusty-mitaka:
+  inherits: openstack-phase2
+  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"
+    series: trusty
+    ceph-osd-replication-count: 2
+    admin-role: admin
+    keystone-admin-role: admin
+
 openstack-phase1:
   series: trusty
   services:
-    nodes-api:
-      charm: "cs:trusty/ubuntu"
-      num_units: 1
-      constraints: tags=control
-    nodes-compute:
+    nodes:
       charm: "cs:trusty/ubuntu"
-      num_units: 1
-      constraints: tags=compute
-    "ntp":
-      charm: "cs:trusty/ntp"
+      num_units: 2
+    ntp:
+      charm: "local:trusty/ntp"
   relations:
     - - "ntp:juju-info"
-      - "nodes-api:juju-info"
+      - "nodes:juju-info"
     - - "ntp:juju-info"
-      - "nodes-compute:juju-info"
+      - "nodes:juju-info"
+
 openstack-phase2:
   inherits: openstack-phase1
-  services:
-    "mysql":
-      branch: "lp:~openstack-charmers/charms/trusty/percona-cluster/next"
-      num_units: 1
-      options:
-        "dataset-size": 2G
-        "max-connections": 10000
-      to:
-        - "lxc:nodes-api=0"
-    "ceilometer":
-      branch: "lp:~openstack-charmers/charms/trusty/ceilometer/next"
-      num_units: 1
-      to:
-        - "lxc:nodes-api=0"
-    "ceilometer-agent":
-      branch: "lp:~openstack-charmers/charms/trusty/ceilometer-agent/next"
-    "mongodb":
-      charm: "cs:trusty/mongodb"
-      num_units: 1
-      to:
-        - "lxc:nodes-api=0"
-    "heat":
-      branch: "lp:~openstack-charmers/charms/trusty/heat/next"
-      to:
-        - "lxc:nodes-api=0"
-    ceph:
-      branch: "lp:~openstack-charmers/charms/trusty/ceph/next"
-      num_units: 1
-      options:
-        fsid: 5a791d94-980b-11e4-b6f6-3c970e8b1cf7
-        monitor-secret: AQAi5a9UeJXUExAA+By9u+GPhl8/XiUQ4nwI3A==
-        osd-devices: /srv
-        monitor-count: 1
-        osd-reformat: 'no'
-#        ceph-cluster-network: 192.168.0.0/24
-#        ceph-public-network: 192.168.0.0/24
-      to:
-        - "nodes-compute=0"
-#        - "nodes-compute=1"
-#    ceph-osd:
-#      charm: cs:trusty/ceph-osd
-#      num_units: 1
-#      options:
-#        osd-devices: /dev/sdb
-#        osd-reformat: 'yes'
-#      to:
-#        - "lxc:nodes-api=0"
-#    ceph-radosgw:
-#      charm: cs:trusty/ceph-radosgw
-#      num_units: 1
-#      options:
-#        use-embedded-webserver: true
-#      to:
-
-#        - "lxc:nodes-api=0"
-    cinder:
-      branch: "lp:~openstack-charmers/charms/trusty/cinder/next"
-      num_units: 1
-      options:
-        block-device: None
-        glance-api-version: 2
-#        ha-mcastport: 5401
-#        openstack-origin-git: include-file://cinder-master.yaml
-      to:
-        - "lxc:nodes-api=0"
-    cinder-ceph:
-      branch: "lp:~openstack-charmers/charms/trusty/cinder-ceph/next"
-    "rabbitmq-server":
-      branch: lp:~openstack-charmers/charms/trusty/rabbitmq-server/next
-      num_units: 1
-      to:
-        - "lxc:nodes-api=0"
-    "keystone":
-      branch: lp:~openstack-charmers/charms/trusty/keystone/next
-      num_units: 1
-      options:
-        openstack-origin-git: include-file://keystone-master.yaml
-        "admin-password": openstack
-        "admin-token": admin
-      to:
-        - "lxc:nodes-api=0"
-    "openstack-dashboard":
-      branch: lp:~openstack-charmers/charms/trusty/openstack-dashboard/next
-      num_units: 1
-      options:
-        openstack-origin-git: include-file://horizon-master.yaml
-        secret: admin
-      to:
-        - "lxc:nodes-api=0"
-    "nova-compute":
-      branch: lp:~openstack-charmers/charms/trusty/nova-compute/next
-      num_units: 1
-      options:
-        openstack-origin-git: include-file://nova-master.yaml
-        "enable-live-migration": False
-        "manage-neutron-plugin-legacy-mode": False
-      to:
-        - "nodes-compute=0"
-#        - "nodes-compute=1"
-    "nova-cloud-controller":
-      branch: lp:~openstack-charmers/charms/trusty/nova-cloud-controller/next
-      num_units: 1
-      options:
-        openstack-origin-git: include-file://nova-master.yaml
-        "console-access-protocol": novnc
-        "network-manager": Neutron
-        "quantum-security-groups": "yes"
-      to:
-        - "lxc:nodes-api=0"
-    "neutron-api":
-      branch: lp:~openstack-charmers/charms/trusty/neutron-api/next
-      num_units: 1
-      options:
-        neutron-security-groups: True
-        manage-neutron-plugin-legacy-mode: False
-      to:
-        - "lxc:nodes-api=0"
-    neutron-gateway:
-      branch: lp:~openstack-charmers/charms/trusty/neutron-gateway/next
-      options:
-        openstack-origin-git: include-file://neutron-master.yaml
-#        "ext-port": "eth1"
-        plugin: ovs-odl
-        instance-mtu: 1400
-      to:
-        - "nodes-api=0"
-    odl-controller:
-      branch: lp:~openstack-charmers/charms/trusty/odl-controller/next
-      options:
-        #install-url: "https://nexus.opendaylight.org/content/groups/public/org/opendaylight/integration/distribution-karaf/0.2.4-Helium-SR4/distribution-karaf-0.2.4-Helium-SR4.tar.gz"
-        install-url: "https://nexus.opendaylight.org/content/groups/public/org/opendaylight/integration/distribution-karaf/0.3.3-Lithium-SR3/distribution-karaf-0.3.3-Lithium-SR3.tar.gz"
-        profile: "openvswitch-odl-lithium"
-        http-proxy: "http://squid.internal:3128"
-        https-proxy: "http://squid.internal:3128"
-      to:
-        - "lxc:nodes-api=1"
-    "glance":
-      branch: lp:~openstack-charmers/charms/trusty/glance/next
-      num_units: 1
-      options:
-        openstack-origin-git: include-file://glance-master.yaml
-      to:
-        - "lxc:nodes-api=0"
-    opnfv-promise:
-      branch: lp:~narindergupta/charms/trusty/promise/trunk
-      num_units: 1
-      to:
-        - "lxc:nodes-api=0"
-    neutron-api-odl:
-      branch: lp:~openstack-charmers/charms/trusty/neutron-api-odl/vpp
-      options:
-        overlay-network-type: 'vxlan gre'
-        security-groups: True
-    openvswitch-odl:
-      branch: lp:~openstack-charmers/charms/trusty/openvswitch-odl/trunk
   relations:
     - - "neutron-api:neutron-plugin-api-subordinate"
       - "neutron-api-odl:neutron-plugin-api-subordinate"
@@ -259,41 +121,155 @@ openstack-phase2:
       - "cinder-ceph:ceph"
     - - "ceph:client"
       - "glance:ceph"
-trusty-liberty-nodes:
-  inherits: openstack-phase1
-  overrides:
-    series: trusty
-
-trusty-liberty:
-  inherits: openstack-phase2
-  overrides:
-    #os-data-network: 10.4.8.0/21
-    #prefer-ipv6: true
-    region: Canonical
-    source: "cloud:trusty-liberty"
-    "openstack-origin": "cloud:trusty-liberty"
-    series: trusty
-    ceph-osd-replication-count: 1
-    admin-role: admin
-    keystone-admin-role: admin
-
-trusty-kilo-nodes:
-  inherits: openstack-phase1
-  overrides:
-    series: trusty
-
-# master
-trusty-kilo:
-  inherits: openstack-phase2
-  series: trusty
-  overrides:
-    region: Canonical
-    #os-data-network: 10.4.8.0/21
-    #prefer-ipv6: true
-    openstack-origin: cloud:trusty-kilo
-    source: cloud:trusty-kilo
-    series: trusty
-    ceph-osd-replication-count: 1
-    admin-role: admin
-    keystone-admin-role: admin
-
+    - - "ceph-osd:mon"
+      - "ceph:osd"
+    - - "ceph-radosgw:mon"
+      - "ceph:radosgw"
+    - - "ceph-radosgw:identity-service"
+      - "keystone:identity-service"
+    #- - nova-compute:lxd
+      #- lxd:lxd
+  services:
+    mysql:
+      charm: "local:trusty/percona-cluster"
+      options:
+        dataset-size: 2G
+        max-connections: 10000
+      to:
+        - "lxc:nodes=0"
+    ceilometer:
+      charm: "local:trusty/ceilometer"
+      to:
+        - "lxc:nodes=1"
+    ceilometer-agent:
+      charm: "local:trusty/ceilometer-agent"
+    mongodb:
+      charm: "local:trusty/mongodb"
+      to:
+        - "lxc:nodes=0"
+    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: 2
+#        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=1"
+    cinder:
+      charm: "local:trusty/cinder"
+      options:
+        block-device: None
+        glance-api-version: 2
+#        ha-mcastport: 5401
+#        openstack-origin-git: include-file://cinder-master.yaml
+      to:
+        - "lxc:nodes=0"
+    cinder-ceph:
+      charm: "local:trusty/cinder-ceph"
+    rabbitmq-server:
+      charm: local:trusty/rabbitmq-server
+      to:
+        - "lxc:nodes=1"
+    keystone:
+      charm: local:trusty/keystone
+      options:
+        openstack-origin-git: include-file://keystone-master.yaml
+        admin-password: openstack
+        admin-token: admin
+      to:
+        - "lxc:nodes=1"
+    openstack-dashboard:
+      charm: local:trusty/openstack-dashboard
+      options:
+        openstack-origin-git: include-file://horizon-master.yaml
+        secret: admin
+      to:
+        - "lxc:nodes=0"
+    nova-compute:
+      charm: local:trusty/nova-compute
+      options:
+        openstack-origin-git: include-file://nova-master.yaml
+        enable-live-migration: true
+        enable-resize: true
+        manage-neutron-plugin-legacy-mode: false
+        migration-auth-type: ssh
+        #hugepages: "50%"
+        #virt-type: lxd
+      to:
+        - "nodes=1"
+    nova-cloud-controller:
+      charm: local:trusty/nova-cloud-controller
+      options:
+        openstack-origin-git: include-file://nova-master.yaml
+        console-access-protocol: novnc
+        network-manager: Neutron
+      to:
+        - "lxc:nodes=1"
+    neutron-api:
+      charm: local:trusty/neutron-api
+      options:
+        neutron-security-groups: True
+        flat-network-providers: "*"
+      to:
+        - "lxc:nodes=0"
+    neutron-gateway:
+      charm: local:trusty/neutron-gateway
+      options:
+        openstack-origin-git: include-file://neutron-master.yaml
+        #ext-port: "eth1"
+        plugin: ovs-odl
+        instance-mtu: 1400
+      to:
+        - "nodes=0"
+    odl-controller:
+      charm: local:trusty/odl-controller
+      options:
+        install-url: "https://nexus.opendaylight.org/content/repositories/opendaylight.release/org/opendaylight/integration/distribution-karaf/0.4.2-Beryllium-SR2/distribution-karaf-0.4.2-Beryllium-SR2.tar.gz"
+        profile: "openvswitch-odl-beryllium"
+        http-proxy: "http://squid.internal:3128"
+        https-proxy: "http://squid.internal:3128"
+      to:
+        - "lxc:nodes=1"
+    glance:
+      charm: local:trusty/glance
+      options:
+        openstack-origin-git: include-file://glance-master.yaml
+      to:
+        - "lxc:nodes=0"
+    opnfv-promise:
+      branch: lp:~narindergupta/charms/trusty/promise/trunk
+      to:
+        - "lxc:nodes=1"
+    neutron-api-odl:
+      charm: local:trusty/neutron-api-odl
+      options:
+        overlay-network-type: 'vxlan gre'
+        security-groups: True
+    openvswitch-odl:
+      charm: local:trusty/openvswitch-odl