diff options
| -rwxr-xr-x | ci/02-maasdeploy.sh | 2 | ||||
| -rwxr-xr-x | ci/maas/intel/pod6/deployment.yaml | 66 | ||||
| -rw-r--r-- | ci/odl/juju-deployer/ovs-odl.yaml | 29 |
3 files changed, 59 insertions, 38 deletions
diff --git a/ci/02-maasdeploy.sh b/ci/02-maasdeploy.sh index c90a4eb2..1a88a4b3 100755 --- a/ci/02-maasdeploy.sh +++ b/ci/02-maasdeploy.sh @@ -56,7 +56,7 @@ echo "... Deployment of maas finish ...." maas_ip=`grep " ip_address" deployment.yaml | cut -d " " -f 10` apikey=`grep maas-oauth: environments.yaml | cut -d "'" -f 2` maas login maas http://${maas_ip}/MAAS/api/1.0 ${apikey} -maas maas boot-source-selections create 1 os="ubuntu" release="trusty" arches="amd64" subarches="*" labels="*" +maas maas boot-source-selections create 1 os="ubuntu" release="precise" arches="amd64" subarches="*" labels="*" maas maas boot-resources import #echo "... Deployment of opnfv release Started ...." diff --git a/ci/maas/intel/pod6/deployment.yaml b/ci/maas/intel/pod6/deployment.yaml index caae88bd..42cc2a88 100755 --- a/ci/maas/intel/pod6/deployment.yaml +++ b/ci/maas/intel/pod6/deployment.yaml @@ -108,17 +108,17 @@ demo-maas: # Defines the physical nodes which are added to the MAAS cluster # controller upon startup of the node. nodes: - - name: node1 + - name: node2 tags: physical architecture: amd64/generic mac_addresses: - - "00:1e:67:e0:0a:4a" - - "00:1e:67:e0:0a:4b" - - "00:1e:67:d0:9a:10" - - "00:1e:67:d0:9a:11" + - "00:1e:67:e0:0b:71" + - "00:1e:67:e0:0b:72" + - "00:1e:67:d0:9a:8c" + - "00:1e:67:d0:9a:8d" power: type: ipmi - address: 10.4.2.8 + address: 10.4.7.2 user: root pass: root driver: LAN_2_0 @@ -126,17 +126,35 @@ demo-maas: # mac_address: "38:63:bb:43:b8:9c" # requested_address: 192.168.122.5 - - name: node2 +# - name: node1 +# tags: physical +# architecture: amd64/generic +# mac_addresses: +# - "00:1e:67:e0:08:b0" +# - "00:1e:67:e0:08:b1" +# - "00:1e:67:d0:99:ee" +# - "00:1e:67:d0:99:ef" +# power: +# type: ipmi +# address: 10.4.2.9 +# user: root +# pass: root +# driver: LAN_2_0 +# sticky_ip_address: +# mac_address: "38:63:bb:43:b8:9c" +# requested_address: 192.168.122.5 + + - name: node3 tags: physical architecture: amd64/generic mac_addresses: - - "00:1e:67:e0:08:b0" - - "00:1e:67:e0:08:b1" - - "00:1e:67:d0:99:ee" - - "00:1e:67:d0:99:ef" + - "00:1e:67:e0:09:32" + - "00:1e:67:e0:09:33" + - "00:1e:67:d0:9b:92" + - "00:1e:67:d0:9b:93" power: type: ipmi - address: 10.4.2.9 + address: 10.4.7.3 user: root pass: root driver: LAN_2_0 @@ -144,17 +162,17 @@ demo-maas: # mac_address: "38:63:bb:43:b8:9c" # requested_address: 192.168.122.5 - - name: node3 + - name: node4 tags: physical architecture: amd64/generic mac_addresses: - - "00:1e:67:e0:08:7e" - - "00:1e:67:e0:08:7f" - - "00:1e:67:c2:23:d8" - - "00:1e:67:c2:23:d9" + - "00:1e:67:e0:09:fa" + - "00:1e:67:e0:09:fb" + - "00:1e:67:d0:9c:9c" + - "00:1e:67:d0:9c:9d" power: type: ipmi - address: 10.4.2.7 + address: 10.4.7.4 user: root pass: root driver: LAN_2_0 @@ -162,17 +180,17 @@ demo-maas: # mac_address: "38:63:bb:43:b8:9c" # requested_address: 192.168.122.5 - - name: node4 + - name: node5 tags: physical architecture: amd64/generic mac_addresses: - - "00:1e:67:cf:b8:92" - - "00:1e:67:cf:b8:93" - - "00:1e:67:d0:9b:0c" - - "00:1e:67:d0:9b:0d" + - "00:1e:67:cf:bc:f7" + - "00:1e:67:cf:bc:f8" + - "00:1e:67:d0:9c:26" + - "00:1e:67:d0:9c:27" power: type: ipmi - address: 10.4.2.10 + address: 10.4.7.5 user: root pass: root driver: LAN_2_0 diff --git a/ci/odl/juju-deployer/ovs-odl.yaml b/ci/odl/juju-deployer/ovs-odl.yaml index dae7a36c..c22768f3 100644 --- a/ci/odl/juju-deployer/ovs-odl.yaml +++ b/ci/odl/juju-deployer/ovs-odl.yaml @@ -6,11 +6,12 @@ openstack-services: num_utils: 1 constraints: tags=physical neutron-gateway: - branch: lp:~sdn-charmers/charms/trusty/neutron-gateway/ovs-odl + branch: lp:~openstack-charmers/charms/trusty/neutron-gateway/next #constraints: tags=neutron options: plugin: ovs-odl instance-mtu: 1400 + # ext-port: eth2 to: ubuntu=0 nova-compute: branch: lp:~openstack-charmers/charms/trusty/nova-compute/next @@ -65,29 +66,31 @@ openstack-services: charm: cs:trusty/glance to: lxc:ubuntu=0 relations: - - ['neutron-api:neutron-plugin-api-subordinate', 'neutron-api-odl:neutron-plugin-api-subordinate'] - - ['nova-compute:neutron-plugin', 'openvswitch-odl:neutron-plugin'] - - ['neutron-gateway', 'openvswitch-odl'] - - ['openvswitch-odl:ovsdb-manager', 'odl-controller:ovsdb-manager'] - - ['neutron-api-odl:odl-controller', 'odl-controller:controller-api'] - ['keystone:shared-db', 'mysql:shared-db'] - ['nova-cloud-controller:shared-db', 'mysql:shared-db'] - ['nova-cloud-controller:amqp', 'rabbitmq-server:amqp'] - ['nova-cloud-controller:image-service', 'glance:image-service'] - ['nova-cloud-controller:identity-service', 'keystone:identity-service'] - - ['nova-compute:cloud-compute', 'nova-cloud-controller:cloud-compute'] - - ['nova-compute:amqp', 'rabbitmq-server:amqp'] - - ['nova-compute:image-service', 'glance:image-service'] - - ['glance:shared-db', 'mysql:shared-db'] - - ['glance:identity-service', 'keystone:identity-service'] - - ['glance:amqp', 'rabbitmq-server:amqp'] - ['neutron-api:shared-db', 'mysql:shared-db'] - ['neutron-api:amqp', 'rabbitmq-server:amqp'] - ['neutron-api:neutron-api', 'nova-cloud-controller:neutron-api'] - ['neutron-api:identity-service', 'keystone:identity-service'] + - ['neutron-api:neutron-plugin-api-subordinate', 'neutron-api-odl:neutron-plugin-api-subordinate'] + - ['neutron-api-odl:odl-controller', 'odl-controller:controller-api'] + - ['nova-compute:neutron-plugin', 'openvswitch-odl:neutron-plugin'] + - ['neutron-gateway', 'mysql '], - ['neutron-gateway:amqp', 'rabbitmq-server:amqp'] - - ['neutron-gateway:neutron-plugin-api', 'neutron-api:neutron-plugin-api'] - ['neutron-gateway:quantum-network-service', 'nova-cloud-controller:quantum-network-service'] + - ['neutron-gateway:neutron-plugin-api', 'neutron-api:neutron-plugin-api'] + - ['neutron-gateway', 'openvswitch-odl'] + - ['openvswitch-odl:ovsdb-manager', 'odl-controller:ovsdb-manager'] + - ['nova-compute:shared-db', 'mysql:shared-db'] + - ['nova-compute:cloud-compute', 'nova-cloud-controller:cloud-compute'] + - ['nova-compute:amqp', 'rabbitmq-server:amqp'] + - ['nova-compute:image-service', 'glance:image-service'] + - ['glance:shared-db', 'mysql:shared-db'] + - ['glance:identity-service', 'keystone:identity-service'] + - ['glance:amqp', 'rabbitmq-server:amqp'] - ['openstack-dashboard:identity-service','keystone:identity-service'] trusty-kilo: inherits: openstack-services |