X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=ci%2Fnosdn%2Fjuju-deployer%2Fovs-nosdn-nonha.yaml;h=de7f75479d42279f98105d7a9ccfa41010f7d4f2;hb=12ebb176750bd938d145279981026d38bc46b2b2;hp=e7d9dc3ad13c96eef1574319193273b6f0d734bd;hpb=d39c5b22b0aadefbd012cb200a857386f3545d60;p=joid.git

diff --git a/ci/nosdn/juju-deployer/ovs-nosdn-nonha.yaml b/ci/nosdn/juju-deployer/ovs-nosdn-nonha.yaml
index e7d9dc3a..de7f7547 100644
--- a/ci/nosdn/juju-deployer/ovs-nosdn-nonha.yaml
+++ b/ci/nosdn/juju-deployer/ovs-nosdn-nonha.yaml
@@ -1,164 +1,35 @@
 # vim: set ts=2 et:
+trusty-mitaka-nodes:
+  inherits: openstack-phase1
+
+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"
+    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"
-    - - "ntp:juju-info"
-      - "nodes-compute:juju-info"
-openstack-phase2: 
+      - "nodes:juju-info"
+
+openstack-phase2:
   inherits: openstack-phase1
-  services:
-    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"
-    ceph:
-      branch: "lp:~openstack-charmers/charms/trusty/ceph/next"
-      num_units: 1
-      options:
-        monitor-count: 1
-        fsid: 5a791d94-980b-11e4-b6f6-3c970e8b1cf7
-        monitor-secret: AQAi5a9UeJXUExAA+By9u+GPhl8/XiUQ4nwI3A==
-        osd-devices: ""
-#        osd-reformat: 'yes'
-#        ceph-cluster-network: 192.168.0.0/24
-#        ceph-public-network: 192.168.0.0/24
-      to:
-        - "lxc:nodes-api=0"
-    ceph-osd:
-      branch: "lp:~openstack-charmers/charms/trusty/ceph-osd/next"
-      num_units: 1
-      options:
-        osd-devices: /srv
-        osd-reformat: 'yes'
-      to:
-        - "nodes-compute=0"
-    ceph-radosgw:
-      branch: "lp:~openstack-charmers/charms/trusty/ceph-radosgw/next"
-      num_units: 1
-      options:
-        use-embedded-webserver: true
-        operator-roles: "Member,admin"
-      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
-      to:
-        - "lxc:nodes-api=0"
-    cinder-ceph:
-      branch: "lp:~openstack-charmers/charms/trusty/cinder-ceph/next"
-      num_units: 0
-    glance:
-      branch: "lp:~openstack-charmers/charms/trusty/glance/next"
-      num_units: 1
-      options:
-        ha-mcastport: 5402
-      to:
-        - "lxc:nodes-api=0"
-    opnfv-promise:
-      branch: lp:~narindergupta/charms/trusty/promise/trunk
-      num_units: 1
-      to:
-        - "lxc:nodes-api=0"
-    keystone:
-      branch: "lp:~openstack-charmers/charms/trusty/keystone/next"
-      num_units: 1
-      options:
-        admin-password: openstack
-        admin-token: admin
-        ha-mcastport: 5403
-      to:
-        - "lxc:nodes-api=0"
-    mongodb:
-      charm: cs:trusty/mongodb
-      num_units: 1
-      to:
-        - "lxc:nodes-api=0"
-    mysql:
-      branch: "lp:~openstack-charmers/charms/trusty/percona-cluster/next"
-      num_units: 1
-      options:
-        max-connections: 20000
-      to:
-        - "lxc:nodes-api=0"
-    neutron-api:
-      branch: "lp:~openstack-charmers/charms/trusty/neutron-api/next"
-      num_units: 1
-      options:
-        neutron-security-groups: true
-      to:
-        - "lxc:nodes-api=0"
-    neutron-gateway:
-      branch: "lp:~openstack-charmers/charms/trusty/neutron-gateway/next"
-      num_units: 1
-      options:
-        instance-mtu: 1400
-        #ext-port: "eth1"
-      to:
-        - "nodes-api=0"
-    neutron-openvswitch:
-      branch: "lp:~openstack-charmers/charms/trusty/neutron-openvswitch/next"
-      num_units: 0
-    nova-cloud-controller:
-      branch: "lp:~openstack-charmers/charms/trusty/nova-cloud-controller/next"
-      num_units: 1
-      options:
-        network-manager: Neutron
-        quantum-security-groups: 'yes'
-      to:
-        - "lxc:nodes-api=0"
-    nova-compute:
-      branch: "lp:~openstack-charmers/charms/trusty/nova-compute/next"
-      num_units: 1
-      options:
-        enable-live-migration: true
-        enable-resize: true
-        manage-neutron-plugin-legacy-mode: false
-        migration-auth-type: ssh
-        enable-resize: true
-      to:
-        - "nodes-compute=0"
-#        - "nodes-compute=1"
-#        - "nodes-api=0"
-#        - "nodes-api=1"
-#        - "nodes-api=2"
-    openstack-dashboard:
-      branch: "lp:~openstack-charmers/charms/trusty/openstack-dashboard/next"
-      num_units: 1
-      options:
-        secret: admin
-        webroot: /
-      to:
-        - "lxc:nodes-api=0"
-    rabbitmq-server:
-      branch: "lp:~openstack-charmers/charms/trusty/rabbitmq-server/next"
-      num_units: 1
-      to:
-        - "lxc:nodes-api=0"
-    heat:
-      branch: "lp:~openstack-charmers/charms/trusty/heat/next"
-      to:
-        - "lxc:nodes-api=0"
   relations:
     - - nova-compute:amqp
       - rabbitmq-server:amqp
