From: Narinder Gupta Date: Fri, 8 Jul 2016 15:06:55 +0000 (-0500) Subject: trying to have ssh passed. X-Git-Tag: colorado.1.0~90 X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?p=joid.git;a=commitdiff_plain;h=6d508d3203fe4a914db1b8cc65f7e2358b1f4766 trying to have ssh passed. Change-Id: I433a537851dad1395a53d8da9489a46d37132a4c Signed-off-by: Narinder Gupta --- diff --git a/ci/nosdn/fetch-charms.sh b/ci/nosdn/fetch-charms.sh index 130fdf0a..27558a32 100755 --- a/ci/nosdn/fetch-charms.sh +++ b/ci/nosdn/fetch-charms.sh @@ -30,8 +30,8 @@ git clone https://github.com/openstack/charm-neutron-openvswitch.git $distro/neu git clone https://github.com/openstack/charm-nova-cloud-controller.git $distro/nova-cloud-controller git clone https://github.com/openstack/charm-nova-compute.git $distro/nova-compute git clone https://github.com/openstack/charm-openstack-dashboard.git $distro/openstack-dashboard -charm pull cs:~james-page/xenial/rabbitmq-server-bug1590085 $distro/rabbitmq-server -#git clone https://github.com/openstack/charm-rabbitmq-server.git $distro/rabbitmq-server +#charm pull cs:~james-page/xenial/rabbitmq-server-bug1590085 $distro/rabbitmq-server +git clone https://github.com/openstack/charm-rabbitmq-server.git $distro/rabbitmq-server git clone https://github.com/openstack/charm-heat.git $distro/heat git clone https://github.com/openstack/charm-lxd.git xenial/lxd git clone https://github.com/gnuoy/charm-congress.git $distro/charm-congress diff --git a/ci/odl/fetch-charms.sh b/ci/odl/fetch-charms.sh index 4593600e..7fa63eeb 100755 --- a/ci/odl/fetch-charms.sh +++ b/ci/odl/fetch-charms.sh @@ -30,8 +30,8 @@ git clone https://github.com/openstack/charm-neutron-openvswitch.git $distro/neu git clone https://github.com/openstack/charm-nova-cloud-controller.git $distro/nova-cloud-controller git clone https://github.com/openstack/charm-nova-compute.git $distro/nova-compute git clone https://github.com/openstack/charm-openstack-dashboard.git $distro/openstack-dashboard -charm pull cs:~james-page/xenial/rabbitmq-server-bug1590085 $distro/rabbitmq-server -#git clone https://github.com/openstack/charm-rabbitmq-server.git $distro/rabbitmq-server +#charm pull cs:~james-page/xenial/rabbitmq-server-bug1590085 $distro/rabbitmq-server +git clone https://github.com/openstack/charm-rabbitmq-server.git $distro/rabbitmq-server git clone https://github.com/openstack/charm-heat.git $distro/heat git clone https://github.com/gnuoy/charm-congress.git $distro/charm-congress git clone https://github.com/openstack/charm-lxd.git xenial/lxd diff --git a/ci/onos/fetch-charms.sh b/ci/onos/fetch-charms.sh index d68a5830..396ac8c8 100755 --- a/ci/onos/fetch-charms.sh +++ b/ci/onos/fetch-charms.sh @@ -29,8 +29,8 @@ git clone https://github.com/openstack/charm-neutron-openvswitch.git $distro/neu git clone https://github.com/openstack/charm-nova-cloud-controller.git $distro/nova-cloud-controller git clone https://github.com/openstack/charm-nova-compute.git $distro/nova-compute git clone https://github.com/openstack/charm-openstack-dashboard.git $distro/openstack-dashboard -charm pull cs:~james-page/xenial/rabbitmq-server-bug1590085 $distro/rabbitmq-server -#git clone https://github.com/openstack/charm-rabbitmq-server.git $distro/rabbitmq-server +#charm pull cs:~james-page/xenial/rabbitmq-server-bug1590085 $distro/rabbitmq-server +git clone https://github.com/openstack/charm-rabbitmq-server.git $distro/rabbitmq-server git clone https://github.com/openstack/charm-heat.git $distro/heat git clone https://github.com/gnuoy/charm-congress.git $distro/charm-congress build diff --git a/ci/opencontrail/fetch-charms.sh b/ci/opencontrail/fetch-charms.sh index d0a4e7a8..5e6c9cbb 100755 --- a/ci/opencontrail/fetch-charms.sh +++ b/ci/opencontrail/fetch-charms.sh @@ -32,8 +32,8 @@ git clone https://github.com/openstack/charm-neutron-openvswitch.git $distro/neu git clone https://github.com/openstack/charm-nova-cloud-controller.git $distro/nova-cloud-controller git clone https://github.com/openstack/charm-nova-compute.git $distro/nova-compute git clone https://github.com/openstack/charm-openstack-dashboard.git $distro/openstack-dashboard -charm pull cs:~james-page/xenial/rabbitmq-server-bug1590085 $distro/rabbitmq-server -#git clone https://github.com/openstack/charm-rabbitmq-server.git $distro/rabbitmq-server +#charm pull cs:~james-page/xenial/rabbitmq-server-bug1590085 $distro/rabbitmq-server +git clone https://github.com/openstack/charm-rabbitmq-server.git $distro/rabbitmq-server git clone https://github.com/openstack/charm-heat.git $distro/heat git clone https://github.com/gnuoy/charm-congress.git $distro/charm-congress build diff --git a/ci/openstack.sh b/ci/openstack.sh index c58b8ad1..5e0b9bf1 100755 --- a/ci/openstack.sh +++ b/ci/openstack.sh @@ -122,6 +122,17 @@ create_openrc . ./cloud/admin-openrc +## +## removing the swift API endpoint which is created by radosgw. +## one option is not to used radosgw and other one is remove endpoint. +## + +echo "Removing swift endpoint and service" +swift_service_id=\$(openstack service list | grep swift | cut -d ' ' -f 2) +swift_endpoint_id=\$(openstack endpoint list | grep swift | cut -d ' ' -f 2) +openstack endpoint delete \$swift_endpoint_id +openstack service delete \$swift_service_id + ## ## Create external subnet Network ## @@ -196,6 +207,9 @@ openstack congress datasource create keystone "keystone" \ ##enable extra stuff only if testing manually +#neutron security-group-rule-create --direction ingress --ethertype IPv4 --protocol icmp --remote-ip-prefix 0.0.0.0/0 default +#neutron security-group-rule-create --direction ingress --ethertype IPv4 --protocol tcp --port-range-min 22 --port-range-max 22 --remote-ip-prefix 0.0.0.0/0 default + #wget -P /tmp/images http://download.cirros-cloud.net/0.3.3/cirros-0.3.3-x86_64-disk.img #openstack image create --file /tmp/images/cirros-0.3.3-x86_64-disk.img --disk-format qcow2 --container-format bare "cirros-0.3.3-x86_64" #wget -P /tmp/images http://cloud-images.ubuntu.com/trusty/current/trusty-server-cloudimg-amd64-disk1.img @@ -216,47 +230,17 @@ openstack congress datasource create keystone "keystone" \ #neutron subnet-create --name demo-subnet --gateway 10.20.5.1 demo-net 10.20.5.0/24 #neutron router-create demo-router #neutron router-interface-add demo-router demo-subnet -#neutron router-gateway-set demo-router ext_net +#neutron router-gateway-set demo-router ext-net ## create pool of floating ips #i=0 #while [ $i -ne 3 ]; do -# neutron floatingip-create ext_net +# neutron floatingip-create ext-net # i=$((i + 1)) #done ##http://docs.openstack.org/juno/install-guide/install/apt/content/launch-instance-neutron.html -# nova boot --flavor m1.small --image cirros-0.3.3-x86_64 --nic net-id=b65479a4-3638-4595-9245-6e41ccd8bfd8 --security-group default --key-name ubuntu-keypair demo-instance1 -# nova floating-ip-associate demo-instance1 10.5.8.35 - -##Modify the flavours to fit better -#nova flavor-create FLAVOR_NAME FLAVOR_ID RAM_IN_MB ROOT_DISK_IN_GB NUMBER_OF_VCPUS -#nova flavor-delete m1.tiny > /dev/null 2>&1 -#nova flavor-delete m1.small > /dev/null 2>&1 -#nova flavor-delete m1.medium > /dev/null 2>&1 -#nova flavor-delete m1.large > /dev/null 2>&1 -#nova flavor-delete m1.xlarge > /dev/null 2>&1 -#nova flavor-create --is-public true m1.tiny auto 512 5 1 > /dev/null 2>&1 -#nova flavor-create --is-public true m1.small auto 1024 10 1 > /dev/null 2>&1 -#nova flavor-create --is-public true m1.medium auto 2048 10 2 > /dev/null 2>&1 -#nova flavor-create --is-public true m1.large auto 3072 10 2 > /dev/null 2>&1 -## need extra for windows image (15g) -#nova flavor-create --is-public true m1.xlarge auto 8096 30 4 > /dev/null 2>&1 -#echo "modifying default quotas for admin user" -#TENANT_ID=admin -#Modify quotas for the tenant to allow large deployments -#nova quota-update --instances 400 $TENANT_ID -#nova quota-update --cores 800 $TENANT_ID -#nova quota-update --ram 404800 $TENANT_ID -#nova quota-update --security-groups 4000 $TENANT_ID -#nova quota-update --floating_ips -1 $TENANT_ID -#nova quota-update --security-group-rules -1 $TENANT_ID -### need to find how to change quota for the project not the tenant -### modify default quota the same way.. -#nova quota-class-update --instances 400 $TENANT_ID -#nova quota-class-update --cores 800 $TENANT_ID -#nova quota-class-update --ram 404800 $TENANT_ID -#nova quota-class-update --security-groups 4000 $TENANT_ID -#nova quota-class-update --floating-ips -1 $TENANT_ID -#nova quota-class-update --security-group-rules -1 $TENANT_ID +# netid=`neutron net-show demo-net -c id -f value` +# nova boot --flavor m1.small --image cirros-0.3.3-x86_64 --nic net-id=$netid --security-group default --key-name ubuntu-keypair demo-instance1 +# nova floating-ip-associate demo-instance1 10.5.15.8 diff --git a/labconfig/default/deployconfig.yaml b/labconfig/default/deployconfig.yaml index 46a14b08..c012ec8d 100644 --- a/labconfig/default/deployconfig.yaml +++ b/labconfig/default/deployconfig.yaml @@ -1,8 +1,34 @@ opnfv: - admNetwork: 192.168.122.1 + admNetgway: 192.168.122.1 + admNetwork: 192.168.122.2 + admin_password: openstack ceph-disk: /srv dataNetwork: '' ext-port: eth1 + ext_port: eth1 floating-ip-range: 192.168.122.30,192.168.122.49,192.168.122.1,192.168.122.0/24 - interface-enable: '' + interface-enable: eth1 + os-domain-name: '' + publicNetwork: '' + spaces: + - bridge: brAdm + cidr: 192.168.122.0/24 + gateway: 192.168.122.1 + type: admin + vlan: null + storage: + - disk: /srv + type: ceph storageNetwork: '' + units: 5 + vip: + ceilometer: 192.168.122.24 + cinder: 192.168.122.29 + dashboard: 192.168.122.21 + glance: 192.168.122.22 + heat: 192.168.122.28 + keystone: 192.168.122.23 + mysql: 192.168.122.25 + neutron: 192.168.122.27 + nova: 192.168.122.26 + rabbitmq: 192.168.122.20 diff --git a/labconfig/intel/pod5/labconfig.yaml b/labconfig/intel/pod5/labconfig.yaml index d9aa7471..441b83a7 100644 --- a/labconfig/intel/pod5/labconfig.yaml +++ b/labconfig/intel/pod5/labconfig.yaml @@ -111,7 +111,7 @@ lab: # address: 10.2.117.90 # user: root # pass: root - floating-ip-range: 10.5.15.6,10.5.15.250,10.5.15.254,10.5.15.0/24 + floating-ip-range: 10.5.15.6,10.5.15.250,10.5.15.1,10.5.15.0/24 ext-port: "eth5" dns: 8.8.8.8 osdomainname: diff --git a/labconfig/intel/pod6/labconfig.yaml b/labconfig/intel/pod6/labconfig.yaml index 37a87ec7..35a427e9 100644 --- a/labconfig/intel/pod6/labconfig.yaml +++ b/labconfig/intel/pod6/labconfig.yaml @@ -111,7 +111,7 @@ lab: # address: 10.2.117.106 # user: root # pass: root - floating-ip-range: 10.6.15.6,10.6.15.250,10.6.15.254,10.6.15.0/24 + floating-ip-range: 10.6.15.6,10.6.15.250,10.6.15.1,10.6.15.0/24 ext-port: "eth5" dns: 8.8.8.8 osdomainname: