diff options
| -rwxr-xr-x | ci/maas/intel/pod5/deployment.yaml | 22 | ||||
| -rwxr-xr-x | ci/maas/intel/pod6/deployment.yaml | 8 | ||||
| -rwxr-xr-x | ci/maas/orange/pod2/deployment.yaml | 10 | ||||
| -rw-r--r-- | ci/odl/juju-deployer/odl.yaml | 80 | ||||
| -rw-r--r-- | ci/odl/juju-deployer/ovs-odl-ha.yaml | 2 | ||||
| -rw-r--r-- | ci/odl/juju-deployer/ovs-odl-tip.yaml | 6 | ||||
| -rw-r--r-- | ci/odl/juju-deployer/ovs-odl.yaml | 6 | ||||
| -rw-r--r-- | ci/opencontrail/juju-deployer/contrail.yaml | 18 |
8 files changed, 37 insertions, 115 deletions
diff --git a/ci/maas/intel/pod5/deployment.yaml b/ci/maas/intel/pod5/deployment.yaml index caae88bd..a33f8e0d 100755 --- a/ci/maas/intel/pod5/deployment.yaml +++ b/ci/maas/intel/pod5/deployment.yaml @@ -108,8 +108,8 @@ demo-maas: # Defines the physical nodes which are added to the MAAS cluster # controller upon startup of the node. nodes: - - name: node1 - tags: physical + - name: node5 + tags: compute architecture: amd64/generic mac_addresses: - "00:1e:67:e0:0a:4a" @@ -118,7 +118,7 @@ demo-maas: - "00:1e:67:d0:9a:11" power: type: ipmi - address: 10.4.2.8 + address: 10.4.7.5 user: root pass: root driver: LAN_2_0 @@ -126,8 +126,8 @@ demo-maas: # mac_address: "38:63:bb:43:b8:9c" # requested_address: 192.168.122.5 - - name: node2 - tags: physical + - name: node4 + tags: control architecture: amd64/generic mac_addresses: - "00:1e:67:e0:08:b0" @@ -136,7 +136,7 @@ demo-maas: - "00:1e:67:d0:99:ef" power: type: ipmi - address: 10.4.2.9 + address: 10.4.7.4 user: root pass: root driver: LAN_2_0 @@ -145,7 +145,7 @@ demo-maas: # requested_address: 192.168.122.5 - name: node3 - tags: physical + tags: control architecture: amd64/generic mac_addresses: - "00:1e:67:e0:08:7e" @@ -154,7 +154,7 @@ demo-maas: - "00:1e:67:c2:23:d9" power: type: ipmi - address: 10.4.2.7 + address: 10.4.7.3 user: root pass: root driver: LAN_2_0 @@ -162,8 +162,8 @@ demo-maas: # mac_address: "38:63:bb:43:b8:9c" # requested_address: 192.168.122.5 - - name: node4 - tags: physical + - name: node2 + tags: control architecture: amd64/generic mac_addresses: - "00:1e:67:cf:b8:92" @@ -172,7 +172,7 @@ demo-maas: - "00:1e:67:d0:9b:0d" power: type: ipmi - address: 10.4.2.10 + address: 10.4.7.2 user: root pass: root driver: LAN_2_0 diff --git a/ci/maas/intel/pod6/deployment.yaml b/ci/maas/intel/pod6/deployment.yaml index 42cc2a88..18dead97 100755 --- a/ci/maas/intel/pod6/deployment.yaml +++ b/ci/maas/intel/pod6/deployment.yaml @@ -109,7 +109,7 @@ demo-maas: # controller upon startup of the node. nodes: - name: node2 - tags: physical + tags: control architecture: amd64/generic mac_addresses: - "00:1e:67:e0:0b:71" @@ -145,7 +145,7 @@ demo-maas: # requested_address: 192.168.122.5 - name: node3 - tags: physical + tags: control architecture: amd64/generic mac_addresses: - "00:1e:67:e0:09:32" @@ -163,7 +163,7 @@ demo-maas: # requested_address: 192.168.122.5 - name: node4 - tags: physical + tags: control architecture: amd64/generic mac_addresses: - "00:1e:67:e0:09:fa" @@ -181,7 +181,7 @@ demo-maas: # requested_address: 192.168.122.5 - name: node5 - tags: physical + tags: compute architecture: amd64/generic mac_addresses: - "00:1e:67:cf:bc:f7" diff --git a/ci/maas/orange/pod2/deployment.yaml b/ci/maas/orange/pod2/deployment.yaml index a1422f8c..99fa7267 100755 --- a/ci/maas/orange/pod2/deployment.yaml +++ b/ci/maas/orange/pod2/deployment.yaml @@ -109,7 +109,7 @@ demo-maas: # controller upon startup of the node. nodes: - name: node1-compute - tags: physical + tags: compute architecture: amd64/generic mac_addresses: - "38:63:bb:3f:bc:c8" @@ -129,7 +129,7 @@ demo-maas: # requested_address: 192.168.122.5 # - name: node2-compute - tags: physical + tags: control architecture: amd64/generic mac_addresses: - "38:63:bb:44:34:84" @@ -146,7 +146,7 @@ demo-maas: driver: LAN_2_0 - name: node3-compute - tags: physical + tags: control architecture: amd64/generic mac_addresses: - "38:63:bb:3f:1d:8c" @@ -163,7 +163,7 @@ demo-maas: driver: LAN_2_0 - name: node4-compute - tags: physical + tags: control architecture: amd64/generic mac_addresses: - "38:63:bb:3f:2d:a8" @@ -195,7 +195,7 @@ demo-maas: # driver: LAN_2_0 - name: node6-control - tags: control + tags: physical architecture: amd64/generic mac_addresses: - "00:1a:64:c8:a8:14" diff --git a/ci/odl/juju-deployer/odl.yaml b/ci/odl/juju-deployer/odl.yaml deleted file mode 100644 index f5e6bd73..00000000 --- a/ci/odl/juju-deployer/odl.yaml +++ /dev/null @@ -1,80 +0,0 @@ -openstack: - services: - mysql: - constraints: mem=1G - options: - dataset-size: 50% - max-connections: 1000 - rabbitmq-server: - constraints: mem=1G - keystone: - branch: lp:~openstack-charmers/charms/trusty/keystone/next - constraints: mem=1G - openstack-dashboard: - branch: lp:~openstack-charmers/charms/trusty/openstack-dashboard/next - constraints: mem=1G - nova-compute: - branch: lp:~sdn-charmers/charms/trusty/nova-compute/odl - constraints: mem=4G root-disk=20G - nova-cloud-controller: - branch: lp:~openstack-charmers/charms/trusty/nova-cloud-controller/next - constraints: mem=1G - options: - network-manager: Neutron - neutron-api: - branch: lp:~sdn-charmers/charms/trusty/neutron-api/odl - constraints: mem=1G - neutron-gateway: - branch: lp:~sdn-charmers/charms/trusty/quantum-gateway/odl - constraints: mem=1G - glance: - branch: lp:~openstack-charmers/charms/trusty/glance/next - constraints: mem=1G - relations: - - [ keystone, mysql ] - - [ nova-cloud-controller, mysql ] - - [ nova-cloud-controller, rabbitmq-server ] - - [ nova-cloud-controller, glance ] - - [ nova-cloud-controller, keystone ] - - [ neutron-api, mysql ] - - [ neutron-api, rabbitmq-server ] - - [ neutron-api, keystone ] - - [ neutron-api, nova-cloud-controller ] - - [ neutron-gateway, mysql ] - - [ "neutron-gateway:amqp", "rabbitmq-server:amqp" ] - - [ neutron-gateway, nova-cloud-controller ] - - [ neutron-gateway, neutron-api ] - - [ "nova-compute:shared-db", "mysql:shared-db" ] - - [ "nova-compute:amqp", "rabbitmq-server:amqp" ] - - [ nova-compute, glance ] - - [ nova-compute, nova-cloud-controller ] - - [ glance, mysql ] - - [ glance, keystone ] - - [ openstack-dashboard, keystone ] -odl: - inherits: openstack - services: - odl-controller: - branch: lp:~sdn-charmers/charms/trusty/odl-controller/trunk - constraints: mem=4G - neutron-odl: - branch: lp:~sdn-charmers/charms/trusty/neutron-odl/trunk - relations: - - [ neutron-api, odl-controller ] - - [ neutron-gateway, odl-controller ] - - [ nova-compute, neutron-odl ] - - [ neutron-odl, odl-controller ] -trusty-icehouse-odl: - inherits: odl - series: trusty - services: - mysql: - charm: cs:trusty/mysql - rabbitmq-server: - charm: cs:trusty/rabbitmq-server - overrides: - instance-mtu: 1400 - neutron-plugin: odl - neutron-security-groups: True - plugin: odl - quantum-security-groups: "yes" diff --git a/ci/odl/juju-deployer/ovs-odl-ha.yaml b/ci/odl/juju-deployer/ovs-odl-ha.yaml index 50245bcf..e5fb863f 100644 --- a/ci/odl/juju-deployer/ovs-odl-ha.yaml +++ b/ci/odl/juju-deployer/ovs-odl-ha.yaml @@ -5,7 +5,7 @@ openstack-phase1: nodes-api: branch: "lp:charms/trusty/ubuntu" num_units: 3 - constraints: tags=api + constraints: tags=control nodes-compute: branch: "lp:charms/trusty/ubuntu" num_units: 1 diff --git a/ci/odl/juju-deployer/ovs-odl-tip.yaml b/ci/odl/juju-deployer/ovs-odl-tip.yaml index a5d1f08e..73946c13 100644 --- a/ci/odl/juju-deployer/ovs-odl-tip.yaml +++ b/ci/odl/juju-deployer/ovs-odl-tip.yaml @@ -3,7 +3,7 @@ openstack-services: ubuntu: branch: "lp:charms/trusty/ubuntu" num_utils: 1 - constraints: tags=physical + constraints: tags=control neutron-gateway: branch: lp:~sdn-charmers/charms/trusty/neutron-gateway/ovs-odl options: @@ -12,8 +12,8 @@ openstack-services: to: ubuntu=0 nova-compute: branch: lp:~openstack-charmers/charms/trusty/nova-compute/next - num_units: 2 - constraints: tags=physical + num_units: 1 + constraints: tags=compute options: enable-live-migration: False manage-neutron-plugin-legacy-mode: False diff --git a/ci/odl/juju-deployer/ovs-odl.yaml b/ci/odl/juju-deployer/ovs-odl.yaml index ec956fe7..b188a587 100644 --- a/ci/odl/juju-deployer/ovs-odl.yaml +++ b/ci/odl/juju-deployer/ovs-odl.yaml @@ -4,7 +4,7 @@ openstack-services: ubuntu: branch: "lp:charms/trusty/ubuntu" num_utils: 1 - constraints: tags=physical + constraints: tags=control neutron-gateway: branch: lp:~openstack-charmers/charms/trusty/neutron-gateway/next #constraints: tags=neutron @@ -15,8 +15,8 @@ openstack-services: to: ubuntu=0 nova-compute: branch: lp:~openstack-charmers/charms/trusty/nova-compute/next - num_units: 2 - constraints: tags=physical + num_units: 1 + constraints: tags=compute options: enable-live-migration: False manage-neutron-plugin-legacy-mode: False diff --git a/ci/opencontrail/juju-deployer/contrail.yaml b/ci/opencontrail/juju-deployer/contrail.yaml index c2f48789..68cda3e2 100644 --- a/ci/opencontrail/juju-deployer/contrail.yaml +++ b/ci/opencontrail/juju-deployer/contrail.yaml @@ -2,9 +2,12 @@ openstack: services: ubuntu: branch: "lp:charms/trusty/ubuntu" - constraints: tags=physical - num_units: 2 - + constraints: tags=control + num_units: 1 + ubuntu-compute: + branch: "lp:charms/trusty/ubuntu" + constraints: tags=compute + num_units: 1 mysql: constraints: mem=1G options: @@ -35,11 +38,10 @@ openstack: nova-compute: branch: lp:~openstack-charmers/charms/trusty/nova-compute/next - constraints: tags=physical - num_units: 2 + constraints: tags=compute + num_units: 1 to: - - "ubuntu=0" - - "ubuntu=1" + - "ubuntu-compute=0" options: manage-neutron-plugin-legacy-mode: false nova-cloud-controller: @@ -94,7 +96,7 @@ contrail: cassandra: branch: lp:~sdn-charmers/charms/precise/cassandra/forced-install series: precise - constraints: tags=physical + constraints: tags=control options: allow-single-node: true |