fix metadata, removed 2/3 floating ips
Only one floating ip needed for configuration.
Change-Id: I61bc3875e640f622ec9c8edc847823b9dfe47266
diff --git a/avinetworks/server.sls b/avinetworks/server.sls
index d6aa508..31751a3 100644
--- a/avinetworks/server.sls
+++ b/avinetworks/server.sls
@@ -64,7 +64,7 @@
- profile: {{ server.identity }}
- name: avinetworks
- tenant: avinetworks
- - network: avinetworks
+ - network_name: avinetworks
- cidr: 10.1.0.0/24
- require:
- keystone: avinetworks_user
@@ -129,6 +129,12 @@
port_range_min: 443
port_range_max: 443
remote_ip_prefix: 0.0.0.0/0
+ - direction: ingress
+ ethertype: IPv4
+ protocol: tcp
+ port_range_min: 8443
+ port_range_max: 8443
+ remote_ip_prefix: 0.0.0.0/0
- require:
- keystone: avinetworks_user
@@ -152,7 +158,7 @@
- networks:
- name: avinetworks
v4_fixed_ip: 10.1.0.10
- - user_data: /etc/avi_init.sh
+ #- user_data: /etc/avi_init.sh
- require:
- keystone: avinetworks_user
- novang: avinetworks_flavor
@@ -174,7 +180,7 @@
- networks:
- name: avinetworks
v4_fixed_ip: 10.1.0.11
- - user_data: /etc/avi_init.sh
+ #- user_data: /etc/avi_init.sh
- require:
- keystone: avinetworks_user
- novang: avinetworks_flavor
@@ -196,7 +202,7 @@
- networks:
- name: avinetworks
v4_fixed_ip: 10.1.0.12
- - user_data: /etc/avi_init.sh
+ #- user_data: /etc/avi_init.sh
- require:
- keystone: avinetworks_user
- novang: avinetworks_flavor
@@ -219,30 +225,4 @@
- neutronng: avinetworks_subnet
- novang: avinetworks_instance_01
-avinetworks_floating_ip_02:
- neutronng.floatingip_present:
- - profile: {{ server.identity }}
- - subnet: avinetworks
- - tenant_name: avinetworks
- - name: avi_ctl02
- - network: {{ server.public_network }}
- - require:
- - keystone: avinetworks_user
- - neutronng: avinetworks_network
- - neutronng: avinetworks_subnet
- - novang: avinetworks_instance_02
-
-avinetworks_floating_ip_03:
- neutronng.floatingip_present:
- - profile: {{ server.identity }}
- - subnet: avinetworks
- - tenant_name: avinetworks
- - name: avi_ctl03
- - network: {{ server.public_network }}
- - require:
- - keystone: avinetworks_user
- - neutronng: avinetworks_network
- - neutronng: avinetworks_subnet
- - novang: avinetworks_instance_03
-
{%- endif %}
\ No newline at end of file
diff --git a/metadata/service/client/init.yml b/metadata/service/client/init.yml
index 33f8130..6f461f1 100644
--- a/metadata/service/client/init.yml
+++ b/metadata/service/client/init.yml
@@ -2,14 +2,14 @@
_param:
avinetworks_cluster_enabled: True
avinetworks_cluster_name: avi_cluster
- avinetworks_cluster_vip: 10.0.1.1
+ avinetworks_cluster_vip: 10.1.0.15
avinetworks_cluster_node01_hostname: avi01
avinetworks_cluster_node02_hostname: avi02
avinetworks_cluster_node03_hostname: avi03
- avinetworks_cluster_node01_ip_address: 10.0.1.11
- avinetworks_cluster_node02_ip_address: 10.0.1.12
- avinetworks_cluster_node03_ip_address: 10.0.1.13
+ avinetworks_cluster_node01_ip_address: 10.1.0.10
+ avinetworks_cluster_node02_ip_address: 10.1.0.11
+ avinetworks_cluster_node03_ip_address: 10.1.0.12
avinetworks_cloud_enabled: True
avinetworks_cloud_name: Openstack
@@ -27,7 +27,7 @@
avinetworks_cloud_openstack_img_format: OS_IMG_FMT_QCOW2
avinetworks_cloud_openstack_use_internal_endpoints: True
avinetworks_cloud_openstack_insecure: False
- avinetworks_cloud_openstack_os_role: '*'
+ avinetworks_cloud_openstack_os_role: "'*'"
avinetworks_cloud_openstack_avi_role: Tenant-Admin