summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xci/openstack.sh10
-rw-r--r--labconfig/orange/pod1/labconfig.yaml2
2 files changed, 1 insertions, 11 deletions
diff --git a/ci/openstack.sh b/ci/openstack.sh
index 781e862d..d436140d 100755
--- a/ci/openstack.sh
+++ b/ci/openstack.sh
@@ -164,15 +164,6 @@ fi
# Create Congress datasources
sudo apt-get install -y python-congressclient
-# Remove public endpoint and recreate it from internal
-# Waiting congress client can be use with internal endpoints
-if [ "$API_FQDN" != "''" ]; then
- CONGRESS_PUB_ENDPOINT=$(openstack endpoint list --service policy --interface public -c ID -f value)
- openstack endpoint delete $CONGRESS_PUB_ENDPOINT
- CONGRESS_NEW_PUB_ENDPOINT=$(openstack endpoint list --service policy --interface internal -c URL -f value)
- openstack endpoint create --region RegionOne policy public $CONGRESS_NEW_PUB_ENDPOINT
-fi
-
openstack congress datasource create nova "nova" \
--config username=$OS_USERNAME \
--config tenant_name=$OS_TENANT_NAME \
@@ -243,4 +234,3 @@ openstack congress datasource create keystone "keystone" \
# 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/orange/pod1/labconfig.yaml b/labconfig/orange/pod1/labconfig.yaml
index f522eb9d..5adfe850 100644
--- a/labconfig/orange/pod1/labconfig.yaml
+++ b/labconfig/orange/pod1/labconfig.yaml
@@ -93,7 +93,7 @@ lab:
address: 192.168.1.15
user: Administrator
pass: pod1Admin
- floating-ip-range: 161.105.231.2,161.105.231.62,161.105.231.1,161.105.231.0/26
+ floating-ip-range: 10.0.2.2,10.0.2.254,10.0.2.1,10.0.2.0/24
ext-port: "eth1"
dns: 192.168.1.1
osdomainname: pod1.opnfv.fr