@@ -250,69 +121,143 @@ openstack-phase2:
       - keystone:identity-service
     - - heat:amqp
       - rabbitmq-server:amqp
-trusty-liberty-nodes:
-  inherits: openstack-phase1
-  overrides:
-    series: trusty
-
-trusty-liberty:
-  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
-    #ext-port: "eth1"
-    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
-
-trusty-kilo:
-  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
-    #ext-port: "eth1"
-    region: Canonical
-    source: "cloud:trusty-kilo"
-    openstack-origin: "cloud:trusty-kilo"
-    series: trusty
-    ceph-osd-replication-count: 1
-    admin-role: admin
-    keystone-admin-role: admin
-
-trusty-juno-nodes:
-  inherits: openstack-phase1
-  overrides:
-    series: trusty
-
-trusty-juno:
-  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
-    #ext-port: "eth1"
-    region: Canonical
-    source: "cloud:trusty-juno"
-    openstack-origin: "cloud:trusty-juno"
-    series: trusty
-    ceph-osd-replication-count: 1
-    admin-role: admin
-    keystone-admin-role: admin
-
+    #- - nova-compute:lxd
+      #- lxd:lxd
+    - - congress:shared-db
+      - mysql:shared-db
+    - - congress:identity-service
+      - keystone:identity-service
+    - - congress:amqp
+      - rabbitmq-server:amqp
+  services:
+    ceilometer:
+      charm: "local:trusty/ceilometer"
+      to:
+        - "lxc:nodes=0"
+    ceilometer-agent:
+      charm: "local:trusty/ceilometer-agent"
+    ceph:
+      charm: "local:trusty/ceph"
+      num_units: 2
+      options:
+        monitor-count: 2
+        fsid: 5a791d94-980b-11e4-b6f6-3c970e8b1cf7
+        monitor-secret: AQAi5a9UeJXUExAA+By9u+GPhl8/XiUQ4nwI3A==
+#        osd-reformat: 'yes'
+#        ceph-cluster-network: 192.168.0.0/24
+#        ceph-public-network: 192.168.0.0/24
+      to:
+        - "lxc:nodes=1"
+        - "lxc:nodes=0"
+    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"
+    glance:
+      charm: "local:trusty/glance"
+      options:
+      to:
+        - "lxc:nodes=0"
+    opnfv-promise:
+      charm: local:trusty/promise
+      to:
+        - "lxc:nodes=1"
+    keystone:
+      charm: "local:trusty/keystone"
+      options:
+        admin-password: openstack
+        admin-token: admin
+      to:
+        - "lxc:nodes=0"
+    mongodb:
+      charm: local:trusty/mongodb
+      to:
+        - "lxc:nodes=1"
+    mysql:
+      charm: "local:trusty/percona-cluster"
+      options:
+        max-connections: 20000
+      to:
+        - "lxc:nodes=0"
+    neutron-api:
+      charm: "local:trusty/neutron-api"
+      options:
+        neutron-security-groups: true
+        #flat-network-providers: "*"
+        overlay-network-type: vxlan
+      to:
+        - "lxc:nodes=1"
+    neutron-gateway:
+      charm: "local:trusty/neutron-gateway"
+      options:
+        instance-mtu: 1400
+        #ext-port: "eth1"
+      to:
+        - "nodes=0"
+    neutron-openvswitch:
+      charm: "local:trusty/neutron-openvswitch"
+      options:
+        #enable-dpdk: true
+        #data-port: ""
+        #default-socket-memory: 1024
+        #defualt-socket-cores: 1
+        #dpdk-driver: uio_pci_generic
+    nova-cloud-controller:
+      charm: "local:trusty/nova-cloud-controller"
+      options:
+        network-manager: Neutron
+      to:
+        - "lxc:nodes=1"
+    nova-compute:
+      charm: "local:trusty/nova-compute"
+      options:
+        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"
+    openstack-dashboard:
+      charm: "local:trusty/openstack-dashboard"
+      options:
+        secret: admin
+        webroot: /
+      to:
+        - "lxc:nodes=0"
+    rabbitmq-server:
+      charm: "local:trusty/rabbitmq-server"
+      to:
+        - "lxc:nodes=1"
+    heat:
+      charm: "local:trusty/heat"
+      to:
+        - "lxc:nodes=0"
+    congress:
+      charm: local:trusty/congress
+      options:
+        #source-branch: stable/mitaka
+      to:
+        - "lxc:nodes=1"